From 4df46190bbd2c7e906290c7cfd7d2e694db9acfd Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 29 Apr 2020 11:05:05 +0300 Subject: [PATCH 01/41] Added additional property to the ucrInput control --- instat/ucrInput.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index 7bdbfec5093..b395f899059 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -26,6 +26,7 @@ Public Class ucrInput Protected dcmMinimum As Decimal = Decimal.MinValue Protected dcmMaximum As Decimal = Decimal.MaxValue Protected bMinimumIncluded, bMaximumIncluded As Boolean + Protected bExpressionAllowed As Boolean = True Protected strDefaultType As String = "" Protected strDefaultPrefix As String = "" Protected WithEvents ucrDataFrameSelector As ucrDataFrame From 43d03518e5b3f1029005e843428c6a6f0362010e Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 29 Apr 2020 11:10:00 +0300 Subject: [PATCH 02/41] Added an extra property to the ucrInput --- instat/ucrInput.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index b395f899059..34569a18570 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -185,7 +185,7 @@ Public Class ucrInput End If End Sub - Public Sub SetValidationTypeAsNumeric(Optional dcmMin As Decimal = Decimal.MinValue, Optional bIncludeMin As Boolean = True, Optional dcmMax As Decimal = Decimal.MaxValue, Optional bIncludeMax As Boolean = True) + Public Sub SetValidationTypeAsNumeric(Optional dcmMin As Decimal = Decimal.MinValue, Optional bIncludeMin As Boolean = True, Optional dcmMax As Decimal = Decimal.MaxValue, Optional bIncludeMax As Boolean = True, Optional bExpressionAllowed As Boolean = True) strValidationType = "Numeric" If dcmMin <> Decimal.MinValue Then dcmMinimum = dcmMin From 22cccabe94c448e81f0b66c90de1131eb501d5cd Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 29 Apr 2020 11:14:37 +0300 Subject: [PATCH 03/41] Added extra property to ucrInput control --- instat/ucrInput.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index 34569a18570..01a87242485 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -187,6 +187,7 @@ Public Class ucrInput Public Sub SetValidationTypeAsNumeric(Optional dcmMin As Decimal = Decimal.MinValue, Optional bIncludeMin As Boolean = True, Optional dcmMax As Decimal = Decimal.MaxValue, Optional bIncludeMax As Boolean = True, Optional bExpressionAllowed As Boolean = True) strValidationType = "Numeric" + Me.bExpressionAllowed = bExpressionAllowed If dcmMin <> Decimal.MinValue Then dcmMinimum = dcmMin bMinimumIncluded = bIncludeMin From 20d790d7235650cb4940974abb19c41b2158b0f7 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 29 Apr 2020 12:03:29 +0300 Subject: [PATCH 04/41] More changes on the ucrInput control --- instat/ucrInput.vb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index 01a87242485..007e3aa6d42 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -340,6 +340,17 @@ Public Class ucrInput If strText <> "" AndAlso (strValuesToIgnore Is Nothing OrElse (strValuesToIgnore IsNot Nothing AndAlso Not strValuesToIgnore.Contains(strText))) Then If Not IsNumeric(strText) Then iType = 1 + + If bExpressionAllowed Then + 'todo. is check if the expression is.numeric(strText) returns true + Dim bExpressionIsNumeric As Boolean + + If bExpressionIsNumeric Then + + + iType = 0 + End If + End If Else dcmText = Convert.ToDecimal(strText) If (dcmText < dcmMinimum) OrElse (dcmText > dcmMaximum) OrElse (Not bMinimumIncluded And dcmText <= dcmMinimum) OrElse (Not bMaximumIncluded And dcmText >= dcmMaximum) Then From c0f88afed03bcc105fb6ee5e66ab055c88344c60 Mon Sep 17 00:00:00 2001 From: ivanluv Date: Wed, 3 Jun 2020 12:49:14 +0300 Subject: [PATCH 05/41] Control alignment to cumulative distribution dialogue --- instat/dlgCumulativeDistribution.Designer.vb | 46 +++-- instat/dlgCumulativeDistribution.resx | 191 ++++++++++--------- 2 files changed, 123 insertions(+), 114 deletions(-) diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb index f960b4cb303..c9a3822570d 100644 --- a/instat/dlgCumulativeDistribution.Designer.vb +++ b/instat/dlgCumulativeDistribution.Designer.vb @@ -41,8 +41,6 @@ Partial Class dlgCumulativeDistribution Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgCumulativeDistribution)) Me.lblFactors = New System.Windows.Forms.Label() Me.cmdPlotOptions = New System.Windows.Forms.Button() - Me.rdoCumulative = New System.Windows.Forms.RadioButton() - Me.rdoExceedance = New System.Windows.Forms.RadioButton() Me.lblScale = New System.Windows.Forms.Label() Me.lblNudby = New System.Windows.Forms.Label() Me.ucrNudBy = New instat.ucrNud() @@ -55,6 +53,8 @@ Partial Class dlgCumulativeDistribution Me.ucrFactorReceiver = New instat.ucrReceiverSingle() Me.ucrCumDistSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.rdoCumulative = New System.Windows.Forms.RadioButton() + Me.rdoExceedance = New System.Windows.Forms.RadioButton() Me.SuspendLayout() ' 'lblFactors @@ -70,20 +70,6 @@ Partial Class dlgCumulativeDistribution Me.cmdPlotOptions.Tag = "Plot_Options" Me.cmdPlotOptions.UseVisualStyleBackColor = True ' - 'rdoCumulative - ' - resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") - Me.rdoCumulative.Name = "rdoCumulative" - Me.rdoCumulative.TabStop = True - Me.rdoCumulative.UseVisualStyleBackColor = True - ' - 'rdoExceedance - ' - resources.ApplyResources(Me.rdoExceedance, "rdoExceedance") - Me.rdoExceedance.Name = "rdoExceedance" - Me.rdoExceedance.TabStop = True - Me.rdoExceedance.UseVisualStyleBackColor = True - ' 'lblScale ' resources.ApplyResources(Me.lblScale, "lblScale") @@ -165,16 +151,36 @@ Partial Class dlgCumulativeDistribution resources.ApplyResources(Me.ucrBase, "ucrBase") Me.ucrBase.Name = "ucrBase" ' + 'rdoCumulative + ' + resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") + Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.FlatAppearance.BorderSize = 2 + Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.Name = "rdoCumulative" + Me.rdoCumulative.TabStop = True + Me.rdoCumulative.UseVisualStyleBackColor = True + ' + 'rdoExceedance + ' + resources.ApplyResources(Me.rdoExceedance, "rdoExceedance") + Me.rdoExceedance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoExceedance.FlatAppearance.BorderSize = 2 + Me.rdoExceedance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoExceedance.Name = "rdoExceedance" + Me.rdoExceedance.TabStop = True + Me.rdoExceedance.UseVisualStyleBackColor = True + ' 'dlgCumulativeDistribution ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.rdoExceedance) + Me.Controls.Add(Me.rdoCumulative) Me.Controls.Add(Me.ucrNudBy) Me.Controls.Add(Me.lblNudby) Me.Controls.Add(Me.ucrInputComboScales) Me.Controls.Add(Me.lblScale) - Me.Controls.Add(Me.rdoExceedance) - Me.Controls.Add(Me.rdoCumulative) Me.Controls.Add(Me.ucrPnlOption) Me.Controls.Add(Me.ucrChkIncludePoints) Me.Controls.Add(Me.ucrChkCountsOnYAxis) @@ -205,10 +211,10 @@ Partial Class dlgCumulativeDistribution Friend WithEvents ucrChkIncludePoints As ucrCheck Friend WithEvents ucrChkCountsOnYAxis As ucrCheck Friend WithEvents ucrPnlOption As UcrPanel - Friend WithEvents rdoCumulative As RadioButton - Friend WithEvents rdoExceedance As RadioButton Friend WithEvents lblScale As Label Friend WithEvents ucrInputComboScales As ucrInputComboBox Friend WithEvents ucrNudBy As ucrNud Friend WithEvents lblNudby As Label + Friend WithEvents rdoExceedance As RadioButton + Friend WithEvents rdoCumulative As RadioButton End Class diff --git a/instat/dlgCumulativeDistribution.resx b/instat/dlgCumulativeDistribution.resx index adca11dc8dd..754125b136d 100644 --- a/instat/dlgCumulativeDistribution.resx +++ b/instat/dlgCumulativeDistribution.resx @@ -127,7 +127,7 @@ - 240, 207 + 270, 199 88, 13 @@ -177,78 +177,6 @@ 12 - - Button - - - Flat - - - NoControl - - - 112, 13 - - - 98, 27 - - - 12 - - - Cumulative - - - MiddleCenter - - - rdoCumulative - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - Button - - - Flat - - - NoControl - - - 204, 13 - - - 98, 27 - - - 13 - - - Exceedance - - - MiddleCenter - - - rdoExceedance - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - True @@ -256,7 +184,7 @@ NoControl - 188, 294 + 222, 277 51, 13 @@ -280,7 +208,7 @@ $this - 3 + 5 True @@ -289,7 +217,7 @@ NoControl - 180, 325 + 224, 304 59, 13 @@ -313,13 +241,13 @@ $this - 1 + 3 - 243, 325 + 284, 301 - 50, 20 + 46, 20 21 @@ -334,13 +262,13 @@ $this - 0 + 2 - 243, 294 + 281, 271 - 125, 26 + 79, 26 19 @@ -355,13 +283,16 @@ $this - 2 + 4 + + + None - 105, 12 + 66, 10 - 197, 30 + 273, 27 11 @@ -379,10 +310,10 @@ 6 - 10, 313 + 10, 304 - 152, 20 + 152, 19 8 @@ -400,10 +331,10 @@ 7 - 10, 287 + 10, 277 - 152, 20 + 152, 19 7 @@ -421,7 +352,7 @@ 8 - 10, 353 + 10, 331 4, 5, 4, 5 @@ -451,10 +382,82 @@ 6, 13 - 418, 441 + 414, 420 + + + Button + + + Flat + + + NoControl + + + 205, 10 + + + 135, 27 + + + 23 + + + Exceedance + + + MiddleCenter + + + rdoExceedance + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + Button + + + Flat + + + NoControl + + + 70, 10 + + + 135, 27 + + + 22 + + + Cumulative + + + MiddleCenter + + + rdoCumulative + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 - 243, 229 + 270, 214 0, 0, 0, 0 @@ -502,7 +505,7 @@ 14 - 10, 386 + 10, 360 410, 52 @@ -535,7 +538,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 243, 50 + 270, 43 125, 136 From 8dbc24a84ff5f71bb79f42d443d1b9172fc324a5 Mon Sep 17 00:00:00 2001 From: ivanluv Date: Fri, 5 Jun 2020 12:48:28 +0300 Subject: [PATCH 06/41] Minor changes --- instat/dlgCumulativeDistribution.Designer.vb | 44 +++--- instat/dlgCumulativeDistribution.resx | 148 +++++++++---------- instat/dlgCumulativeDistribution.vb | 51 +++---- 3 files changed, 114 insertions(+), 129 deletions(-) diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb index c9a3822570d..856e82ee795 100644 --- a/instat/dlgCumulativeDistribution.Designer.vb +++ b/instat/dlgCumulativeDistribution.Designer.vb @@ -43,6 +43,8 @@ Partial Class dlgCumulativeDistribution Me.cmdPlotOptions = New System.Windows.Forms.Button() Me.lblScale = New System.Windows.Forms.Label() Me.lblNudby = New System.Windows.Forms.Label() + Me.rdoCumulative = New System.Windows.Forms.RadioButton() + Me.rdoExceedance = New System.Windows.Forms.RadioButton() Me.ucrNudBy = New instat.ucrNud() Me.ucrInputComboScales = New instat.ucrInputComboBox() Me.ucrPnlOption = New instat.UcrPanel() @@ -53,8 +55,6 @@ Partial Class dlgCumulativeDistribution Me.ucrFactorReceiver = New instat.ucrReceiverSingle() Me.ucrCumDistSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.rdoCumulative = New System.Windows.Forms.RadioButton() - Me.rdoExceedance = New System.Windows.Forms.RadioButton() Me.SuspendLayout() ' 'lblFactors @@ -80,6 +80,26 @@ Partial Class dlgCumulativeDistribution resources.ApplyResources(Me.lblNudby, "lblNudby") Me.lblNudby.Name = "lblNudby" ' + 'rdoCumulative + ' + resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") + Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.FlatAppearance.BorderSize = 2 + Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.Name = "rdoCumulative" + Me.rdoCumulative.TabStop = True + Me.rdoCumulative.UseVisualStyleBackColor = True + ' + 'rdoExceedance + ' + resources.ApplyResources(Me.rdoExceedance, "rdoExceedance") + Me.rdoExceedance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoExceedance.FlatAppearance.BorderSize = 2 + Me.rdoExceedance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoExceedance.Name = "rdoExceedance" + Me.rdoExceedance.TabStop = True + Me.rdoExceedance.UseVisualStyleBackColor = True + ' 'ucrNudBy ' Me.ucrNudBy.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) @@ -151,26 +171,6 @@ Partial Class dlgCumulativeDistribution resources.ApplyResources(Me.ucrBase, "ucrBase") Me.ucrBase.Name = "ucrBase" ' - 'rdoCumulative - ' - resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") - Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.FlatAppearance.BorderSize = 2 - Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.Name = "rdoCumulative" - Me.rdoCumulative.TabStop = True - Me.rdoCumulative.UseVisualStyleBackColor = True - ' - 'rdoExceedance - ' - resources.ApplyResources(Me.rdoExceedance, "rdoExceedance") - Me.rdoExceedance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoExceedance.FlatAppearance.BorderSize = 2 - Me.rdoExceedance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoExceedance.Name = "rdoExceedance" - Me.rdoExceedance.TabStop = True - Me.rdoExceedance.UseVisualStyleBackColor = True - ' 'dlgCumulativeDistribution ' resources.ApplyResources(Me, "$this") diff --git a/instat/dlgCumulativeDistribution.resx b/instat/dlgCumulativeDistribution.resx index 754125b136d..81c18880a5b 100644 --- a/instat/dlgCumulativeDistribution.resx +++ b/instat/dlgCumulativeDistribution.resx @@ -243,11 +243,83 @@ 3 + + Button + + + Flat + + + NoControl + + + 70, 10 + + + 135, 27 + + + 22 + + + Cumulative + + + MiddleCenter + + + rdoCumulative + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Button + + + Flat + + + NoControl + + + 205, 10 + + + 135, 27 + + + 23 + + + Exceedance + + + MiddleCenter + + + rdoExceedance + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 284, 301 - 46, 20 + 56, 20 21 @@ -268,7 +340,7 @@ 281, 271 - 79, 26 + 87, 26 19 @@ -384,78 +456,6 @@ 414, 420 - - Button - - - Flat - - - NoControl - - - 205, 10 - - - 135, 27 - - - 23 - - - Exceedance - - - MiddleCenter - - - rdoExceedance - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - Button - - - Flat - - - NoControl - - - 70, 10 - - - 135, 27 - - - 22 - - - Cumulative - - - MiddleCenter - - - rdoCumulative - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - 270, 214 diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 10cdec2933a..34b53570790 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -17,9 +17,9 @@ Imports instat.Translations Public Class dlgCumulativeDistribution Private clsRggplotFunction As New RFunction - Private clsRgeomCumDistFunction As New RFunction + Private clsStatECDFFunction As New RFunction Private clsRaesFunction As New RFunction - Private clsAesFunction As New RFunction + Private clsStatECDFAesFunction As New RFunction Private clsBaseOperator As New ROperator Private bFirstLoad As Boolean = True Private clsLabsFunction As New RFunction @@ -32,8 +32,6 @@ Public Class dlgCumulativeDistribution Private bResetSubdialog As Boolean = True Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsSequence As New RFunction - Private clsYScalesFunc As New RFunction - Private clsYlabFunc As New RFunction Private bReset As Boolean = True Private strFirstParameterName As String = "stat_ecdf" @@ -42,10 +40,6 @@ Public Class dlgCumulativeDistribution Private clsCoordPolarFunction As New RFunction Private clsCoordPolarStartOperator As New ROperator - 'Parameter names for geoms - Private strPointFirstParameterName As String = "geomfunc" - Private strPointsParameterName As String = "geom_point" - Private strGeomPointParameterNames() As String = {strPointFirstParameterName, strPointsParameterName} Private Sub dlgCumulativeDistribution_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -75,8 +69,8 @@ Public Class dlgCumulativeDistribution ucrPnlOption.AddRadioButton(rdoCumulative) ucrPnlOption.AddRadioButton(rdoExceedance) - ucrPnlOption.AddParameterPresentCondition(rdoCumulative, "y", bNewIsPositive:=False) - ucrPnlOption.AddParameterPresentCondition(rdoExceedance, "y") + ucrPnlOption.AddParameterPresentCondition(rdoCumulative, "mapping", bNewIsPositive:=False) + ucrPnlOption.AddParameterPresentCondition(rdoExceedance, "mapping") ucrCumDistSelector.SetParameter(New RParameter("data", 0)) ucrCumDistSelector.SetParameterIsrfunction() @@ -114,10 +108,10 @@ Public Class dlgCumulativeDistribution clsGeomPointFunc.SetPackageName("ggplot2") clsGeomPointFunc.SetRCommand("geom_point") clsGeomPointFunc.AddParameter("stat", Chr(34) & "ecdf" & Chr(34)) - clsGeomPointParam.SetArgumentName(strPointsParameterName) + clsGeomPointParam.SetArgumentName("geom_point") clsGeomPointParam.SetArgument(clsGeomPointFunc) ucrChkIncludePoints.SetText("Include Points") - ucrChkIncludePoints.SetParameter(clsGeomPointParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrChkIncludePoints.SetParameter(clsGeomPointParam, bNewChangeParameterValue:=False) 'ucrInputComboPad.SetParameter(New RParameter("pad")) 'ucrInputComboPad.SetItems({"TRUE", "FALSE"}) @@ -135,9 +129,8 @@ Public Class dlgCumulativeDistribution Private Sub SetDefaults() clsBaseOperator = New ROperator clsRaesFunction = New RFunction - clsRgeomCumDistFunction = New RFunction + clsStatECDFFunction = New RFunction clsRggplotFunction = New RFunction - clsYScalesFunc = New RFunction clsSequence = New RFunction clsSequence.SetRCommand("seq") @@ -164,12 +157,14 @@ Public Class dlgCumulativeDistribution clsRaesFunction.SetRCommand("aes") clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) - clsRgeomCumDistFunction.SetPackageName("ggplot2") - clsRgeomCumDistFunction.SetRCommand("stat_ecdf") - clsRgeomCumDistFunction.AddParameter("pad", "FALSE") + clsStatECDFFunction.SetPackageName("ggplot2") + clsStatECDFFunction.SetRCommand("stat_ecdf") + clsStatECDFFunction.AddParameter("pad", "FALSE", iPosition:=0) + + clsStatECDFAesFunction.SetPackageName("ggplot2") + clsStatECDFAesFunction.SetRCommand("aes") + clsStatECDFAesFunction.AddParameter("y", "1 - ..y..", iPosition:=0) - clsAesFunction.SetPackageName("ggplot2") - clsAesFunction.SetRCommand("aes") clsYScalecontinuousFunction.AddParameter("labels", "scales::comma") @@ -189,7 +184,7 @@ Public Class dlgCumulativeDistribution clsYScalecontinuousFunction.AddParameter("breaks", clsRFunctionParameter:=clsSequence) - clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsRgeomCumDistFunction, iPosition:=1) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsStatECDFFunction, iPosition:=1) clsBaseOperator.AddParameter(strYScleParameterName, clsRFunctionParameter:=clsYScalecontinuousFunction, bIncludeArgumentName:=False) clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() @@ -205,7 +200,7 @@ Public Class dlgCumulativeDistribution ucrSaveCumDist.SetRCode(clsBaseOperator, bReset) ucrCumDistSelector.SetRCode(clsRggplotFunction, bReset) - ucrPnlOption.SetRCode(clsAesFunction, bReset) + ucrPnlOption.SetRCode(clsStatECDFFunction, bReset) ucrInputComboScales.SetRCode(clsYScalecontinuousFunction, bReset) 'ucrInputComboPad.SetRCode(clsRgeomCumDistFunction, bReset) @@ -240,19 +235,9 @@ Public Class dlgCumulativeDistribution Private Sub ucrPnlOption_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOption.ControlValueChanged If rdoExceedance.Checked Then - ' add y = ..y.. to aes() - clsAesFunction.AddParameter("y", "1 - ..y..") - ' add aes() - clsRgeomCumDistFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesFunction, iPosition:=1) + clsStatECDFFunction.AddParameter("mapping", clsRFunctionParameter:=clsStatECDFAesFunction, iPosition:=1) ElseIf rdoCumulative.Checked Then - ' remove y from aes() - clsAesFunction.RemoveParameterByName("y") - ' remove aes() if no parameters - If clsAesFunction.iParameterCount > 0 Then - clsRgeomCumDistFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesFunction, iPosition:=1) - Else - clsRgeomCumDistFunction.RemoveParameterByName("mapping") - End If + clsStatECDFFunction.RemoveParameterByName("mapping") End If End Sub From 1c0094226fbec4a38a69f5ea64bb91ee8ef9f20d Mon Sep 17 00:00:00 2001 From: ivanluv Date: Mon, 8 Jun 2020 09:26:56 +0300 Subject: [PATCH 07/41] Minor design changes --- instat/dlgCumulativeDistribution.resx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/dlgCumulativeDistribution.resx b/instat/dlgCumulativeDistribution.resx index 81c18880a5b..3c862126241 100644 --- a/instat/dlgCumulativeDistribution.resx +++ b/instat/dlgCumulativeDistribution.resx @@ -253,10 +253,10 @@ NoControl - 70, 10 + 119, 10 - 135, 27 + 86, 27 22 @@ -292,7 +292,7 @@ 205, 10 - 135, 27 + 86, 27 23 @@ -361,10 +361,10 @@ None - 66, 10 + 119, 10 - 273, 27 + 172, 27 11 From 10354759b98bd3212f4313126a72b19aabb0e691 Mon Sep 17 00:00:00 2001 From: ivanluv Date: Mon, 8 Jun 2020 12:02:25 +0300 Subject: [PATCH 08/41] Implementing include points --- instat/dlgCumulativeDistribution.vb | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 34b53570790..f12c7fe5cd9 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -14,10 +14,12 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . +Imports instat Imports instat.Translations Public Class dlgCumulativeDistribution Private clsRggplotFunction As New RFunction Private clsStatECDFFunction As New RFunction + Private clsStatEcdfGeomFunc As New RFunction Private clsRaesFunction As New RFunction Private clsStatECDFAesFunction As New RFunction Private clsBaseOperator As New ROperator @@ -56,8 +58,6 @@ Public Class dlgCumulativeDistribution End Sub Private Sub InitaliseDialog() - Dim clsGeomPointFunc As New RFunction - Dim clsGeomPointParam As New RParameter Dim dctScalesPairs As New Dictionary(Of String, String) ucrChkCountsOnYAxis.Enabled = False ' temporary What should this do? @@ -105,13 +105,9 @@ Public Class dlgCumulativeDistribution ucrChkCountsOnYAxis.SetText("Counts on Y Axis") - clsGeomPointFunc.SetPackageName("ggplot2") - clsGeomPointFunc.SetRCommand("geom_point") - clsGeomPointFunc.AddParameter("stat", Chr(34) & "ecdf" & Chr(34)) - clsGeomPointParam.SetArgumentName("geom_point") - clsGeomPointParam.SetArgument(clsGeomPointFunc) ucrChkIncludePoints.SetText("Include Points") - ucrChkIncludePoints.SetParameter(clsGeomPointParam, bNewChangeParameterValue:=False) + ucrChkIncludePoints.SetParameter(New RParameter("geom_point"), bNewChangeParameterValue:=False) + 'ucrInputComboPad.SetParameter(New RParameter("pad")) 'ucrInputComboPad.SetItems({"TRUE", "FALSE"}) @@ -131,6 +127,11 @@ Public Class dlgCumulativeDistribution clsRaesFunction = New RFunction clsStatECDFFunction = New RFunction clsRggplotFunction = New RFunction + clsStatEcdfGeomFunc = New RFunction + + + clsStatEcdfGeomFunc.SetRCommand("stat_ecdf") + clsStatEcdfGeomFunc.AddParameter("geom", strParameterValue:=Chr(34) & "point" & Chr(34)) clsSequence = New RFunction clsSequence.SetRCommand("seq") @@ -189,7 +190,7 @@ Public Class dlgCumulativeDistribution clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() - + clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrCumDistSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -203,6 +204,7 @@ Public Class dlgCumulativeDistribution ucrPnlOption.SetRCode(clsStatECDFFunction, bReset) ucrInputComboScales.SetRCode(clsYScalecontinuousFunction, bReset) + ucrChkIncludePoints.SetRCode(clsBaseOperator, bReset) 'ucrInputComboPad.SetRCode(clsRgeomCumDistFunction, bReset) ucrNudBy.SetRCode(clsSequence, bReset) @@ -241,7 +243,11 @@ Public Class dlgCumulativeDistribution End If End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorforCumDist.ControlContentsChanged, ucrSaveCumDist.ControlContentsChanged - + Private Sub ucrChkIncludePoints_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludePoints.ControlValueChanged + If ucrChkIncludePoints.Checked Then + clsBaseOperator.AddParameter("geom_point", clsRFunctionParameter:=clsStatEcdfGeomFunc, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_point") + End If End Sub End Class \ No newline at end of file From a2caa33049aac66b6305c0ec3f574637555bf4a4 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 9 Jun 2020 21:16:42 +0300 Subject: [PATCH 09/41] Numeric expression validations --- instat/ucrInput.vb | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index 007e3aa6d42..5d165b2834b 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -15,6 +15,7 @@ ' along with this program. If not, see . Imports instat +Imports RDotNet Public Class ucrInput Public bUserTyped As Boolean = False @@ -26,7 +27,8 @@ Public Class ucrInput Protected dcmMinimum As Decimal = Decimal.MinValue Protected dcmMaximum As Decimal = Decimal.MaxValue Protected bMinimumIncluded, bMaximumIncluded As Boolean - Protected bExpressionAllowed As Boolean = True + 'used to determine if valid expressions are allowed for numeric validations e.g 20/2 + Protected bNumericExpressionAllowed As Boolean = True Protected strDefaultType As String = "" Protected strDefaultPrefix As String = "" Protected WithEvents ucrDataFrameSelector As ucrDataFrame @@ -185,9 +187,9 @@ Public Class ucrInput End If End Sub - Public Sub SetValidationTypeAsNumeric(Optional dcmMin As Decimal = Decimal.MinValue, Optional bIncludeMin As Boolean = True, Optional dcmMax As Decimal = Decimal.MaxValue, Optional bIncludeMax As Boolean = True, Optional bExpressionAllowed As Boolean = True) + Public Sub SetValidationTypeAsNumeric(Optional dcmMin As Decimal = Decimal.MinValue, Optional bIncludeMin As Boolean = True, Optional dcmMax As Decimal = Decimal.MaxValue, Optional bIncludeMax As Boolean = True, Optional bNumericExpressionAllowed As Boolean = True) strValidationType = "Numeric" - Me.bExpressionAllowed = bExpressionAllowed + Me.bNumericExpressionAllowed = bNumericExpressionAllowed If dcmMin <> Decimal.MinValue Then dcmMinimum = dcmMin bMinimumIncluded = bIncludeMin @@ -339,16 +341,17 @@ Public Class ucrInput If strText <> "" AndAlso (strValuesToIgnore Is Nothing OrElse (strValuesToIgnore IsNot Nothing AndAlso Not strValuesToIgnore.Contains(strText))) Then If Not IsNumeric(strText) Then - iType = 1 - - If bExpressionAllowed Then - 'todo. is check if the expression is.numeric(strText) returns true - Dim bExpressionIsNumeric As Boolean - - If bExpressionIsNumeric Then - - - iType = 0 + iType = 1 'reset as invalid entry + 'if numeric expressions are allowed check the expression results to a valid numeric + If bNumericExpressionAllowed Then + Dim vecOutput As CharacterVector + 'is.numeric(x) returns true if the x expression is a valid one. + 'So we use it here to check validity of the entry + vecOutput = frmMain.clsRLink.RunInternalScriptGetOutput("is.numeric(" & strText & ")", bSilent:=True) + If vecOutput IsNot Nothing Then + If vecOutput.Length > 0 AndAlso Mid(vecOutput(0), 5).ToUpper = "TRUE" Then + iType = 0 'set as valid entry + End If End If End If Else From 5ba4bf05c8e3ce36b2144644e3498bd900e711af Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 9 Jun 2020 21:17:37 +0300 Subject: [PATCH 10/41] comment addition --- instat/ucrInput.vb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index 5d165b2834b..27edd990439 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -27,8 +27,6 @@ Public Class ucrInput Protected dcmMinimum As Decimal = Decimal.MinValue Protected dcmMaximum As Decimal = Decimal.MaxValue Protected bMinimumIncluded, bMaximumIncluded As Boolean - 'used to determine if valid expressions are allowed for numeric validations e.g 20/2 - Protected bNumericExpressionAllowed As Boolean = True Protected strDefaultType As String = "" Protected strDefaultPrefix As String = "" Protected WithEvents ucrDataFrameSelector As ucrDataFrame @@ -40,6 +38,9 @@ Public Class ucrInput Protected dctDisplayParameterValues As New Dictionary(Of String, String) Protected bFirstLoad As Boolean = True + 'used to determine if valid expressions are allowed for numeric validations e.g 20/2, 30-1 + Protected bNumericExpressionAllowed As Boolean = True + Public Sub New() ' This call is required by the designer. From 8167d72a1ce0c685e72ef9cb64f445b0c4d68cf2 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 10 Jun 2020 09:05:57 +0300 Subject: [PATCH 11/41] minor change --- instat/ucrInput.vb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/instat/ucrInput.vb b/instat/ucrInput.vb index 27edd990439..3a97f2e2a67 100644 --- a/instat/ucrInput.vb +++ b/instat/ucrInput.vb @@ -349,10 +349,8 @@ Public Class ucrInput 'is.numeric(x) returns true if the x expression is a valid one. 'So we use it here to check validity of the entry vecOutput = frmMain.clsRLink.RunInternalScriptGetOutput("is.numeric(" & strText & ")", bSilent:=True) - If vecOutput IsNot Nothing Then - If vecOutput.Length > 0 AndAlso Mid(vecOutput(0), 5).ToUpper = "TRUE" Then - iType = 0 'set as valid entry - End If + If vecOutput IsNot Nothing AndAlso vecOutput.Length > 0 AndAlso Mid(vecOutput(0), 5).ToUpper = "TRUE" Then + iType = 0 'set as valid entry End If End If Else From 55dfa81d86b8a9c492e2348d2c4709babefbf7d2 Mon Sep 17 00:00:00 2001 From: ivanluv Date: Wed, 10 Jun 2020 09:19:35 +0300 Subject: [PATCH 12/41] Adding te pad parameter --- instat/dlgCumulativeDistribution.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index f12c7fe5cd9..5b714b99add 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -131,7 +131,8 @@ Public Class dlgCumulativeDistribution clsStatEcdfGeomFunc.SetRCommand("stat_ecdf") - clsStatEcdfGeomFunc.AddParameter("geom", strParameterValue:=Chr(34) & "point" & Chr(34)) + clsStatEcdfGeomFunc.AddParameter("geom", strParameterValue:=Chr(34) & "point" & Chr(34), iPosition:=0) + clsStatEcdfGeomFunc.AddParameter("pad", strParameterValue:="FALSE") clsSequence = New RFunction clsSequence.SetRCommand("seq") From d2fd143eab87d09d70ff28c64621cdcc1229176a Mon Sep 17 00:00:00 2001 From: ivanluv Date: Thu, 11 Jun 2020 16:44:41 +0300 Subject: [PATCH 13/41] Removing unused code --- instat/dlgCumulativeDistribution.vb | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 5b714b99add..98e0f8d49a4 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -14,12 +14,10 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . -Imports instat Imports instat.Translations Public Class dlgCumulativeDistribution Private clsRggplotFunction As New RFunction Private clsStatECDFFunction As New RFunction - Private clsStatEcdfGeomFunc As New RFunction Private clsRaesFunction As New RFunction Private clsStatECDFAesFunction As New RFunction Private clsBaseOperator As New ROperator @@ -106,7 +104,8 @@ Public Class dlgCumulativeDistribution ucrChkCountsOnYAxis.SetText("Counts on Y Axis") ucrChkIncludePoints.SetText("Include Points") - ucrChkIncludePoints.SetParameter(New RParameter("geom_point"), bNewChangeParameterValue:=False) + ucrChkIncludePoints.SetParameter(New RParameter("geom", iNewPosition:=1), bNewChangeParameterValue:=False) + ucrChkIncludePoints.SetParameterValue(Chr(34) & "point" & Chr(34)) 'ucrInputComboPad.SetParameter(New RParameter("pad")) @@ -127,12 +126,6 @@ Public Class dlgCumulativeDistribution clsRaesFunction = New RFunction clsStatECDFFunction = New RFunction clsRggplotFunction = New RFunction - clsStatEcdfGeomFunc = New RFunction - - - clsStatEcdfGeomFunc.SetRCommand("stat_ecdf") - clsStatEcdfGeomFunc.AddParameter("geom", strParameterValue:=Chr(34) & "point" & Chr(34), iPosition:=0) - clsStatEcdfGeomFunc.AddParameter("pad", strParameterValue:="FALSE") clsSequence = New RFunction clsSequence.SetRCommand("seq") @@ -205,8 +198,7 @@ Public Class dlgCumulativeDistribution ucrPnlOption.SetRCode(clsStatECDFFunction, bReset) ucrInputComboScales.SetRCode(clsYScalecontinuousFunction, bReset) - ucrChkIncludePoints.SetRCode(clsBaseOperator, bReset) - 'ucrInputComboPad.SetRCode(clsRgeomCumDistFunction, bReset) + ucrChkIncludePoints.SetRCode(clsStatECDFFunction, bReset) ucrNudBy.SetRCode(clsSequence, bReset) @@ -238,17 +230,9 @@ Public Class dlgCumulativeDistribution Private Sub ucrPnlOption_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOption.ControlValueChanged If rdoExceedance.Checked Then - clsStatECDFFunction.AddParameter("mapping", clsRFunctionParameter:=clsStatECDFAesFunction, iPosition:=1) + clsStatECDFFunction.AddParameter("mapping", clsRFunctionParameter:=clsStatECDFAesFunction, iPosition:=2) ElseIf rdoCumulative.Checked Then clsStatECDFFunction.RemoveParameterByName("mapping") End If End Sub - - Private Sub ucrChkIncludePoints_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludePoints.ControlValueChanged - If ucrChkIncludePoints.Checked Then - clsBaseOperator.AddParameter("geom_point", clsRFunctionParameter:=clsStatEcdfGeomFunc, bIncludeArgumentName:=False) - Else - clsBaseOperator.RemoveParameterByName("geom_point") - End If - End Sub End Class \ No newline at end of file From 1ed7421381702ef0edaee7d505f31cf48d98c78d Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 11:07:00 +0100 Subject: [PATCH 14/41] Design --- instat/dlgStringHandling.resx | 470 +++++++++++++++++++++++++++------- 1 file changed, 373 insertions(+), 97 deletions(-) diff --git a/instat/dlgStringHandling.resx b/instat/dlgStringHandling.resx index c52b0196c72..c8e198ab648 100644 --- a/instat/dlgStringHandling.resx +++ b/instat/dlgStringHandling.resx @@ -127,13 +127,13 @@ - 255, 70 + 251, 80 45, 13 - 11 + 8 Column: @@ -157,13 +157,13 @@ NoControl - 254, 155 + 251, 168 65, 13 - 15 + 12 Replace By: @@ -187,13 +187,13 @@ NoControl - 254, 112 + 251, 122 44, 13 - 13 + 10 Pattern: @@ -220,10 +220,10 @@ NoControl - 60, 12 + 24, 12 - 95, 27 + 80, 27 1 @@ -256,10 +256,10 @@ NoControl - 432, 12 + 336, 12 - 95, 27 + 80, 27 5 @@ -292,10 +292,10 @@ NoControl - 339, 12 + 258, 12 - 95, 27 + 80, 27 4 @@ -328,10 +328,10 @@ NoControl - 246, 12 + 180, 12 - 95, 27 + 80, 27 3 @@ -364,10 +364,10 @@ NoControl - 153, 12 + 102, 12 - 95, 27 + 80, 27 2 @@ -400,10 +400,10 @@ NoControl - 525, 12 + 414, 12 - 95, 27 + 80, 27 6 @@ -426,6 +426,312 @@ 7 + + cmdClear + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 0 + + + cmdBackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 1 + + + cmdWBackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 2 + + + cmdDollarSign + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 3 + + + cmdOpenCloseParenthesis + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 4 + + + cmdBackSlashd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 5 + + + cmdBackSlashs + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 6 + + + cmdPower + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 7 + + + cmdOpenBracketCaretClosedBracket + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 8 + + + cmdPlus + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 9 + + + cmdBackSlashw + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 10 + + + cmdMultiply + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 11 + + + cmdOpenCloseBrace + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 12 + + + cmdOpenClosedBracket + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 13 + + + cmdSingleQuote + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 14 + + + cmdQuote + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 15 + + + cmdQuestionMark + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 16 + + + cmdDBackSlah + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 17 + + + cmdStar + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 18 + + + cmdBbackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 19 + + + cmdBackSlashb + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 20 + + + cmdSbackSlash + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 21 + + + cmdOr + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpRegex + + + 22 + + + 423, 81 + + + 2, 3, 2, 3 + + + 2, 3, 2, 3 + + + 239, 141 + + + 18 + + + Regex keyboard + + + grpRegex + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + Microsoft Sans Serif, 6.75pt @@ -442,7 +748,7 @@ 37, 60 - 145 + 17 Clear @@ -472,7 +778,7 @@ 38, 30 - 140 + 22 \ @@ -502,7 +808,7 @@ 38, 30 - 139 + 16 \ W @@ -532,7 +838,7 @@ 38, 30 - 138 + 11 $ @@ -562,7 +868,7 @@ 38, 30 - 137 + 5 ( ) @@ -592,7 +898,7 @@ 38, 30 - 136 + 20 \ d @@ -625,7 +931,7 @@ 38, 30 - 132 + 18 \ s @@ -655,7 +961,7 @@ 38, 30 - 133 + 10 ^ @@ -685,7 +991,7 @@ 38, 30 - 131 + 3 [ ^ ] @@ -715,7 +1021,7 @@ 38, 30 - 130 + 7 + @@ -745,7 +1051,7 @@ 38, 30 - 129 + 15 \ w @@ -775,7 +1081,7 @@ 38, 30 - 128 + 9 . @@ -805,7 +1111,7 @@ 38, 30 - 127 + 4 { } @@ -835,7 +1141,7 @@ 38, 30 - 126 + 2 [ ] @@ -865,7 +1171,7 @@ 38, 30 - 125 + 1 ' ' @@ -895,7 +1201,7 @@ 38, 30 - 124 + 0 " " @@ -925,7 +1231,7 @@ 38, 30 - 123 + 8 ? @@ -955,7 +1261,7 @@ 38, 30 - 122 + 21 \ D @@ -985,7 +1291,7 @@ 38, 30 - 121 + 6 * @@ -1015,7 +1321,7 @@ 38, 30 - 120 + 14 \ B @@ -1045,7 +1351,7 @@ 38, 30 - 119 + 13 \ b @@ -1075,7 +1381,7 @@ 38, 30 - 118 + 19 \ S @@ -1105,7 +1411,7 @@ 38, 30 - 117 + 12 |, @@ -1122,36 +1428,6 @@ 22 - - 423, 81 - - - 2, 3, 2, 3 - - - 2, 3, 2, 3 - - - 239, 141 - - - 180 - - - Regex keyboard - - - grpRegex - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - True @@ -1159,13 +1435,13 @@ NoControl - 324, 215 + 336, 232 56, 17 - 183 + 17 Regex @@ -1189,13 +1465,13 @@ NoControl - 268, 215 + 266, 232 50, 17 - 182 + 16 Fixed @@ -1213,13 +1489,13 @@ 1 - 262, 211 + 258, 227 - 116, 25 + 150, 28 - 181 + 15 ucrPnlFixedRegex @@ -1236,11 +1512,14 @@ 10, 260 + + 4, 5, 4, 5 + 293, 24 - 18 + 19 ucrSaveStringHandling @@ -1261,16 +1540,16 @@ 6, 13 - 665, 342 + 673, 346 - 9, 231 + 10, 232 239, 20 - 17 + 14 ucrChkIncludeRegularExpressions @@ -1285,7 +1564,7 @@ 6 - 250, 89 + 250, 95 0, 0, 0, 0 @@ -1294,7 +1573,7 @@ 158, 20 - 12 + 9 ucrReceiverStringHandling @@ -1309,13 +1588,13 @@ 13 - 250, 171 + 250, 183 158, 20 - 16 + 13 ucrInputReplaceBy @@ -1330,7 +1609,7 @@ 17 - 250, 129 + 250, 139 158, 20 @@ -1351,7 +1630,7 @@ 18 - 9, 45 + 10, 45 0, 0, 0, 0 @@ -1375,13 +1654,13 @@ 19 - 9, 290 + 10, 289 406, 52 - 19 + 20 ucrBase @@ -1396,10 +1675,10 @@ 20 - 60, 3 + 10, 8 - 560, 39 + 493, 39 0 @@ -1416,9 +1695,6 @@ 21 - - NoControl - CenterScreen @@ -1432,7 +1708,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 250, 127 + 250, 139 2, 3, 2, 3 @@ -1441,7 +1717,7 @@ 158, 28 - 14 + 11 ucrReceiverForRegexExpression From 79cb23048cc24e320df338ec019d67b554bfd34f Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 11:24:25 +0100 Subject: [PATCH 15/41] Change size --- instat/dlgStringHandling.resx | 336 +++------------------------------- instat/dlgStringHandling.vb | 17 +- 2 files changed, 41 insertions(+), 312 deletions(-) diff --git a/instat/dlgStringHandling.resx b/instat/dlgStringHandling.resx index c8e198ab648..8342b13c851 100644 --- a/instat/dlgStringHandling.resx +++ b/instat/dlgStringHandling.resx @@ -426,312 +426,6 @@ 7 - - cmdClear - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 0 - - - cmdBackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 1 - - - cmdWBackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 2 - - - cmdDollarSign - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 3 - - - cmdOpenCloseParenthesis - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 4 - - - cmdBackSlashd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 5 - - - cmdBackSlashs - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 6 - - - cmdPower - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 7 - - - cmdOpenBracketCaretClosedBracket - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 8 - - - cmdPlus - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 9 - - - cmdBackSlashw - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 10 - - - cmdMultiply - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 11 - - - cmdOpenCloseBrace - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 12 - - - cmdOpenClosedBracket - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 13 - - - cmdSingleQuote - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 14 - - - cmdQuote - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 15 - - - cmdQuestionMark - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 16 - - - cmdDBackSlah - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 17 - - - cmdStar - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 18 - - - cmdBbackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 19 - - - cmdBackSlashb - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 20 - - - cmdSbackSlash - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 21 - - - cmdOr - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpRegex - - - 22 - - - 423, 81 - - - 2, 3, 2, 3 - - - 2, 3, 2, 3 - - - 239, 141 - - - 18 - - - Regex keyboard - - - grpRegex - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - Microsoft Sans Serif, 6.75pt @@ -1428,6 +1122,36 @@ 22 + + 423, 81 + + + 2, 3, 2, 3 + + + 2, 3, 2, 3 + + + 239, 141 + + + 18 + + + Regex Keyboard + + + grpRegex + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + True diff --git a/instat/dlgStringHandling.vb b/instat/dlgStringHandling.vb index bc616afd765..55335c6da7b 100644 --- a/instat/dlgStringHandling.vb +++ b/instat/dlgStringHandling.vb @@ -120,7 +120,7 @@ Public Class dlgStringHandling ucrChkIncludeRegularExpressions.Checked = False rdoFixed.Checked = True rdoCount.Checked = True - Visibile() + VisibleRdo() ucrInputReplaceBy.Reset() ucrSaveStringHandling.Reset() @@ -160,7 +160,7 @@ Public Class dlgStringHandling End Sub 'temporary fix. - Private Sub Visibile() + Private Sub VisibleRdo() If ucrChkIncludeRegularExpressions.Checked Then rdoRegex.Visible = True rdoFixed.Visible = True @@ -289,7 +289,7 @@ Public Class dlgStringHandling Me.Size = New Size(iFullWidth, Me.Height) Else grpRegex.Visible = False - Me.Size = New Size(iFullWidth / 1.57, Me.Height) + Me.Size = New Size(536, Me.Height) End If End Sub @@ -409,10 +409,15 @@ Public Class dlgStringHandling ucrReceiverForRegexExpression.Clear() End Sub - Private Sub ucrPnlFixedRegex_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlFixedRegex.ControlContentsChanged, ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverForRegexExpression.ControlValueChanged, ucrInputPattern.ControlValueChanged - Visibile() + Private Sub ucrAll_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverForRegexExpression.ControlValueChanged, ucrInputPattern.ControlValueChanged + VisibleRdo() AddRemoveParameters() - 'ChangeSize() + End Sub + + Private Sub ucrPnlFixedRegex_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlFixedRegex.ControlContentsChanged + VisibleRdo() + AddRemoveParameters() + ChangeSize() End Sub Private Sub ucrReceiverStringHandling_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStringHandling.ControlContentsChanged, ucrPnlStringHandling.ControlContentsChanged, ucrInputPattern.ControlContentsChanged, ucrReceiverForRegexExpression.ControlContentsChanged, ucrPnlFixedRegex.ControlContentsChanged, ucrChkIncludeRegularExpressions.ControlContentsChanged, ucrSaveStringHandling.ControlContentsChanged From a483e8483314b9392e8b91452e329ef582e2b563 Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 12:18:03 +0100 Subject: [PATCH 16/41] Design changes - depth of dialog --- instat/DlgUseDate.Designer.vb | 292 +++++----- instat/DlgUseDate.resx | 971 +++++++++++++++++----------------- 2 files changed, 632 insertions(+), 631 deletions(-) diff --git a/instat/DlgUseDate.Designer.vb b/instat/DlgUseDate.Designer.vb index 385c150f61d..749d65c4ab5 100644 --- a/instat/DlgUseDate.Designer.vb +++ b/instat/DlgUseDate.Designer.vb @@ -41,20 +41,13 @@ Partial Class dlgUseDate Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgUseDate)) Me.lblDateVariable = New System.Windows.Forms.Label() - Me.lblShiftStartingMonth = New System.Windows.Forms.Label() - Me.lblDayInMonth = New System.Windows.Forms.Label() - Me.lblLeapYear = New System.Windows.Forms.Label() - Me.lblAbbr = New System.Windows.Forms.Label() - Me.lblName = New System.Windows.Forms.Label() - Me.lblWeekDay = New System.Windows.Forms.Label() - Me.lblWeek = New System.Windows.Forms.Label() - Me.lblNumeric = New System.Windows.Forms.Label() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.ttYearNumeric = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrReceiverUseDate = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtons() + Me.ucrSelectorUseDate = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrChkShiftYearName = New instat.ucrCheck() - Me.lblShifted = New System.Windows.Forms.Label() Me.lblDayinYear366 = New System.Windows.Forms.Label() Me.ucrChkShiftPentadAbbr = New instat.ucrCheck() - Me.ucrInputComboBoxStartingMonth = New instat.ucrInputComboBox() Me.lblShiftYear = New System.Windows.Forms.Label() Me.ucrChkShiftYearNum = New instat.ucrCheck() Me.lblShiftMonth = New System.Windows.Forms.Label() @@ -79,19 +72,26 @@ Partial Class dlgUseDate Me.ucrChkDaysInMonthNum = New instat.ucrCheck() Me.lblDaysInMonth = New System.Windows.Forms.Label() Me.ucrChkWeekName = New instat.ucrCheck() + Me.lblDayInMonth = New System.Windows.Forms.Label() Me.ucrChkDayInMonthNum = New instat.ucrCheck() + Me.lblNumeric = New System.Windows.Forms.Label() Me.ucrChkWeekAbbr = New instat.ucrCheck() + Me.lblWeek = New System.Windows.Forms.Label() Me.ucrChkWeekdayName = New instat.ucrCheck() + Me.lblWeekDay = New System.Windows.Forms.Label() Me.ucrChkWeekdayAbbr = New instat.ucrCheck() + Me.lblName = New System.Windows.Forms.Label() Me.ucrChkWeekNum = New instat.ucrCheck() + Me.lblLeapYear = New System.Windows.Forms.Label() Me.ucrChkWeekdayNum = New instat.ucrCheck() Me.ucrChkLeapYearNum = New instat.ucrCheck() - Me.ttYearNumeric = New System.Windows.Forms.ToolTip(Me.components) - Me.ucrReceiverUseDate = New instat.ucrReceiverSingle() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSelectorUseDate = New instat.ucrSelectorByDataFrameAddRemove() - Me.GroupBox1.SuspendLayout() + Me.lblAbbr = New System.Windows.Forms.Label() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.lblShifted = New System.Windows.Forms.Label() + Me.ucrInputComboBoxStartingMonth = New instat.ucrInputComboBox() + Me.lblShiftStartingMonth = New System.Windows.Forms.Label() Me.GroupBox2.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'lblDateVariable @@ -99,77 +99,27 @@ Partial Class dlgUseDate resources.ApplyResources(Me.lblDateVariable, "lblDateVariable") Me.lblDateVariable.Name = "lblDateVariable" ' - 'lblShiftStartingMonth - ' - resources.ApplyResources(Me.lblShiftStartingMonth, "lblShiftStartingMonth") - Me.lblShiftStartingMonth.Name = "lblShiftStartingMonth" - ' - 'lblDayInMonth - ' - resources.ApplyResources(Me.lblDayInMonth, "lblDayInMonth") - Me.lblDayInMonth.Name = "lblDayInMonth" - ' - 'lblLeapYear - ' - resources.ApplyResources(Me.lblLeapYear, "lblLeapYear") - Me.lblLeapYear.Name = "lblLeapYear" - ' - 'lblAbbr - ' - resources.ApplyResources(Me.lblAbbr, "lblAbbr") - Me.lblAbbr.Name = "lblAbbr" - ' - 'lblName - ' - resources.ApplyResources(Me.lblName, "lblName") - Me.lblName.Name = "lblName" - ' - 'lblWeekDay - ' - resources.ApplyResources(Me.lblWeekDay, "lblWeekDay") - Me.lblWeekDay.Name = "lblWeekDay" - ' - 'lblWeek + 'ucrReceiverUseDate ' - resources.ApplyResources(Me.lblWeek, "lblWeek") - Me.lblWeek.Name = "lblWeek" + Me.ucrReceiverUseDate.frmParent = Me + resources.ApplyResources(Me.ucrReceiverUseDate, "ucrReceiverUseDate") + Me.ucrReceiverUseDate.Name = "ucrReceiverUseDate" + Me.ucrReceiverUseDate.Selector = Nothing + Me.ucrReceiverUseDate.strNcFilePath = "" + Me.ucrReceiverUseDate.ucrSelector = Nothing ' - 'lblNumeric + 'ucrBase ' - resources.ApplyResources(Me.lblNumeric, "lblNumeric") - Me.lblNumeric.Name = "lblNumeric" + resources.ApplyResources(Me.ucrBase, "ucrBase") + Me.ucrBase.Name = "ucrBase" ' - 'GroupBox1 + 'ucrSelectorUseDate ' - Me.GroupBox1.Controls.Add(Me.ucrChkShiftYearName) - Me.GroupBox1.Controls.Add(Me.lblShifted) - Me.GroupBox1.Controls.Add(Me.lblDayinYear366) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftPentadAbbr) - Me.GroupBox1.Controls.Add(Me.ucrInputComboBoxStartingMonth) - Me.GroupBox1.Controls.Add(Me.lblShiftYear) - Me.GroupBox1.Controls.Add(Me.lblShiftStartingMonth) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftYearNum) - Me.GroupBox1.Controls.Add(Me.lblShiftMonth) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftDekadAbbr) - Me.GroupBox1.Controls.Add(Me.lblShiftPentad) - Me.GroupBox1.Controls.Add(Me.lblDayInYear) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftMonthAbbr) - Me.GroupBox1.Controls.Add(Me.lblShiftNumeric) - Me.GroupBox1.Controls.Add(Me.lblShiftQuarter) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftMonthName) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftQuarterAbbr) - Me.GroupBox1.Controls.Add(Me.lblShiftAbbr) - Me.GroupBox1.Controls.Add(Me.lblShiftDekad) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftDekadNum) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftQuarterNum) - Me.GroupBox1.Controls.Add(Me.ucrChkDayInYearNum) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftMonthNum) - Me.GroupBox1.Controls.Add(Me.lblShift) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftDayInYearNum366) - Me.GroupBox1.Controls.Add(Me.ucrChkShiftPentadNum) - resources.ApplyResources(Me.GroupBox1, "GroupBox1") - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.TabStop = False + Me.ucrSelectorUseDate.bDropUnusedFilterLevels = False + Me.ucrSelectorUseDate.bShowHiddenColumns = False + Me.ucrSelectorUseDate.bUseCurrentFilter = True + resources.ApplyResources(Me.ucrSelectorUseDate, "ucrSelectorUseDate") + Me.ucrSelectorUseDate.Name = "ucrSelectorUseDate" ' 'ucrChkShiftYearName ' @@ -177,11 +127,6 @@ Partial Class dlgUseDate Me.ucrChkShiftYearName.Checked = False Me.ucrChkShiftYearName.Name = "ucrChkShiftYearName" ' - 'lblShifted - ' - resources.ApplyResources(Me.lblShifted, "lblShifted") - Me.lblShifted.Name = "lblShifted" - ' 'lblDayinYear366 ' resources.ApplyResources(Me.lblDayinYear366, "lblDayinYear366") @@ -193,13 +138,6 @@ Partial Class dlgUseDate Me.ucrChkShiftPentadAbbr.Checked = False Me.ucrChkShiftPentadAbbr.Name = "ucrChkShiftPentadAbbr" ' - 'ucrInputComboBoxStartingMonth - ' - Me.ucrInputComboBoxStartingMonth.AddQuotesIfUnrecognised = True - Me.ucrInputComboBoxStartingMonth.IsReadOnly = False - resources.ApplyResources(Me.ucrInputComboBoxStartingMonth, "ucrInputComboBoxStartingMonth") - Me.ucrInputComboBoxStartingMonth.Name = "ucrInputComboBoxStartingMonth" - ' 'lblShiftYear ' resources.ApplyResources(Me.lblShiftYear, "lblShiftYear") @@ -351,36 +289,66 @@ Partial Class dlgUseDate Me.ucrChkWeekName.Checked = False Me.ucrChkWeekName.Name = "ucrChkWeekName" ' + 'lblDayInMonth + ' + resources.ApplyResources(Me.lblDayInMonth, "lblDayInMonth") + Me.lblDayInMonth.Name = "lblDayInMonth" + ' 'ucrChkDayInMonthNum ' resources.ApplyResources(Me.ucrChkDayInMonthNum, "ucrChkDayInMonthNum") Me.ucrChkDayInMonthNum.Checked = False Me.ucrChkDayInMonthNum.Name = "ucrChkDayInMonthNum" ' + 'lblNumeric + ' + resources.ApplyResources(Me.lblNumeric, "lblNumeric") + Me.lblNumeric.Name = "lblNumeric" + ' 'ucrChkWeekAbbr ' resources.ApplyResources(Me.ucrChkWeekAbbr, "ucrChkWeekAbbr") Me.ucrChkWeekAbbr.Checked = False Me.ucrChkWeekAbbr.Name = "ucrChkWeekAbbr" ' + 'lblWeek + ' + resources.ApplyResources(Me.lblWeek, "lblWeek") + Me.lblWeek.Name = "lblWeek" + ' 'ucrChkWeekdayName ' resources.ApplyResources(Me.ucrChkWeekdayName, "ucrChkWeekdayName") Me.ucrChkWeekdayName.Checked = False Me.ucrChkWeekdayName.Name = "ucrChkWeekdayName" ' + 'lblWeekDay + ' + resources.ApplyResources(Me.lblWeekDay, "lblWeekDay") + Me.lblWeekDay.Name = "lblWeekDay" + ' 'ucrChkWeekdayAbbr ' resources.ApplyResources(Me.ucrChkWeekdayAbbr, "ucrChkWeekdayAbbr") Me.ucrChkWeekdayAbbr.Checked = False Me.ucrChkWeekdayAbbr.Name = "ucrChkWeekdayAbbr" ' + 'lblName + ' + resources.ApplyResources(Me.lblName, "lblName") + Me.lblName.Name = "lblName" + ' 'ucrChkWeekNum ' resources.ApplyResources(Me.ucrChkWeekNum, "ucrChkWeekNum") Me.ucrChkWeekNum.Checked = False Me.ucrChkWeekNum.Name = "ucrChkWeekNum" ' + 'lblLeapYear + ' + resources.ApplyResources(Me.lblLeapYear, "lblLeapYear") + Me.lblLeapYear.Name = "lblLeapYear" + ' 'ucrChkWeekdayNum ' resources.ApplyResources(Me.ucrChkWeekdayNum, "ucrChkWeekdayNum") @@ -393,32 +361,64 @@ Partial Class dlgUseDate Me.ucrChkLeapYearNum.Checked = False Me.ucrChkLeapYearNum.Name = "ucrChkLeapYearNum" ' - 'ucrReceiverUseDate + 'lblAbbr ' - Me.ucrReceiverUseDate.frmParent = Me - resources.ApplyResources(Me.ucrReceiverUseDate, "ucrReceiverUseDate") - Me.ucrReceiverUseDate.Name = "ucrReceiverUseDate" - Me.ucrReceiverUseDate.Selector = Nothing - Me.ucrReceiverUseDate.strNcFilePath = "" - Me.ucrReceiverUseDate.ucrSelector = Nothing + resources.ApplyResources(Me.lblAbbr, "lblAbbr") + Me.lblAbbr.Name = "lblAbbr" ' - 'ucrBase + 'GroupBox1 ' - resources.ApplyResources(Me.ucrBase, "ucrBase") - Me.ucrBase.Name = "ucrBase" + Me.GroupBox1.Controls.Add(Me.lblShifted) + Me.GroupBox1.Controls.Add(Me.ucrInputComboBoxStartingMonth) + Me.GroupBox1.Controls.Add(Me.lblShiftStartingMonth) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.TabStop = False ' - 'ucrSelectorUseDate + 'lblShifted ' - Me.ucrSelectorUseDate.bDropUnusedFilterLevels = False - Me.ucrSelectorUseDate.bShowHiddenColumns = False - Me.ucrSelectorUseDate.bUseCurrentFilter = True - resources.ApplyResources(Me.ucrSelectorUseDate, "ucrSelectorUseDate") - Me.ucrSelectorUseDate.Name = "ucrSelectorUseDate" + resources.ApplyResources(Me.lblShifted, "lblShifted") + Me.lblShifted.Name = "lblShifted" + ' + 'ucrInputComboBoxStartingMonth + ' + Me.ucrInputComboBoxStartingMonth.AddQuotesIfUnrecognised = True + Me.ucrInputComboBoxStartingMonth.IsReadOnly = False + resources.ApplyResources(Me.ucrInputComboBoxStartingMonth, "ucrInputComboBoxStartingMonth") + Me.ucrInputComboBoxStartingMonth.Name = "ucrInputComboBoxStartingMonth" + ' + 'lblShiftStartingMonth + ' + resources.ApplyResources(Me.lblShiftStartingMonth, "lblShiftStartingMonth") + Me.lblShiftStartingMonth.Name = "lblShiftStartingMonth" ' 'dlgUseDate ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrChkShiftYearName) + Me.Controls.Add(Me.lblDayinYear366) + Me.Controls.Add(Me.ucrChkShiftPentadAbbr) + Me.Controls.Add(Me.lblShiftYear) + Me.Controls.Add(Me.ucrChkShiftYearNum) + Me.Controls.Add(Me.lblShiftMonth) + Me.Controls.Add(Me.ucrChkShiftDekadAbbr) + Me.Controls.Add(Me.lblShiftPentad) + Me.Controls.Add(Me.lblDayInYear) + Me.Controls.Add(Me.ucrChkShiftMonthAbbr) + Me.Controls.Add(Me.lblShiftNumeric) + Me.Controls.Add(Me.lblShiftQuarter) + Me.Controls.Add(Me.ucrChkShiftMonthName) + Me.Controls.Add(Me.ucrChkShiftQuarterAbbr) + Me.Controls.Add(Me.lblShiftAbbr) + Me.Controls.Add(Me.lblShiftDekad) + Me.Controls.Add(Me.ucrChkShiftDekadNum) + Me.Controls.Add(Me.ucrChkShiftQuarterNum) + Me.Controls.Add(Me.ucrChkDayInYearNum) + Me.Controls.Add(Me.ucrChkShiftMonthNum) + Me.Controls.Add(Me.lblShift) + Me.Controls.Add(Me.ucrChkShiftDayInYearNum366) + Me.Controls.Add(Me.ucrChkShiftPentadNum) Me.Controls.Add(Me.GroupBox2) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.ucrReceiverUseDate) @@ -429,10 +429,10 @@ Partial Class dlgUseDate Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgUseDate" - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -442,50 +442,50 @@ Partial Class dlgUseDate Friend WithEvents ucrBase As ucrButtons Friend WithEvents lblDateVariable As Label Friend WithEvents ucrReceiverUseDate As ucrReceiverSingle - Friend WithEvents ucrChkWeekdayNum As ucrCheck - Friend WithEvents ucrChkWeekNum As ucrCheck - Friend WithEvents ucrChkWeekName As ucrCheck - Friend WithEvents ucrChkWeekdayName As ucrCheck - Friend WithEvents ucrChkWeekdayAbbr As ucrCheck - Friend WithEvents ucrChkLeapYearNum As ucrCheck - Friend WithEvents lblShiftStartingMonth As Label - Friend WithEvents ucrInputComboBoxStartingMonth As ucrInputComboBox - Friend WithEvents ucrChkWeekAbbr As ucrCheck - Friend WithEvents ucrChkDayInMonthNum As ucrCheck - Friend WithEvents lblLeapYear As Label - Friend WithEvents lblAbbr As Label - Friend WithEvents lblName As Label - Friend WithEvents lblWeekDay As Label - Friend WithEvents lblWeek As Label - Friend WithEvents lblNumeric As Label - Friend WithEvents lblDayInMonth As Label - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents ttYearNumeric As ToolTip + Friend WithEvents ucrChkShiftYearName As ucrCheck + Friend WithEvents lblDayinYear366 As Label Friend WithEvents ucrChkShiftPentadAbbr As ucrCheck Friend WithEvents lblShiftYear As Label Friend WithEvents ucrChkShiftYearNum As ucrCheck + Friend WithEvents lblShiftMonth As Label Friend WithEvents ucrChkShiftDekadAbbr As ucrCheck + Friend WithEvents lblShiftPentad As Label + Friend WithEvents lblDayInYear As Label Friend WithEvents ucrChkShiftMonthAbbr As ucrCheck + Friend WithEvents lblShiftNumeric As Label + Friend WithEvents lblShiftQuarter As Label Friend WithEvents ucrChkShiftMonthName As ucrCheck + Friend WithEvents ucrChkShiftQuarterAbbr As ucrCheck Friend WithEvents lblShiftAbbr As Label + Friend WithEvents lblShiftDekad As Label Friend WithEvents ucrChkShiftDekadNum As ucrCheck + Friend WithEvents ucrChkShiftQuarterNum As ucrCheck + Friend WithEvents ucrChkDayInYearNum As ucrCheck Friend WithEvents ucrChkShiftMonthNum As ucrCheck - Friend WithEvents ucrChkShiftPentadNum As ucrCheck - Friend WithEvents ucrChkShiftDayInYearNum366 As ucrCheck Friend WithEvents lblShift As Label - Friend WithEvents ucrChkDayInYearNum As ucrCheck - Friend WithEvents ucrChkShiftQuarterNum As ucrCheck - Friend WithEvents lblShiftDekad As Label - Friend WithEvents ucrChkShiftQuarterAbbr As ucrCheck - Friend WithEvents lblShiftQuarter As Label - Friend WithEvents lblShiftNumeric As Label - Friend WithEvents lblDayInYear As Label - Friend WithEvents lblShiftMonth As Label - Friend WithEvents lblShiftPentad As Label - Friend WithEvents lblDayinYear366 As Label - Friend WithEvents lblShifted As Label - Friend WithEvents ucrChkShiftYearName As ucrCheck - Friend WithEvents ttYearNumeric As ToolTip + Friend WithEvents ucrChkShiftDayInYearNum366 As ucrCheck + Friend WithEvents ucrChkShiftPentadNum As ucrCheck + Friend WithEvents GroupBox2 As GroupBox Friend WithEvents ucrChkDaysInMonthNum As ucrCheck Friend WithEvents lblDaysInMonth As Label + Friend WithEvents ucrChkWeekName As ucrCheck + Friend WithEvents lblDayInMonth As Label + Friend WithEvents ucrChkDayInMonthNum As ucrCheck + Friend WithEvents lblNumeric As Label + Friend WithEvents ucrChkWeekAbbr As ucrCheck + Friend WithEvents lblWeek As Label + Friend WithEvents ucrChkWeekdayName As ucrCheck + Friend WithEvents lblWeekDay As Label + Friend WithEvents ucrChkWeekdayAbbr As ucrCheck + Friend WithEvents lblName As Label + Friend WithEvents ucrChkWeekNum As ucrCheck + Friend WithEvents lblLeapYear As Label + Friend WithEvents ucrChkWeekdayNum As ucrCheck + Friend WithEvents ucrChkLeapYearNum As ucrCheck + Friend WithEvents lblAbbr As Label + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents lblShifted As Label + Friend WithEvents ucrInputComboBoxStartingMonth As ucrInputComboBox + Friend WithEvents lblShiftStartingMonth As Label End Class \ No newline at end of file diff --git a/instat/DlgUseDate.resx b/instat/DlgUseDate.resx index 2bf1c428d96..192aa1a642b 100644 --- a/instat/DlgUseDate.resx +++ b/instat/DlgUseDate.resx @@ -127,13 +127,13 @@ - 257, 46 + 251, 44 33, 13 - 1 + 2 Date: @@ -148,276 +148,28 @@ $this - 3 - - - True - - - NoControl - - - 6, 18 - - - 79, 13 - - - 2 - - - Starting Month: - - - lblShiftStartingMonth - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 6 - - - None - - - True - - - NoControl - - - 62, 9 - - - 37, 26 - - - 10 - - - Day in -Month - - - lblDayInMonth - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 3 - - - None - - - True - - - NoControl - - - 318, 16 - - - 56, 13 - - - 14 - - - Leap Year - - - lblLeapYear - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 13 - - - None - - - True - - - NoControl - - - 10, 79 - - - 32, 13 - - - 12 - - - Abbr. - - - lblAbbr - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 16 - - - None - - - True - - - NoControl - - - 10, 110 - - - 35, 13 - - - 13 - - - Name - - - lblName - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 11 - - - None - - - True - - - NoControl - - - 237, 9 - - - 36, 26 + 26 - - 7 - - - Week - day - - - lblWeekDay - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 9 - - - None - - - True - - - NoControl - - - 137, 15 - - - 36, 13 - - - 8 - - - Week - - - lblWeek - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 7 - - - None - - + + 17, 17 + + True + + + 25 + + + 6, 13 - - NoControl - - - 5, 48 - - - 46, 13 - - - 11 - - - Numeric - - - lblNumeric - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 5 + + 489, 516 None - 70, 141 + 93, 316 6, 8, 6, 8 @@ -426,7 +178,7 @@ Month 13, 15 - 20 + 26 ucrChkShiftYearName @@ -435,41 +187,11 @@ Month instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this 0 - - True - - - NoControl - - - 224, 19 - - - 40, 13 - - - 13 - - - Shifted - - - lblShifted - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - - 1 - None @@ -480,13 +202,13 @@ Month NoControl - 170, 36 + 184, 229 56, 26 - 19 + 6 Day in @@ -499,16 +221,16 @@ Year (366) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 2 + 1 None - 372, 103 + 383, 289 6, 8, 6, 8 @@ -517,7 +239,7 @@ Year (366) 13, 15 - 16 + 23 ucrChkShiftPentadAbbr @@ -526,34 +248,10 @@ Year (366) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 3 - - - 85, 15 - - - 9, 12, 9, 12 - - - 137, 21 - - - 3 - - - ucrInputComboBoxStartingMonth - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - GroupBox1 - - - 4 + 2 None @@ -565,13 +263,13 @@ Year (366) NoControl - 67, 42 + 86, 236 29, 13 - 10 + 4 Year @@ -583,16 +281,16 @@ Year (366) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 5 + 3 None - 70, 70 + 93, 262 6, 8, 6, 8 @@ -601,7 +299,7 @@ Year (366) 13, 15 - 1 + 12 ucrChkShiftYearNum @@ -610,10 +308,10 @@ Year (366) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 7 + 4 None @@ -625,13 +323,13 @@ Year (366) NoControl - 115, 42 + 136, 236 37, 13 - 9 + 5 Month @@ -643,16 +341,16 @@ Year (366) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 8 + 5 None - 430, 103 + 441, 289 6, 8, 6, 8 @@ -661,7 +359,7 @@ Year (366) 13, 15 - 17 + 24 ucrChkShiftDekadAbbr @@ -670,10 +368,10 @@ Year (366) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 9 + 6 None @@ -685,13 +383,13 @@ Year (366) NoControl - 363, 42 + 371, 236 41, 13 - 7 + 9 Pentad @@ -703,10 +401,10 @@ Year (366) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 10 + 7 None @@ -718,13 +416,13 @@ Year (366) NoControl - 232, 36 + 247, 229 56, 26 - 9 + 7 Day in @@ -737,16 +435,16 @@ Year (365) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 11 + 8 None - 122, 103 + 151, 289 6, 8, 6, 8 @@ -755,7 +453,7 @@ Year (365) 13, 15 - 1 + 21 ucrChkShiftMonthAbbr @@ -764,10 +462,10 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 12 + 9 None @@ -779,7 +477,7 @@ Year (365) NoControl - 4, 70 + 23, 262 46, 13 @@ -797,10 +495,10 @@ Year (365) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 13 + 10 None @@ -812,13 +510,13 @@ Year (365) NoControl - 302, 42 + 311, 236 42, 13 - 15 + 8 Quarter @@ -830,16 +528,16 @@ Year (365) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 14 + 11 None - 122, 141 + 151, 316 6, 8, 6, 8 @@ -848,7 +546,7 @@ Year (365) 13, 15 - 1 + 27 ucrChkShiftMonthName @@ -857,16 +555,16 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 15 + 12 None - 311, 103 + 325, 289 6, 8, 6, 8 @@ -875,7 +573,7 @@ Year (365) 13, 15 - 18 + 22 ucrChkShiftQuarterAbbr @@ -884,10 +582,10 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 16 + 13 None @@ -899,13 +597,13 @@ Year (365) NoControl - 11, 103 + 30, 290 32, 13 - 12 + 20 Abbr. @@ -917,10 +615,10 @@ Year (365) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 17 + 14 None @@ -932,13 +630,13 @@ Year (365) NoControl - 410, 42 + 425, 236 39, 13 - 14 + 10 Dekad @@ -950,16 +648,16 @@ Year (365) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 18 + 15 None - 430, 70 + 441, 262 6, 8, 6, 8 @@ -968,7 +666,7 @@ Year (365) 13, 15 - 2 + 18 ucrChkShiftDekadNum @@ -977,16 +675,16 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 19 + 16 None - 311, 70 + 325, 262 6, 8, 6, 8 @@ -995,7 +693,7 @@ Year (365) 13, 15 - 6 + 16 ucrChkShiftQuarterNum @@ -1004,16 +702,16 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 20 + 17 None - 248, 70 + 267, 262 6, 8, 6, 8 @@ -1022,7 +720,7 @@ Year (365) 13, 15 - 5 + 15 ucrChkDayInYearNum @@ -1031,16 +729,16 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 21 + 18 None - 122, 70 + 151, 262 6, 8, 6, 8 @@ -1049,7 +747,7 @@ Year (365) 13, 15 - 1 + 13 ucrChkShiftMonthNum @@ -1058,10 +756,10 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 22 + 19 None @@ -1073,13 +771,13 @@ Year (365) NoControl - 9, 143 + 29, 318 35, 13 - 13 + 25 Name @@ -1091,16 +789,16 @@ Year (365) System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox1 + $this - 23 + 20 None - 183, 70 + 209, 262 6, 8, 6, 8 @@ -1109,7 +807,7 @@ Year (365) 13, 15 - 0 + 14 ucrChkShiftDayInYearNum366 @@ -1118,16 +816,16 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 + $this - 24 + 21 None - 372, 70 + 383, 262 6, 8, 6, 8 @@ -1136,7 +834,7 @@ Year (365) 13, 15 - 1 + 17 ucrChkShiftPentadNum @@ -1145,40 +843,19 @@ Year (365) instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - GroupBox1 - - - 25 - - - 10, 200 - - - 470, 175 - - - 11 - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - 1 + + 22 - 407, 48 + 416, 35 15, 15 - 16 + 10 ucrChkDaysInMonthNum @@ -1199,13 +876,13 @@ Year (365) NoControl - 386, 17 + 385, 12 75, 13 - 15 + 4 Days in Month @@ -1226,7 +903,7 @@ Year (365) None - 147, 108 + 175, 89 6, 8, 6, 8 @@ -1235,7 +912,7 @@ Year (365) 15, 15 - 0 + 15 ucrChkWeekName @@ -1249,11 +926,44 @@ Year (365) 2 + + None + + + True + + + NoControl + + + 74, 12 + + + 70, 13 + + + 0 + + + Day in Month + + + lblDayInMonth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 3 + None - 71, 46 + 102, 35 6, 8, 6, 8 @@ -1262,7 +972,7 @@ Year (365) 15, 15 - 14 + 6 ucrChkDayInMonthNum @@ -1276,11 +986,44 @@ Year (365) 4 + + None + + + True + + + NoControl + + + 11, 35 + + + 46, 13 + + + 5 + + + Numeric + + + lblNumeric + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 5 + None - 147, 77 + 175, 62 6, 8, 6, 8 @@ -1289,7 +1032,7 @@ Year (365) 15, 15 - 3 + 12 ucrChkWeekAbbr @@ -1303,38 +1046,104 @@ Year (365) 6 + + None + + + True + + + NoControl + + + 163, 12 + + + 36, 13 + + + 1 + + + Week + + + lblWeek + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 7 + None - - 248, 110 + + 241, 89 + + + 6, 8, 6, 8 + + + 15, 15 + + + 16 + + + ucrChkWeekdayName + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GroupBox2 + + + 8 + + + None + + + True + + + NoControl + + + 220, 12 - - 6, 8, 6, 8 + + 58, 13 - - 15, 15 + + 2 - - 0 + + Week Day - - ucrChkWeekdayName + + lblWeekDay - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + GroupBox2 - - 8 + + 9 None - 248, 79 + 241, 62 6, 8, 6, 8 @@ -1343,7 +1152,7 @@ Year (365) 15, 15 - 0 + 13 ucrChkWeekdayAbbr @@ -1357,11 +1166,44 @@ Year (365) 10 + + None + + + True + + + NoControl + + + 17, 91 + + + 35, 13 + + + 14 + + + Name + + + lblName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 11 + None - 147, 46 + 175, 35 6, 8, 6, 8 @@ -1370,7 +1212,7 @@ Year (365) 15, 15 - 3 + 7 ucrChkWeekNum @@ -1384,11 +1226,44 @@ Year (365) 12 + + None + + + True + + + NoControl + + + 310, 12 + + + 56, 13 + + + 3 + + + Leap Year + + + lblLeapYear + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 13 + None - 248, 46 + 241, 35 6, 8, 6, 8 @@ -1397,7 +1272,7 @@ Year (365) 15, 15 - 4 + 8 ucrChkWeekdayNum @@ -1415,7 +1290,7 @@ Year (365) None - 334, 48 + 326, 35 6, 8, 6, 8 @@ -1424,7 +1299,7 @@ Year (365) 15, 15 - 0 + 9 ucrChkLeapYearNum @@ -1438,14 +1313,47 @@ Year (365) 15 + + None + + + True + + + NoControl + + + 18, 63 + + + 32, 13 + + + 11 + + + Abbr. + + + lblAbbr + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 16 + - 10, 393 + 9, 337 - 477, 143 + 470, 117 - 12 + 28 GroupBox2 @@ -1457,25 +1365,115 @@ Year (365) $this + 23 + + + True + + + NoControl + + + 224, 19 + + + 40, 13 + + + 2 + + + Shifted + + + lblShifted + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + 0 - - 17, 17 - - + + 85, 15 + + + 9, 12, 9, 12 + + + 137, 21 + + + 1 + + + ucrInputComboBoxStartingMonth + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + GroupBox1 + + + 1 + + True - - - 25 - - - 6, 13 - - 499, 609 + + NoControl + + + 6, 18 + + + 79, 13 + + + 0 + + + Starting Month: + + + lblShiftStartingMonth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 2 + + + 9, 191 + + + 470, 147 + + + 4 + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 24 - 10, 553 + 10, 461 4, 5, 4, 5 @@ -1484,7 +1482,7 @@ Year (365) 401, 52 - 8 + 0 ucrBase @@ -1496,10 +1494,10 @@ Year (365) $this - 4 + 27 - 15, 9 + 10, 10 0, 0, 0, 0 @@ -1508,7 +1506,7 @@ Year (365) 210, 180 - 0 + 1 ucrSelectorUseDate @@ -1520,7 +1518,10 @@ Year (365) $this - 5 + 28 + + + NoControl CenterScreen @@ -1541,7 +1542,7 @@ Year (365) System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 260, 59 + 252, 59 0, 0, 0, 0 @@ -1550,7 +1551,7 @@ Year (365) 163, 20 - 2 + 3 ucrReceiverUseDate @@ -1562,6 +1563,6 @@ Year (365) $this - 2 + 25 \ No newline at end of file From d9893b57e920daaaf8b4f8022d7df7cd8e7c8d8d Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 13:24:12 +0100 Subject: [PATCH 17/41] Alignments, colons, width fix --- instat/DlgUseDate.resx | 47 ++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/instat/DlgUseDate.resx b/instat/DlgUseDate.resx index 192aa1a642b..d2380602b8a 100644 --- a/instat/DlgUseDate.resx +++ b/instat/DlgUseDate.resx @@ -477,16 +477,16 @@ Year (365) NoControl - 23, 262 + 17, 262 - 46, 13 + 49, 13 11 - Numeric + Numeric: lblShiftNumeric @@ -597,16 +597,16 @@ Year (365) NoControl - 30, 290 + 17, 290 - 32, 13 + 35, 13 20 - Abbr. + Abbr.: lblShiftAbbr @@ -771,16 +771,16 @@ Year (365) NoControl - 29, 318 + 17, 318 - 35, 13 + 38, 13 25 - Name + Name: lblShift @@ -996,16 +996,16 @@ Year (365) NoControl - 11, 35 + 8, 36 - 46, 13 + 49, 13 5 - Numeric + Numeric: lblNumeric @@ -1176,16 +1176,16 @@ Year (365) NoControl - 17, 91 + 8, 92 - 35, 13 + 38, 13 14 - Name + Name: lblName @@ -1323,16 +1323,16 @@ Year (365) NoControl - 18, 63 + 8, 64 - 32, 13 + 35, 13 11 - Abbr. + Abbr.: lblAbbr @@ -1374,7 +1374,7 @@ Year (365) NoControl - 224, 19 + 219, 19 40, 13 @@ -1398,13 +1398,13 @@ Year (365) 0 - 85, 15 + 99, 15 9, 12, 9, 12 - 137, 21 + 114, 21 1 @@ -1428,7 +1428,7 @@ Year (365) NoControl - 6, 18 + 8, 19 79, 13 @@ -1520,9 +1520,6 @@ Year (365) 28 - - NoControl - CenterScreen From 6f16c56836db09ff0535497a7b749740da341b0c Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 13:37:13 +0100 Subject: [PATCH 18/41] fixing width line --- instat/dlgStringHandling.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgStringHandling.vb b/instat/dlgStringHandling.vb index 55335c6da7b..f607eda85d5 100644 --- a/instat/dlgStringHandling.vb +++ b/instat/dlgStringHandling.vb @@ -289,7 +289,7 @@ Public Class dlgStringHandling Me.Size = New Size(iFullWidth, Me.Height) Else grpRegex.Visible = False - Me.Size = New Size(536, Me.Height) + Me.Size = New Size(iFullWidth / 1.29, Me.Height) End If End Sub From ff6f6bf7673e3e7075e29f601b753ac06e2836d2 Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 13:59:08 +0100 Subject: [PATCH 19/41] Design changes - width of dialog, spacing of buttons --- instat/dlgModelling.resx | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/instat/dlgModelling.resx b/instat/dlgModelling.resx index 59d167423b6..e7add0865a7 100644 --- a/instat/dlgModelling.resx +++ b/instat/dlgModelling.resx @@ -487,7 +487,7 @@ NoControl - 5, 101 + 4, 101 2, 3, 2, 3 @@ -961,7 +961,7 @@ NoControl - 309, 390 + 331, 354 105, 23 @@ -991,7 +991,7 @@ NoControl - 426, 390 + 448, 354 105, 23 @@ -1018,7 +1018,7 @@ NoControl - 5, 14 + 4, 14 2, 3, 2, 3 @@ -1048,13 +1048,13 @@ NoControl - 73, 14 + 72, 14 2, 3, 2, 3 - 77, 30 + 69, 30 129 @@ -1078,7 +1078,7 @@ 292, 68 - 155, 53 + 154, 49 18 @@ -1162,7 +1162,7 @@ NoControl - 3, 14 + 4, 14 2, 3, 2, 3 @@ -1222,7 +1222,7 @@ NoControl - 139, 14 + 140, 14 2, 3, 2, 3 @@ -1252,7 +1252,7 @@ NoControl - 3, 43 + 4, 43 2, 3, 2, 3 @@ -1282,7 +1282,7 @@ NoControl - 71, 14 + 72, 14 2, 3, 2, 3 @@ -1312,7 +1312,7 @@ NoControl - 3, 14 + 4, 14 2, 3, 2, 3 @@ -1372,7 +1372,7 @@ NoControl - 139, 72 + 140, 72 2, 3, 2, 3 @@ -1402,7 +1402,7 @@ NoControl - 3, 72 + 4, 72 2, 3, 2, 3 @@ -1462,7 +1462,7 @@ NoControl - 139, 43 + 140, 43 2, 3, 2, 3 @@ -1489,7 +1489,7 @@ 3 - 293, 68 + 292, 68 2, 3, 2, 3 @@ -1498,7 +1498,7 @@ 2, 3, 2, 3 - 212, 106 + 213, 106 20 @@ -1576,7 +1576,7 @@ 5 - 31, 347 + 4, 314 480, 33 @@ -1618,7 +1618,7 @@ 4 - 10, 388 + 13, 355 4, 5, 4, 5 @@ -1669,7 +1669,7 @@ 6, 13 - 667, 486 + 562, 442 10, 66 @@ -1696,7 +1696,7 @@ 15 - 10, 418 + 13, 387 410, 52 From a79c92f60c02f205cba3f328ff8eba9147bc8b5f Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 16:11:45 +0100 Subject: [PATCH 20/41] add ellipsis --- instat/dlgModelling.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgModelling.resx b/instat/dlgModelling.resx index e7add0865a7..6d6eb4dedd1 100644 --- a/instat/dlgModelling.resx +++ b/instat/dlgModelling.resx @@ -970,7 +970,7 @@ 11 - Display Options + Display Options... cmdDisplayOptions From a7736b51dbbb1481eeb66d4b157cc5be270f23d6 Mon Sep 17 00:00:00 2001 From: Lily Clements Date: Mon, 22 Jun 2020 17:03:21 +0100 Subject: [PATCH 21/41] remove ellipsis --- instat/dlgModelling.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgModelling.resx b/instat/dlgModelling.resx index 6d6eb4dedd1..e7add0865a7 100644 --- a/instat/dlgModelling.resx +++ b/instat/dlgModelling.resx @@ -970,7 +970,7 @@ 11 - Display Options... + Display Options cmdDisplayOptions From aa9eb6195b69b401e66c071a690088d4cef05c7f Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:13:46 +0300 Subject: [PATCH 22/41] Added a new menu called Structured to R-instat --- instat/frmMain.Designer.vb | 95 ++++++++++++++++++++------------------ instat/frmMain.resx | 40 ++++++++++------ 2 files changed, 77 insertions(+), 58 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 4fd08ecc27e..c58d39af3a4 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -580,20 +580,21 @@ Partial Class frmMain Me.splOverall = New System.Windows.Forms.SplitContainer() Me.splExtraWindows = New System.Windows.Forms.SplitContainer() Me.splMetadata = New System.Windows.Forms.SplitContainer() + Me.ucrColumnMeta = New instat.ucrColumnMetadata() + Me.ucrDataFrameMeta = New instat.ucrDataFrameMetadata() Me.splLogScript = New System.Windows.Forms.SplitContainer() + Me.ucrLogWindow = New instat.ucrLog() + Me.ucrScriptWindow = New instat.ucrScript() Me.splDataOutput = New System.Windows.Forms.SplitContainer() + Me.ucrDataViewer = New instat.ucrDataView() + Me.ucrOutput = New instat.ucrOutputWindow() Me.mnuRViewer = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPlotly = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = 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.mnuStructured = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -2449,7 +2450,7 @@ Partial Class frmMain Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) resources.ApplyResources(Me.mnuBar, "mnuBar") - Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) + Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Name = "mnuBar" Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System @@ -3672,6 +3673,18 @@ Partial Class frmMain Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) ' + 'ucrColumnMeta + ' + Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrColumnMeta, "ucrColumnMeta") + Me.ucrColumnMeta.Name = "ucrColumnMeta" + ' + 'ucrDataFrameMeta + ' + Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrDataFrameMeta, "ucrDataFrameMeta") + Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" + ' 'splLogScript ' Me.splLogScript.BackColor = System.Drawing.Color.LightGray @@ -3688,6 +3701,19 @@ Partial Class frmMain Me.splLogScript.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splLogScript.Panel2.Controls.Add(Me.ucrScriptWindow) ' + 'ucrLogWindow + ' + Me.ucrLogWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrLogWindow, "ucrLogWindow") + Me.ucrLogWindow.Name = "ucrLogWindow" + ' + 'ucrScriptWindow + ' + Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrScriptWindow, "ucrScriptWindow") + Me.ucrScriptWindow.Name = "ucrScriptWindow" + Me.ucrScriptWindow.Tag = "Script_Window" + ' 'splDataOutput ' Me.splDataOutput.BackColor = System.Drawing.Color.LightGray @@ -3704,6 +3730,20 @@ Partial Class frmMain Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) ' + 'ucrDataViewer + ' + Me.ucrDataViewer.BackColor = System.Drawing.SystemColors.Control + Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrDataViewer, "ucrDataViewer") + Me.ucrDataViewer.Name = "ucrDataViewer" + Me.ucrDataViewer.Tag = "Data_View" + ' + 'ucrOutput + ' + Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrOutput, "ucrOutput") + Me.ucrOutput.Name = "ucrOutput" + ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" @@ -3734,44 +3774,10 @@ Partial Class frmMain Me.mnuLogFile.Name = "mnuLogFile" resources.ApplyResources(Me.mnuLogFile, "mnuLogFile") ' - 'ucrColumnMeta - ' - Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrColumnMeta, "ucrColumnMeta") - Me.ucrColumnMeta.Name = "ucrColumnMeta" - ' - 'ucrDataFrameMeta - ' - Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrDataFrameMeta, "ucrDataFrameMeta") - Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - ' - 'ucrLogWindow - ' - Me.ucrLogWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrLogWindow, "ucrLogWindow") - Me.ucrLogWindow.Name = "ucrLogWindow" - ' - 'ucrScriptWindow - ' - Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrScriptWindow, "ucrScriptWindow") - Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Tag = "Script_Window" - ' - 'ucrDataViewer - ' - Me.ucrDataViewer.BackColor = System.Drawing.SystemColors.Control - Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrDataViewer, "ucrDataViewer") - Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Tag = "Data_View" + 'mnuStructured ' - 'ucrOutput - ' - Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrOutput, "ucrOutput") - Me.ucrOutput.Name = "ucrOutput" + Me.mnuStructured.Name = "mnuStructured" + resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' 'frmMain ' @@ -4374,4 +4380,5 @@ Partial Class frmMain Friend WithEvents mnuClimaticCheckDataHomogenization As ToolStripMenuItem Friend WithEvents mnuClimaticPrepareCompareCalculation As ToolStripMenuItem Friend WithEvents mnuClimaticPrepareCompareSummary As ToolStripMenuItem + Friend WithEvents mnuStructured As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 9427d8057a6..6629de791b9 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -146,7 +146,7 @@ Rating Data... - 172, 22 + 180, 22 One Variable @@ -173,7 +173,7 @@ Frequencies... - 172, 22 + 180, 22 Two Variables @@ -207,7 +207,7 @@ Frequencies - 172, 22 + 180, 22 Three Variables @@ -300,7 +300,7 @@ Mosaic Plot... - 172, 22 + 180, 22 Specific @@ -336,13 +336,13 @@ Use Summaries... - 172, 22 + 180, 22 General - 169, 6 + 177, 6 203, 22 @@ -363,22 +363,22 @@ Canonical Correlations... - 172, 22 + 180, 22 Multivariate - 169, 6 + 177, 6 - 172, 22 + 180, 22 Use Graph... - 172, 22 + 180, 22 Combine Graphs... @@ -387,13 +387,13 @@ False - 172, 22 + 180, 22 Themes... - 172, 22 + 180, 22 View Graph... @@ -1284,7 +1284,7 @@ Extremes... - 180, 22 + 143, 22 Calculation... @@ -1296,7 +1296,7 @@ False - 180, 22 + 143, 22 Summary... @@ -3408,6 +3408,12 @@ Prepare + + 74, 20 + + + Structured + 216, 22 @@ -9345,6 +9351,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructured + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From e4ffca623dddd7cb7b2e2d96144c90e74af09275 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:17:36 +0300 Subject: [PATCH 23/41] Added sub menus --- instat/frmMain.Designer.vb | 23 +++++++++++++++++++++++ instat/frmMain.resx | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index c58d39af3a4..5074025e0a7 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -595,6 +595,9 @@ Partial Class frmMain Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructured = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredCircular = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredCircularDefine = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3776,9 +3779,26 @@ Partial Class frmMain ' 'mnuStructured ' + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' + 'ToolStripSeparator20 + ' + Me.ToolStripSeparator20.Name = "ToolStripSeparator20" + resources.ApplyResources(Me.ToolStripSeparator20, "ToolStripSeparator20") + ' + 'mnuStructuredCircular + ' + Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine}) + Me.mnuStructuredCircular.Name = "mnuStructuredCircular" + resources.ApplyResources(Me.mnuStructuredCircular, "mnuStructuredCircular") + ' + 'mnuStructuredCircularDefine + ' + Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" + resources.ApplyResources(Me.mnuStructuredCircularDefine, "mnuStructuredCircularDefine") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4381,4 +4401,7 @@ Partial Class frmMain Friend WithEvents mnuClimaticPrepareCompareCalculation As ToolStripMenuItem Friend WithEvents mnuClimaticPrepareCompareSummary As ToolStripMenuItem Friend WithEvents mnuStructured As ToolStripMenuItem + Friend WithEvents ToolStripSeparator20 As ToolStripSeparator + Friend WithEvents mnuStructuredCircular As ToolStripMenuItem + Friend WithEvents mnuStructuredCircularDefine As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 6629de791b9..dc43fe5064f 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3408,6 +3408,21 @@ Prepare + + 177, 6 + + + 180, 22 + + + Define... + + + 180, 22 + + + Circular + 74, 20 @@ -9357,6 +9372,24 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator20 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredCircular + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredCircularDefine + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 94ee5b1d415735ab3adf746e6c82675c586f4544 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:21:18 +0300 Subject: [PATCH 24/41] Added sub menu --- instat/frmMain.Designer.vb | 17 ++++++++++++++++- instat/frmMain.resx | 24 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 5074025e0a7..cdcd0a6b098 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -598,6 +598,8 @@ Partial Class frmMain Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator() Me.mnuStructuredCircular = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredCircularDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredLow_Flow = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredLow_FlowDefine = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3779,7 +3781,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3799,6 +3801,17 @@ Partial Class frmMain Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" resources.ApplyResources(Me.mnuStructuredCircularDefine, "mnuStructuredCircularDefine") ' + 'mnuStructuredLow_Flow + ' + Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) + Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" + resources.ApplyResources(Me.mnuStructuredLow_Flow, "mnuStructuredLow_Flow") + ' + 'mnuStructuredLow_FlowDefine + ' + Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" + resources.ApplyResources(Me.mnuStructuredLow_FlowDefine, "mnuStructuredLow_FlowDefine") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4404,4 +4417,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator20 As ToolStripSeparator Friend WithEvents mnuStructuredCircular As ToolStripMenuItem Friend WithEvents mnuStructuredCircularDefine As ToolStripMenuItem + Friend WithEvents mnuStructuredLow_Flow As ToolStripMenuItem + Friend WithEvents mnuStructuredLow_FlowDefine As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index dc43fe5064f..1745b6c70d4 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3423,6 +3423,18 @@ Circular + + 180, 22 + + + Define... + + + 180, 22 + + + Low_Flow + 74, 20 @@ -9390,6 +9402,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredLow_Flow + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredLow_FlowDefine + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From bc7d49867af781d4d1dc3fe027296aff0f1b641e Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:24:33 +0300 Subject: [PATCH 25/41] Added sub menu --- instat/frmMain.Designer.vb | 17 ++++++++++++++++- instat/frmMain.resx | 24 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index cdcd0a6b098..a67c7f4117f 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -600,6 +600,8 @@ Partial Class frmMain Me.mnuStructuredCircularDefine = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredLow_Flow = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredLow_FlowDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredSurvival = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredSurvivalDefine = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3781,7 +3783,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3812,6 +3814,17 @@ Partial Class frmMain Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" resources.ApplyResources(Me.mnuStructuredLow_FlowDefine, "mnuStructuredLow_FlowDefine") ' + 'mnuStructuredSurvival + ' + Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) + Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" + resources.ApplyResources(Me.mnuStructuredSurvival, "mnuStructuredSurvival") + ' + 'mnuStructuredSurvivalDefine + ' + Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" + resources.ApplyResources(Me.mnuStructuredSurvivalDefine, "mnuStructuredSurvivalDefine") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4419,4 +4432,6 @@ Partial Class frmMain Friend WithEvents mnuStructuredCircularDefine As ToolStripMenuItem Friend WithEvents mnuStructuredLow_Flow As ToolStripMenuItem Friend WithEvents mnuStructuredLow_FlowDefine As ToolStripMenuItem + Friend WithEvents mnuStructuredSurvival As ToolStripMenuItem + Friend WithEvents mnuStructuredSurvivalDefine As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 1745b6c70d4..44eab35b9b6 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3435,6 +3435,18 @@ Low_Flow + + 180, 22 + + + Define... + + + 180, 22 + + + Survival + 74, 20 @@ -9414,6 +9426,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredSurvival + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredSurvivalDefine + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From e8567e6bd12c5162b227a15bcaf3a382fe54bf42 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:26:10 +0300 Subject: [PATCH 26/41] Added sub menu --- instat/frmMain.Designer.vb | 9 ++++++++- instat/frmMain.resx | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index a67c7f4117f..734c8deab82 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -602,6 +602,7 @@ Partial Class frmMain Me.mnuStructuredLow_FlowDefine = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredSurvival = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredSurvivalDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeries = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3783,7 +3784,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3825,6 +3826,11 @@ Partial Class frmMain Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" resources.ApplyResources(Me.mnuStructuredSurvivalDefine, "mnuStructuredSurvivalDefine") ' + 'mnuStructuredTimeSeries + ' + Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" + resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4434,4 +4440,5 @@ Partial Class frmMain Friend WithEvents mnuStructuredLow_FlowDefine As ToolStripMenuItem Friend WithEvents mnuStructuredSurvival As ToolStripMenuItem Friend WithEvents mnuStructuredSurvivalDefine As ToolStripMenuItem + Friend WithEvents mnuStructuredTimeSeries As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 44eab35b9b6..4920528ea11 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3447,6 +3447,12 @@ Survival + + 180, 22 + + + Time Series + 74, 20 @@ -9438,6 +9444,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredTimeSeries + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 8a3e4dc07537d66e5dfdb1b441984e663f5054a5 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:27:56 +0300 Subject: [PATCH 27/41] Added a sub menu --- instat/frmMain.Designer.vb | 15 +++++++++++++++ instat/frmMain.resx | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 734c8deab82..fbc3dee90bb 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -603,6 +603,8 @@ Partial Class frmMain Me.mnuStructuredSurvival = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredSurvivalDefine = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredTimeSeries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator60 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3828,9 +3830,20 @@ Partial Class frmMain ' 'mnuStructuredTimeSeries ' + Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") ' + 'mnuStructuredTimeSeriesDefine + ' + Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDefine, "mnuStructuredTimeSeriesDefine") + ' + 'ToolStripSeparator60 + ' + Me.ToolStripSeparator60.Name = "ToolStripSeparator60" + resources.ApplyResources(Me.ToolStripSeparator60, "ToolStripSeparator60") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4441,4 +4454,6 @@ Partial Class frmMain Friend WithEvents mnuStructuredSurvival As ToolStripMenuItem Friend WithEvents mnuStructuredSurvivalDefine As ToolStripMenuItem Friend WithEvents mnuStructuredTimeSeries As ToolStripMenuItem + Friend WithEvents mnuStructuredTimeSeriesDefine As ToolStripMenuItem + Friend WithEvents ToolStripSeparator60 As ToolStripSeparator End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 4920528ea11..d066412ab89 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3447,6 +3447,15 @@ Survival + + 180, 22 + + + Define... + + + 177, 6 + 180, 22 @@ -9450,6 +9459,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredTimeSeriesDefine + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator60 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From a3b872d89bc9d275a8910d7108fcc1dc0c4e8b3c Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:34:29 +0300 Subject: [PATCH 28/41] Added a sub menu --- instat/frmMain.Designer.vb | 24 +++++++++++++++++++++++- instat/frmMain.resx | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index fbc3dee90bb..9c970727b6b 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -605,6 +605,9 @@ Partial Class frmMain Me.mnuStructuredTimeSeries = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredTimeSeriesDefine = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator60 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredTimeSeriesDescribe = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesDescribeOneVariable = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3830,7 +3833,7 @@ Partial Class frmMain ' 'mnuStructuredTimeSeries ' - Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60}) + Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") ' @@ -3844,6 +3847,22 @@ Partial Class frmMain Me.ToolStripSeparator60.Name = "ToolStripSeparator60" resources.ApplyResources(Me.ToolStripSeparator60, "ToolStripSeparator60") ' + 'mnuStructuredTimeSeriesDescribe + ' + Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) + Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribe, "mnuStructuredTimeSeriesDescribe") + ' + 'mnuStructuredTimeSeriesDescribeOneVariable + ' + Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeOneVariable, "mnuStructuredTimeSeriesDescribeOneVariable") + ' + 'mnuStructuredTimeSeriesDescribeGeneral + ' + Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeGeneral, "mnuStructuredTimeSeriesDescribeGeneral") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4456,4 +4475,7 @@ Partial Class frmMain Friend WithEvents mnuStructuredTimeSeries As ToolStripMenuItem Friend WithEvents mnuStructuredTimeSeriesDefine As ToolStripMenuItem Friend WithEvents ToolStripSeparator60 As ToolStripSeparator + Friend WithEvents mnuStructuredTimeSeriesDescribe As ToolStripMenuItem + Friend WithEvents mnuStructuredTimeSeriesDescribeOneVariable As ToolStripMenuItem + Friend WithEvents mnuStructuredTimeSeriesDescribeGeneral As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index d066412ab89..b6725ffbaa2 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3456,6 +3456,24 @@ 177, 6 + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 180, 22 + + + Describe + 180, 22 @@ -9471,6 +9489,24 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredTimeSeriesDescribe + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredTimeSeriesDescribeOneVariable + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredTimeSeriesDescribeGeneral + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 2428ef8b90ed87f1b6d3d52e8ff4053d61aa8ce2 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:37:13 +0300 Subject: [PATCH 29/41] Added a sub menu --- instat/frmMain.Designer.vb | 16 +++++++++++++++- instat/frmMain.resx | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9c970727b6b..23480759ada 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -608,6 +608,8 @@ Partial Class frmMain Me.mnuStructuredTimeSeriesDescribe = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredTimeSeriesDescribeOneVariable = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredTimeSeriesDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator61 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredTimeSeriesModel = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3833,7 +3835,7 @@ Partial Class frmMain ' 'mnuStructuredTimeSeries ' - Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe}) + Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") ' @@ -3863,6 +3865,16 @@ Partial Class frmMain Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeGeneral, "mnuStructuredTimeSeriesDescribeGeneral") ' + 'ToolStripSeparator61 + ' + Me.ToolStripSeparator61.Name = "ToolStripSeparator61" + resources.ApplyResources(Me.ToolStripSeparator61, "ToolStripSeparator61") + ' + 'mnuStructuredTimeSeriesModel + ' + Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" + resources.ApplyResources(Me.mnuStructuredTimeSeriesModel, "mnuStructuredTimeSeriesModel") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4478,4 +4490,6 @@ Partial Class frmMain Friend WithEvents mnuStructuredTimeSeriesDescribe As ToolStripMenuItem Friend WithEvents mnuStructuredTimeSeriesDescribeOneVariable As ToolStripMenuItem Friend WithEvents mnuStructuredTimeSeriesDescribeGeneral As ToolStripMenuItem + Friend WithEvents ToolStripSeparator61 As ToolStripSeparator + Friend WithEvents mnuStructuredTimeSeriesModel As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index b6725ffbaa2..3f86d12158a 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3474,6 +3474,15 @@ Describe + + 177, 6 + + + 180, 22 + + + Model + 180, 22 @@ -9507,6 +9516,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator61 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredTimeSeriesModel + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 1700533665955ae8d551f68374db94b4d91eed8f Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:42:33 +0300 Subject: [PATCH 30/41] Added a sub menu --- instat/frmMain.Designer.vb | 24 +- instat/frmMain.resx | 1123 +++++++++++++++++++----------------- 2 files changed, 601 insertions(+), 546 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 23480759ada..f62a005ff30 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -610,6 +610,9 @@ Partial Class frmMain Me.mnuStructuredTimeSeriesDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator61 = New System.Windows.Forms.ToolStripSeparator() Me.mnuStructuredTimeSeriesModel = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesModelOneVariable = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesModelGeneral = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator62 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3835,7 +3838,7 @@ Partial Class frmMain ' 'mnuStructuredTimeSeries ' - Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel}) + Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") ' @@ -3872,9 +3875,25 @@ Partial Class frmMain ' 'mnuStructuredTimeSeriesModel ' + Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" resources.ApplyResources(Me.mnuStructuredTimeSeriesModel, "mnuStructuredTimeSeriesModel") ' + 'mnuStructuredTimeSeriesModelOneVariable + ' + Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" + resources.ApplyResources(Me.mnuStructuredTimeSeriesModelOneVariable, "mnuStructuredTimeSeriesModelOneVariable") + ' + 'mnuStructuredTimeSeriesModelGeneral + ' + Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" + resources.ApplyResources(Me.mnuStructuredTimeSeriesModelGeneral, "mnuStructuredTimeSeriesModelGeneral") + ' + 'ToolStripSeparator62 + ' + Me.ToolStripSeparator62.Name = "ToolStripSeparator62" + resources.ApplyResources(Me.ToolStripSeparator62, "ToolStripSeparator62") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4492,4 +4511,7 @@ Partial Class frmMain Friend WithEvents mnuStructuredTimeSeriesDescribeGeneral As ToolStripMenuItem Friend WithEvents ToolStripSeparator61 As ToolStripSeparator Friend WithEvents mnuStructuredTimeSeriesModel As ToolStripMenuItem + Friend WithEvents mnuStructuredTimeSeriesModelOneVariable As ToolStripMenuItem + Friend WithEvents mnuStructuredTimeSeriesModelGeneral As ToolStripMenuItem + Friend WithEvents ToolStripSeparator62 As ToolStripSeparator End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 3f86d12158a..40ce0953704 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -118,6 +118,18 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 64, 20 + + + Describe + + + 180, 22 + + + One Variable + 146, 22 @@ -145,11 +157,11 @@ Rating Data... - + 180, 22 - - One Variable + + Two Variables 146, 22 @@ -172,11 +184,11 @@ Frequencies... - + 180, 22 - - Two Variables + + Three Variables @@ -206,11 +218,11 @@ Frequencies - + 180, 22 - - Three Variables + + Specific 209, 22 @@ -299,11 +311,11 @@ Mosaic Plot... - + 180, 22 - - Specific + + General 188, 22 @@ -335,15 +347,15 @@ Use Summaries... - - 180, 22 - - - General - 177, 6 + + 180, 22 + + + Multivariate + 203, 22 @@ -362,12 +374,6 @@ Canonical Correlations... - - 180, 22 - - - Multivariate - 177, 6 @@ -398,11 +404,17 @@ View Graph... - - 64, 20 + + 53, 20 - - Describe + + Model + + + 201, 22 + + + Probability Distributions 242, 22 @@ -425,15 +437,15 @@ Random Samples (Use Model)... - - 201, 22 - - - Probability Distributions - 198, 6 + + 201, 22 + + + Fit Model + 223, 22 @@ -482,11 +494,11 @@ Fit Model Keyboard... - + 201, 22 - - Fit Model + + Compare Models 149, 22 @@ -494,11 +506,11 @@ One Variable... - + 201, 22 - - Compare Models + + Use Model 192, 22 @@ -542,11 +554,14 @@ Use Model Keyboard... - + + False + + 201, 22 - - Use Model + + Other (One Variable) 166, 22 @@ -581,14 +596,14 @@ Goodness of Fit... - + False - + 201, 22 - - Other (One Variable) + + Other (Two Variables) False @@ -635,14 +650,14 @@ Non Parameteric One Way ANOVA... - + False - + 201, 22 - - Other (Two Variables) + + Other (Three Variable) False @@ -665,14 +680,14 @@ Chi-square Test... - + False - + 201, 22 - - Other (Three Variable) + + Other (General) False @@ -701,21 +716,6 @@ Log Linear... - - False - - - 201, 22 - - - Other (General) - - - 53, 20 - - - Model - False @@ -740,6 +740,15 @@ False + + 212, 22 + + + Evaporation + + + False + False @@ -758,13 +767,13 @@ Penman... - + 212, 22 - - Evaporation + + Crop - + False @@ -785,15 +794,6 @@ Water Satisfaction Index... - - 212, 22 - - - Crop - - - False - False @@ -806,6 +806,12 @@ False + + 44, 20 + + + View + 211, 22 @@ -872,11 +878,11 @@ Reset to Default Layout - + 44, 20 - - View + + Help 221, 22 @@ -938,6 +944,12 @@ 218, 6 + + 221, 22 + + + Guides + 166, 22 @@ -959,12 +971,6 @@ More... - - 221, 22 - - - Guides - False @@ -986,12 +992,6 @@ Acknowlegments - - 44, 20 - - - Help - 538, 56 @@ -1001,6 +1001,18 @@ 638, 56 + + 63, 20 + + + Climatic + + + 212, 22 + + + File + 211, 22 @@ -1049,15 +1061,15 @@ Export to CPT... - - 212, 22 - - - File - 209, 6 + + 212, 22 + + + Tidy and Examine + 211, 22 @@ -1130,11 +1142,11 @@ One Variable Frequencies - + 212, 22 - - Tidy and Examine + + Dates 162, 22 @@ -1178,18 +1190,18 @@ Use Time... - - 212, 22 - - - Dates - 212, 22 Define Climatic Data... + + 212, 22 + + + Check Data + 174, 22 @@ -1226,11 +1238,11 @@ Homogenization... - + 212, 22 - - Check Data + + Prepare 189, 22 @@ -1283,6 +1295,12 @@ Extremes... + + 189, 22 + + + Compare + 143, 22 @@ -1301,12 +1319,6 @@ Summary... - - 189, 22 - - - Compare - 186, 6 @@ -1415,15 +1427,15 @@ False - - 212, 22 - - - Prepare - 209, 6 + + 212, 22 + + + Describe + False @@ -1442,18 +1454,18 @@ Temperature... - - 139, 22 - - - Wind Rose... - 199, 22 Wind Speed/Direction... + + 139, 22 + + + Wind Rose... + False @@ -1478,11 +1490,11 @@ 196, 6 - + 212, 22 - - Describe + + PICSA 246, 22 @@ -1511,11 +1523,11 @@ Crops... - + 212, 22 - - PICSA + + CM SAF 231, 22 @@ -1529,18 +1541,18 @@ Export to CM SAF R Toolbox... - - 212, 22 - - - CM SAF - 212, 22 Mapping... + + 212, 22 + + + Model + 180, 22 @@ -1562,15 +1574,15 @@ Markov Modelling... - - 212, 22 - - - Model - 209, 6 + + 212, 22 + + + Seasonal Forecast Support + 246, 22 @@ -1610,11 +1622,20 @@ Cumulative/Exceedance Graph... - + 212, 22 - - Seasonal Forecast Support + + Climate Methods + + + False + + + 199, 22 + + + Data Manipulation False @@ -1751,11 +1772,11 @@ Output for CDT... - + 199, 22 - - Data Manipulation + + Graphics False @@ -1874,12 +1895,6 @@ Three Summaries... - - 199, 22 - - - Graphics - False @@ -1889,6 +1904,12 @@ Model... + + 199, 22 + + + Additional + False @@ -1934,12 +1955,6 @@ Water Balance... - - 199, 22 - - - Additional - False @@ -1949,21 +1964,6 @@ Create Climate Object... - - 212, 22 - - - Climate Methods - - - False - - - 63, 20 - - - Climatic - Ctrl+S @@ -1974,6 +1974,12 @@ Save... + + 232, 22 + + + Save As + 164, 22 @@ -1998,12 +2004,6 @@ Save Script As... - - 232, 22 - - - Save As - False @@ -2034,6 +2034,12 @@ Exit + + 39, 20 + + + Edit + False @@ -2118,24 +2124,12 @@ Select All - - 39, 20 - - - Edit - 775, 56 946, 56 - - 119, 17 - - - No worksheet loaded - 0, 460 @@ -2160,9 +2154,42 @@ 1 + + 119, 17 + + + No worksheet loaded + 17, 95 + + 0, 24 + + + No + + + 834, 37 + + + 7 + + + Tool + + + Tool_strip + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Magenta @@ -2226,18 +2253,6 @@ Edit Last Dialog - - 57, 6 - - - False - - - 57, 6 - - - False - Magenta @@ -2247,17 +2262,17 @@ Last 10 Dialogs - - 128, 22 + + 57, 6 - - R Viewer... + + False - - 128, 22 + + 57, 6 - - Plotly... + + False @@ -2297,6 +2312,18 @@ View Last Graph + + 128, 22 + + + R Viewer... + + + 128, 22 + + + Plotly... + 6, 37 @@ -2318,18 +2345,6 @@ Output Window - - 196, 22 - - - Column Metadata... - - - 196, 22 - - - Data Frame Metadata... - iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2386,17 +2401,17 @@ Column Metadata - - 160, 22 + + 196, 22 - - Log Window... + + Column Metadata... - - 160, 22 + + 196, 22 - - Script Window... + + Data Frame Metadata... @@ -2526,14 +2541,26 @@ Log Window - - Magenta - - - 34, 34 + + 160, 22 - - Reset Layout + + Log Window... + + + 160, 22 + + + Script Window... + + + Magenta + + + 34, 34 + + + Reset Layout 6, 37 @@ -2547,38 +2574,125 @@ He&lp - - 0, 24 + + 122, 95 + + + On - - No + + 37, 20 - - 834, 37 + + File - - 7 + + 59, 20 - - Tool + + Prepare - - Tool_strip + + 177, 6 - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 180, 22 - - $this + + Circular - - 2 + + 180, 22 - - 122, 95 - - - On + + Low_Flow + + + 180, 22 + + + Survival + + + 180, 22 + + + Define... + + + 177, 6 + + + 180, 22 + + + Describe + + + 177, 6 + + + 180, 22 + + + Model + + + 177, 6 + + + 180, 22 + + + Time Series + + + 74, 20 + + + Structured + + + 88, 20 + + + Procurement + + + 122, 20 + + + Options by Context + + + 46, 20 + + + Tools + + + 0, 0 + + + 834, 24 + + + 6 + + + Menu_strip + + + mnuBar + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 Ctrl+N @@ -2652,6 +2766,12 @@ 229, 6 + + 232, 22 + + + Export + 204, 22 @@ -2676,12 +2796,6 @@ Export Graph As Image... - - 232, 22 - - - Export - 232, 22 @@ -2691,11 +2805,11 @@ 229, 6 - - 37, 20 + + 172, 22 - - File + + Data Frame 200, 22 @@ -2805,11 +2919,11 @@ Colour by Property... - + 172, 22 - - Data Frame + + Check Data 245, 22 @@ -2898,12 +3012,6 @@ Anonymise ID Column... - - 172, 22 - - - Check Data - 169, 6 @@ -2913,6 +3021,12 @@ Calculator... + + 172, 22 + + + Column: Calculate + 179, 22 @@ -2967,11 +3081,11 @@ Permute Columns... - + 172, 22 - - Column: Calculate + + Column: Factor 179, 22 @@ -3060,11 +3174,11 @@ Factor Data Frame... - + 172, 22 - - Column: Factor + + Column: Text 152, 22 @@ -3105,11 +3219,11 @@ Distance... - + 172, 22 - - Column: Text + + Column: Date 162, 22 @@ -3153,11 +3267,11 @@ Use Time... - + 172, 22 - - Column: Date + + Column: Define 176, 22 @@ -3174,15 +3288,15 @@ Circular... - - 172, 22 - - - Column: Define - 169, 6 + + 172, 22 + + + Data Reshape + 193, 22 @@ -3243,15 +3357,15 @@ Transpose... - - 172, 22 - - - Data Reshape - 169, 6 + + 172, 22 + + + Keys and Links + 207, 22 @@ -3282,11 +3396,11 @@ Add Comment... - + 172, 22 - - Keys and Links + + Data Object False @@ -3339,161 +3453,62 @@ Metadata... - - False - - - 196, 22 - - - Rename Metadata... - - - False - - - 196, 22 - - - Reorder Metadata... - - - False - - - 196, 22 - - - Delete Metadata... - - - 172, 22 - - - Data Object - - - 126, 22 - - - View... - - - 126, 22 - - - Rename... - - - 126, 22 - - - Reorder... - - - 126, 22 - - - Delete... - - - 172, 22 - - - R Objects - - - 59, 20 - - - Prepare - - - 177, 6 - - - 180, 22 - - - Define... - - - 180, 22 - - - Circular - - - 180, 22 - - - Define... - - - 180, 22 - - - Low_Flow - - - 180, 22 - - - Define... - - - 180, 22 + + False - - Survival + + 196, 22 - - 180, 22 + + Rename Metadata... - - Define... + + False - - 177, 6 + + 196, 22 - - 180, 22 + + Reorder Metadata... - - One Variable... + + False - - 180, 22 + + 196, 22 - - General... + + Delete Metadata... - - 180, 22 + + 172, 22 - - Describe + + R Objects - - 177, 6 + + 126, 22 - - 180, 22 + + View... - - Model + + 126, 22 - - 180, 22 + + Rename... - - Time Series + + 126, 22 - - 74, 20 + + Reorder... - - Structured + + 126, 22 + + + Delete... 216, 22 @@ -3507,6 +3522,12 @@ Define Procurement Data... + + 216, 22 + + + Prepare + 358, 22 @@ -3561,11 +3582,11 @@ Merge Additional Data... - + 216, 22 - - Prepare + + Describe 211, 22 @@ -3582,6 +3603,12 @@ 208, 6 + + 211, 22 + + + Categorical + 319, 22 @@ -3621,11 +3648,11 @@ Display Top N... - + 211, 22 - - Categorical + + Numeric 258, 22 @@ -3648,17 +3675,11 @@ Correlations (Red Flags or others)... - - 211, 22 - - - Numeric - - + 216, 22 - - Describe + + Mapping 189, 22 @@ -3666,11 +3687,11 @@ Map Country Values... - + 216, 22 - - Mapping + + Model 292, 22 @@ -3684,12 +3705,6 @@ Fit Model... - - 216, 22 - - - Model - 213, 6 @@ -3699,6 +3714,12 @@ Define Red Flag Variables... + + 216, 22 + + + Corruption Risk Index + 278, 22 @@ -3711,17 +3732,11 @@ Summarise CRI by Country (or other)... - - 216, 22 - - - Corruption Risk Index - - - 88, 20 + + 250, 22 - - Procurement + + Check Data 215, 22 @@ -3756,18 +3771,18 @@ One Variable Frequencies... - - 250, 22 - - - Check Data - 250, 22 Define Options by Context Data... + + 250, 22 + + + Prepare + 282, 22 @@ -3795,11 +3810,11 @@ Unstack... - + 250, 22 - - Prepare + + Describe 224, 22 @@ -3822,11 +3837,11 @@ Boxplot... - + 250, 22 - - Describe + + Model 176, 22 @@ -3840,18 +3855,6 @@ General Fit Model... - - 250, 22 - - - Model - - - 122, 20 - - - Options by Context - False @@ -3918,36 +3921,6 @@ Options... - - 46, 20 - - - Tools - - - 0, 0 - - - 834, 24 - - - 6 - - - Menu_strip - - - mnuBar - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 126, 22 @@ -4443,6 +4416,48 @@ Log Window + + 180, 22 + + + Define... + + + 180, 22 + + + Define... + + + 180, 22 + + + Define... + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + True @@ -9528,6 +9543,24 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredTimeSeriesModelOneVariable + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredTimeSeriesModelGeneral + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator62 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 781a93af9cb8f61d6ee7faab0fc6cc2361665791 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:45:36 +0300 Subject: [PATCH 31/41] Added a separator --- instat/frmMain.Designer.vb | 9 +++++- instat/frmMain.resx | 63 ++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index f62a005ff30..9a32c152b51 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -613,6 +613,7 @@ Partial Class frmMain Me.mnuStructuredTimeSeriesModelOneVariable = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredTimeSeriesModelGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator62 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripSeparator63 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3794,7 +3795,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3894,6 +3895,11 @@ Partial Class frmMain Me.ToolStripSeparator62.Name = "ToolStripSeparator62" resources.ApplyResources(Me.ToolStripSeparator62, "ToolStripSeparator62") ' + 'ToolStripSeparator63 + ' + Me.ToolStripSeparator63.Name = "ToolStripSeparator63" + resources.ApplyResources(Me.ToolStripSeparator63, "ToolStripSeparator63") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4514,4 +4520,5 @@ Partial Class frmMain Friend WithEvents mnuStructuredTimeSeriesModelOneVariable As ToolStripMenuItem Friend WithEvents mnuStructuredTimeSeriesModelGeneral As ToolStripMenuItem Friend WithEvents ToolStripSeparator62 As ToolStripSeparator + Friend WithEvents ToolStripSeparator63 As ToolStripSeparator End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 40ce0953704..6eb6d6704ba 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -2613,39 +2613,15 @@ Survival - - 180, 22 - - - Define... - - - 177, 6 - - - 180, 22 - - - Describe - - - 177, 6 - - - 180, 22 - - - Model - - - 177, 6 - 180, 22 Time Series + + 177, 6 + 74, 20 @@ -4434,6 +4410,21 @@ Define... + + 180, 22 + + + Define... + + + 177, 6 + + + 180, 22 + + + Describe + 180, 22 @@ -4446,6 +4437,15 @@ General... + + 177, 6 + + + 180, 22 + + + Model + 180, 22 @@ -4458,6 +4458,9 @@ General... + + 177, 6 + True @@ -9561,6 +9564,12 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator63 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From c4b00d25d11420eb6d98ff7fd148862ef1454361 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:47:39 +0300 Subject: [PATCH 32/41] Added a sub menu --- instat/frmMain.Designer.vb | 9 +- instat/frmMain.resx | 1106 ++++++++++++++++++------------------ 2 files changed, 567 insertions(+), 548 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 9a32c152b51..185fc848072 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -614,6 +614,7 @@ Partial Class frmMain Me.mnuStructuredTimeSeriesModelGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator62 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator63 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredClimatic = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3795,7 +3796,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3900,6 +3901,11 @@ Partial Class frmMain Me.ToolStripSeparator63.Name = "ToolStripSeparator63" resources.ApplyResources(Me.ToolStripSeparator63, "ToolStripSeparator63") ' + 'mnuStructuredClimatic + ' + Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" + resources.ApplyResources(Me.mnuStructuredClimatic, "mnuStructuredClimatic") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4521,4 +4527,5 @@ Partial Class frmMain Friend WithEvents mnuStructuredTimeSeriesModelGeneral As ToolStripMenuItem Friend WithEvents ToolStripSeparator62 As ToolStripSeparator Friend WithEvents ToolStripSeparator63 As ToolStripSeparator + Friend WithEvents mnuStructuredClimatic As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 6eb6d6704ba..1cd71092f1d 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -118,18 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 64, 20 - - - Describe - - - 180, 22 - - - One Variable - 146, 22 @@ -157,11 +145,11 @@ Rating Data... - + 180, 22 - - Two Variables + + One Variable 146, 22 @@ -184,11 +172,11 @@ Frequencies... - + 180, 22 - - Three Variables + + Two Variables @@ -218,11 +206,11 @@ Frequencies - + 180, 22 - - Specific + + Three Variables 209, 22 @@ -311,11 +299,11 @@ Mosaic Plot... - + 180, 22 - - General + + Specific 188, 22 @@ -347,14 +335,14 @@ Use Summaries... - - 177, 6 - - + 180, 22 - - Multivariate + + General + + + 177, 6 203, 22 @@ -374,6 +362,12 @@ Canonical Correlations... + + 180, 22 + + + Multivariate + 177, 6 @@ -404,17 +398,11 @@ View Graph... - - 53, 20 - - - Model - - - 201, 22 + + 64, 20 - - Probability Distributions + + Describe 242, 22 @@ -437,14 +425,14 @@ Random Samples (Use Model)... - - 198, 6 - - + 201, 22 - - Fit Model + + Probability Distributions + + + 198, 6 223, 22 @@ -494,11 +482,11 @@ Fit Model Keyboard... - + 201, 22 - - Compare Models + + Fit Model 149, 22 @@ -506,11 +494,11 @@ One Variable... - + 201, 22 - - Use Model + + Compare Models 192, 22 @@ -554,14 +542,11 @@ Use Model Keyboard... - - False - - + 201, 22 - - Other (One Variable) + + Use Model 166, 22 @@ -596,14 +581,14 @@ Goodness of Fit... - + False - + 201, 22 - - Other (Two Variables) + + Other (One Variable) False @@ -650,14 +635,14 @@ Non Parameteric One Way ANOVA... - + False - + 201, 22 - - Other (Three Variable) + + Other (Two Variables) False @@ -680,14 +665,14 @@ Chi-square Test... - + False - + 201, 22 - - Other (General) + + Other (Three Variable) False @@ -716,6 +701,21 @@ Log Linear... + + False + + + 201, 22 + + + Other (General) + + + 53, 20 + + + Model + False @@ -740,15 +740,6 @@ False - - 212, 22 - - - Evaporation - - - False - False @@ -767,13 +758,13 @@ Penman... - + 212, 22 - - Crop + + Evaporation - + False @@ -794,6 +785,15 @@ Water Satisfaction Index... + + 212, 22 + + + Crop + + + False + False @@ -806,12 +806,6 @@ False - - 44, 20 - - - View - 211, 22 @@ -878,11 +872,11 @@ Reset to Default Layout - + 44, 20 - - Help + + View 221, 22 @@ -944,12 +938,6 @@ 218, 6 - - 221, 22 - - - Guides - 166, 22 @@ -971,6 +959,12 @@ More... + + 221, 22 + + + Guides + False @@ -992,6 +986,12 @@ Acknowlegments + + 44, 20 + + + Help + 538, 56 @@ -1001,18 +1001,6 @@ 638, 56 - - 63, 20 - - - Climatic - - - 212, 22 - - - File - 211, 22 @@ -1061,14 +1049,14 @@ Export to CPT... - - 209, 6 - - + 212, 22 - - Tidy and Examine + + File + + + 209, 6 211, 22 @@ -1142,11 +1130,11 @@ One Variable Frequencies - + 212, 22 - - Dates + + Tidy and Examine 162, 22 @@ -1190,17 +1178,17 @@ Use Time... - + 212, 22 - - Define Climatic Data... + + Dates - + 212, 22 - - Check Data + + Define Climatic Data... 174, 22 @@ -1238,11 +1226,11 @@ Homogenization... - + 212, 22 - - Prepare + + Check Data 189, 22 @@ -1295,12 +1283,6 @@ Extremes... - - 189, 22 - - - Compare - 143, 22 @@ -1319,6 +1301,12 @@ Summary... + + 189, 22 + + + Compare + 186, 6 @@ -1427,14 +1415,14 @@ False - - 209, 6 - - + 212, 22 - - Describe + + Prepare + + + 209, 6 False @@ -1454,18 +1442,18 @@ Temperature... - - 199, 22 - - - Wind Speed/Direction... - 139, 22 Wind Rose... + + 199, 22 + + + Wind Speed/Direction... + False @@ -1490,11 +1478,11 @@ 196, 6 - + 212, 22 - - PICSA + + Describe 246, 22 @@ -1523,11 +1511,11 @@ Crops... - + 212, 22 - - CM SAF + + PICSA 231, 22 @@ -1541,17 +1529,17 @@ Export to CM SAF R Toolbox... - + 212, 22 - - Mapping... + + CM SAF - + 212, 22 - - Model + + Mapping... 180, 22 @@ -1574,14 +1562,14 @@ Markov Modelling... - - 209, 6 - - + 212, 22 - - Seasonal Forecast Support + + Model + + + 209, 6 246, 22 @@ -1622,20 +1610,11 @@ Cumulative/Exceedance Graph... - + 212, 22 - - Climate Methods - - - False - - - 199, 22 - - - Data Manipulation + + Seasonal Forecast Support False @@ -1772,11 +1751,11 @@ Output for CDT... - + 199, 22 - - Graphics + + Data Manipulation False @@ -1895,6 +1874,12 @@ Three Summaries... + + 199, 22 + + + Graphics + False @@ -1904,12 +1889,6 @@ Model... - - 199, 22 - - - Additional - False @@ -1955,6 +1934,12 @@ Water Balance... + + 199, 22 + + + Additional + False @@ -1964,6 +1949,21 @@ Create Climate Object... + + 212, 22 + + + Climate Methods + + + False + + + 63, 20 + + + Climatic + Ctrl+S @@ -1974,12 +1974,6 @@ Save... - - 232, 22 - - - Save As - 164, 22 @@ -2004,6 +1998,12 @@ Save Script As... + + 232, 22 + + + Save As + False @@ -2034,12 +2034,6 @@ Exit - - 39, 20 - - - Edit - False @@ -2124,12 +2118,24 @@ Select All + + 39, 20 + + + Edit + 775, 56 946, 56 + + 119, 17 + + + No worksheet loaded + 0, 460 @@ -2154,42 +2160,9 @@ 1 - - 119, 17 - - - No worksheet loaded - 17, 95 - - 0, 24 - - - No - - - 834, 37 - - - 7 - - - Tool - - - Tool_strip - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Magenta @@ -2253,6 +2226,18 @@ Edit Last Dialog + + 57, 6 + + + False + + + 57, 6 + + + False + Magenta @@ -2262,17 +2247,17 @@ Last 10 Dialogs - - 57, 6 + + 128, 22 - - False + + R Viewer... - - 57, 6 + + 128, 22 - - False + + Plotly... @@ -2312,18 +2297,6 @@ View Last Graph - - 128, 22 - - - R Viewer... - - - 128, 22 - - - Plotly... - 6, 37 @@ -2345,6 +2318,18 @@ Output Window + + 196, 22 + + + Column Metadata... + + + 196, 22 + + + Data Frame Metadata... + iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2401,17 +2386,17 @@ Column Metadata - - 196, 22 + + 160, 22 - - Column Metadata... + + Log Window... - - 196, 22 + + 160, 22 - - Data Frame Metadata... + + Script Window... @@ -2541,23 +2526,11 @@ Log Window - - 160, 22 - - - Log Window... + + Magenta - - 160, 22 - - - Script Window... - - - Magenta - - - 34, 34 + + 34, 34 Reset Layout @@ -2574,101 +2547,38 @@ He&lp - - 122, 95 - - - On - - - 37, 20 - - - File - - - 59, 20 - - - Prepare - - - 177, 6 - - - 180, 22 - - - Circular - - - 180, 22 - - - Low_Flow - - - 180, 22 - - - Survival - - - 180, 22 - - - Time Series - - - 177, 6 - - - 74, 20 - - - Structured - - - 88, 20 - - - Procurement - - - 122, 20 - - - Options by Context - - - 46, 20 - - - Tools + + 0, 24 - - 0, 0 + + No - - 834, 24 + + 834, 37 - - 6 + + 7 - - Menu_strip + + Tool - - mnuBar + + Tool_strip - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 + + + 122, 95 + + + On Ctrl+N @@ -2742,12 +2652,6 @@ 229, 6 - - 232, 22 - - - Export - 204, 22 @@ -2772,6 +2676,12 @@ Export Graph As Image... + + 232, 22 + + + Export + 232, 22 @@ -2781,11 +2691,11 @@ 229, 6 - - 172, 22 + + 37, 20 - - Data Frame + + File 200, 22 @@ -2895,11 +2805,11 @@ Colour by Property... - + 172, 22 - - Check Data + + Data Frame 245, 22 @@ -2988,6 +2898,12 @@ Anonymise ID Column... + + 172, 22 + + + Check Data + 169, 6 @@ -2997,12 +2913,6 @@ Calculator... - - 172, 22 - - - Column: Calculate - 179, 22 @@ -3057,11 +2967,11 @@ Permute Columns... - + 172, 22 - - Column: Factor + + Column: Calculate 179, 22 @@ -3150,11 +3060,11 @@ Factor Data Frame... - + 172, 22 - - Column: Text + + Column: Factor 152, 22 @@ -3195,11 +3105,11 @@ Distance... - + 172, 22 - - Column: Date + + Column: Text 162, 22 @@ -3243,11 +3153,11 @@ Use Time... - + 172, 22 - - Column: Define + + Column: Date 176, 22 @@ -3264,14 +3174,14 @@ Circular... - - 169, 6 - - + 172, 22 - - Data Reshape + + Column: Define + + + 169, 6 193, 22 @@ -3333,14 +3243,14 @@ Transpose... - - 169, 6 - - + 172, 22 - - Keys and Links + + Data Reshape + + + 169, 6 207, 22 @@ -3372,11 +3282,11 @@ Add Comment... - + 172, 22 - - Data Object + + Keys and Links False @@ -3447,44 +3357,167 @@ Reorder Metadata... - - False + + False + + + 196, 22 + + + Delete Metadata... + + + 172, 22 + + + Data Object + + + 126, 22 + + + View... + + + 126, 22 + + + Rename... + + + 126, 22 + + + Reorder... + + + 126, 22 + + + Delete... + + + 172, 22 + + + R Objects + + + 59, 20 + + + Prepare + + + 177, 6 + + + 180, 22 + + + Define... + + + 180, 22 + + + Circular + + + 180, 22 + + + Define... + + + 180, 22 + + + Low_Flow + + + 180, 22 + + + Define... + + + 180, 22 + + + Survival + + + 180, 22 + + + Define... + + + 177, 6 + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 180, 22 + + + Describe + + + 177, 6 + + + 180, 22 + + + One Variable... - - 196, 22 + + 180, 22 - - Delete Metadata... + + General... - - 172, 22 + + 180, 22 - - R Objects + + Model - - 126, 22 + + 177, 6 - - View... + + 180, 22 - - 126, 22 + + Time Series - - Rename... + + 177, 6 - - 126, 22 + + 180, 22 - - Reorder... + + Climatic... - - 126, 22 + + 74, 20 - - Delete... + + Structured 216, 22 @@ -3498,12 +3531,6 @@ Define Procurement Data... - - 216, 22 - - - Prepare - 358, 22 @@ -3558,11 +3585,11 @@ Merge Additional Data... - + 216, 22 - - Describe + + Prepare 211, 22 @@ -3579,12 +3606,6 @@ 208, 6 - - 211, 22 - - - Categorical - 319, 22 @@ -3624,11 +3645,11 @@ Display Top N... - + 211, 22 - - Numeric + + Categorical 258, 22 @@ -3651,11 +3672,17 @@ Correlations (Red Flags or others)... - + + 211, 22 + + + Numeric + + 216, 22 - - Mapping + + Describe 189, 22 @@ -3663,11 +3690,11 @@ Map Country Values... - + 216, 22 - - Model + + Mapping 292, 22 @@ -3681,6 +3708,12 @@ Fit Model... + + 216, 22 + + + Model + 213, 6 @@ -3690,12 +3723,6 @@ Define Red Flag Variables... - - 216, 22 - - - Corruption Risk Index - 278, 22 @@ -3708,11 +3735,17 @@ Summarise CRI by Country (or other)... - - 250, 22 + + 216, 22 - - Check Data + + Corruption Risk Index + + + 88, 20 + + + Procurement 215, 22 @@ -3747,17 +3780,17 @@ One Variable Frequencies... - + 250, 22 - - Define Options by Context Data... + + Check Data - + 250, 22 - - Prepare + + Define Options by Context Data... 282, 22 @@ -3786,11 +3819,11 @@ Unstack... - + 250, 22 - - Describe + + Prepare 224, 22 @@ -3813,11 +3846,11 @@ Boxplot... - + 250, 22 - - Model + + Describe 176, 22 @@ -3831,6 +3864,18 @@ General Fit Model... + + 250, 22 + + + Model + + + 122, 20 + + + Options by Context + False @@ -3897,6 +3942,36 @@ Options... + + 46, 20 + + + Tools + + + 0, 0 + + + 834, 24 + + + 6 + + + Menu_strip + + + mnuBar + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 126, 22 @@ -4392,75 +4467,6 @@ Log Window - - 180, 22 - - - Define... - - - 180, 22 - - - Define... - - - 180, 22 - - - Define... - - - 180, 22 - - - Define... - - - 177, 6 - - - 180, 22 - - - Describe - - - 180, 22 - - - One Variable... - - - 180, 22 - - - General... - - - 177, 6 - - - 180, 22 - - - Model - - - 180, 22 - - - One Variable... - - - 180, 22 - - - General... - - - 177, 6 - True @@ -9570,6 +9576,12 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredClimatic + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 19c72b1cd72c83aa6c1159222047cf1ad2b7975d Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:49:01 +0300 Subject: [PATCH 33/41] Added a sub menu --- instat/frmMain.Designer.vb | 9 ++++++++- instat/frmMain.resx | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 185fc848072..29a581c5470 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -615,6 +615,7 @@ Partial Class frmMain Me.ToolStripSeparator62 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator63 = New System.Windows.Forms.ToolStripSeparator() Me.mnuStructuredClimatic = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredProcurement = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3796,7 +3797,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3906,6 +3907,11 @@ Partial Class frmMain Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" resources.ApplyResources(Me.mnuStructuredClimatic, "mnuStructuredClimatic") ' + 'mnuStructuredProcurement + ' + Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" + resources.ApplyResources(Me.mnuStructuredProcurement, "mnuStructuredProcurement") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4528,4 +4534,5 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator62 As ToolStripSeparator Friend WithEvents ToolStripSeparator63 As ToolStripSeparator Friend WithEvents mnuStructuredClimatic As ToolStripMenuItem + Friend WithEvents mnuStructuredProcurement As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 1cd71092f1d..f9fc031e175 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3513,6 +3513,12 @@ Climatic... + + 180, 22 + + + Procurement... + 74, 20 @@ -9582,6 +9588,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredProcurement + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From 32bfdc0ba0b266a79d17a9ff5492c82e6981a2c9 Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:52:02 +0300 Subject: [PATCH 34/41] Added a sub menu --- instat/frmMain.Designer.vb | 9 ++++++++- instat/frmMain.resx | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 29a581c5470..2410f83662f 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -616,6 +616,7 @@ Partial Class frmMain Me.ToolStripSeparator63 = New System.Windows.Forms.ToolStripSeparator() Me.mnuStructuredClimatic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuStructuredProcurement = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredOptionByContext = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3797,7 +3798,7 @@ Partial Class frmMain ' 'mnuStructured ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement}) + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext}) Me.mnuStructured.Name = "mnuStructured" resources.ApplyResources(Me.mnuStructured, "mnuStructured") ' @@ -3912,6 +3913,11 @@ Partial Class frmMain Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" resources.ApplyResources(Me.mnuStructuredProcurement, "mnuStructuredProcurement") ' + 'mnuStructuredOptionByContext + ' + Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" + resources.ApplyResources(Me.mnuStructuredOptionByContext, "mnuStructuredOptionByContext") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4535,4 +4541,5 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator63 As ToolStripSeparator Friend WithEvents mnuStructuredClimatic As ToolStripMenuItem Friend WithEvents mnuStructuredProcurement As ToolStripMenuItem + Friend WithEvents mnuStructuredOptionByContext As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index f9fc031e175..3a562de8192 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -3519,6 +3519,12 @@ Procurement... + + 180, 22 + + + Options by Context + 74, 20 @@ -9594,6 +9600,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuStructuredOptionByContext + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From f92782c59f83c3278c0d98fe2f70111a56ef655d Mon Sep 17 00:00:00 2001 From: Wycklife Date: Tue, 23 Jun 2020 12:59:44 +0300 Subject: [PATCH 35/41] Minor edit --- instat/frmMain.resx | 1146 +++++++++++++++++++++---------------------- instat/frmMain.vb | 4 + 2 files changed, 577 insertions(+), 573 deletions(-) diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 3a562de8192..3f4f9a81f0a 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -118,6 +118,18 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 64, 20 + + + Describe + + + 180, 22 + + + One Variable + 146, 22 @@ -145,11 +157,11 @@ Rating Data... - + 180, 22 - - One Variable + + Two Variables 146, 22 @@ -172,11 +184,11 @@ Frequencies... - + 180, 22 - - Two Variables + + Three Variables @@ -206,11 +218,11 @@ Frequencies - + 180, 22 - - Three Variables + + Specific 209, 22 @@ -299,11 +311,11 @@ Mosaic Plot... - + 180, 22 - - Specific + + General 188, 22 @@ -335,15 +347,15 @@ Use Summaries... - - 180, 22 - - - General - 177, 6 + + 180, 22 + + + Multivariate + 203, 22 @@ -362,12 +374,6 @@ Canonical Correlations... - - 180, 22 - - - Multivariate - 177, 6 @@ -398,11 +404,17 @@ View Graph... - - 64, 20 + + 53, 20 - - Describe + + Model + + + 201, 22 + + + Probability Distributions 242, 22 @@ -425,15 +437,15 @@ Random Samples (Use Model)... - - 201, 22 - - - Probability Distributions - 198, 6 + + 201, 22 + + + Fit Model + 223, 22 @@ -482,11 +494,11 @@ Fit Model Keyboard... - + 201, 22 - - Fit Model + + Compare Models 149, 22 @@ -494,11 +506,11 @@ One Variable... - + 201, 22 - - Compare Models + + Use Model 192, 22 @@ -542,11 +554,14 @@ Use Model Keyboard... - + + False + + 201, 22 - - Use Model + + Other (One Variable) 166, 22 @@ -581,14 +596,14 @@ Goodness of Fit... - + False - + 201, 22 - - Other (One Variable) + + Other (Two Variables) False @@ -635,14 +650,14 @@ Non Parameteric One Way ANOVA... - + False - + 201, 22 - - Other (Two Variables) + + Other (Three Variable) False @@ -665,14 +680,14 @@ Chi-square Test... - + False - + 201, 22 - - Other (Three Variable) + + Other (General) False @@ -701,21 +716,6 @@ Log Linear... - - False - - - 201, 22 - - - Other (General) - - - 53, 20 - - - Model - False @@ -740,6 +740,15 @@ False + + 212, 22 + + + Evaporation + + + False + False @@ -758,13 +767,13 @@ Penman... - + 212, 22 - - Evaporation + + Crop - + False @@ -785,15 +794,6 @@ Water Satisfaction Index... - - 212, 22 - - - Crop - - - False - False @@ -806,6 +806,12 @@ False + + 44, 20 + + + View + 211, 22 @@ -872,11 +878,11 @@ Reset to Default Layout - + 44, 20 - - View + + Help 221, 22 @@ -938,6 +944,12 @@ 218, 6 + + 221, 22 + + + Guides + 166, 22 @@ -959,12 +971,6 @@ More... - - 221, 22 - - - Guides - False @@ -986,12 +992,6 @@ Acknowlegments - - 44, 20 - - - Help - 538, 56 @@ -1001,6 +1001,18 @@ 638, 56 + + 63, 20 + + + Climatic + + + 212, 22 + + + File + 211, 22 @@ -1049,15 +1061,15 @@ Export to CPT... - - 212, 22 - - - File - 209, 6 + + 212, 22 + + + Tidy and Examine + 211, 22 @@ -1130,11 +1142,11 @@ One Variable Frequencies - + 212, 22 - - Tidy and Examine + + Dates 162, 22 @@ -1178,18 +1190,18 @@ Use Time... - - 212, 22 - - - Dates - 212, 22 Define Climatic Data... + + 212, 22 + + + Check Data + 174, 22 @@ -1226,11 +1238,11 @@ Homogenization... - + 212, 22 - - Check Data + + Prepare 189, 22 @@ -1283,6 +1295,12 @@ Extremes... + + 189, 22 + + + Compare + 143, 22 @@ -1301,12 +1319,6 @@ Summary... - - 189, 22 - - - Compare - 186, 6 @@ -1415,15 +1427,15 @@ False - - 212, 22 - - - Prepare - 209, 6 + + 212, 22 + + + Describe + False @@ -1442,18 +1454,18 @@ Temperature... - - 139, 22 - - - Wind Rose... - 199, 22 Wind Speed/Direction... + + 139, 22 + + + Wind Rose... + False @@ -1478,11 +1490,11 @@ 196, 6 - + 212, 22 - - Describe + + PICSA 246, 22 @@ -1511,11 +1523,11 @@ Crops... - + 212, 22 - - PICSA + + CM SAF 231, 22 @@ -1529,18 +1541,18 @@ Export to CM SAF R Toolbox... - - 212, 22 - - - CM SAF - 212, 22 Mapping... + + 212, 22 + + + Model + 180, 22 @@ -1562,15 +1574,15 @@ Markov Modelling... - - 212, 22 - - - Model - 209, 6 + + 212, 22 + + + Seasonal Forecast Support + 246, 22 @@ -1610,11 +1622,20 @@ Cumulative/Exceedance Graph... - + 212, 22 - - Seasonal Forecast Support + + Climate Methods + + + False + + + 199, 22 + + + Data Manipulation False @@ -1751,11 +1772,11 @@ Output for CDT... - + 199, 22 - - Data Manipulation + + Graphics False @@ -1874,12 +1895,6 @@ Three Summaries... - - 199, 22 - - - Graphics - False @@ -1889,6 +1904,12 @@ Model... + + 199, 22 + + + Additional + False @@ -1934,12 +1955,6 @@ Water Balance... - - 199, 22 - - - Additional - False @@ -1949,21 +1964,6 @@ Create Climate Object... - - 212, 22 - - - Climate Methods - - - False - - - 63, 20 - - - Climatic - Ctrl+S @@ -1974,6 +1974,12 @@ Save... + + 232, 22 + + + Save As + 164, 22 @@ -1998,12 +2004,6 @@ Save Script As... - - 232, 22 - - - Save As - False @@ -2034,6 +2034,12 @@ Exit + + 39, 20 + + + Edit + False @@ -2118,24 +2124,12 @@ Select All - - 39, 20 - - - Edit - 775, 56 946, 56 - - 119, 17 - - - No worksheet loaded - 0, 460 @@ -2160,9 +2154,42 @@ 1 + + 119, 17 + + + No worksheet loaded + 17, 95 + + 0, 24 + + + No + + + 834, 37 + + + 7 + + + Tool + + + Tool_strip + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Magenta @@ -2226,18 +2253,6 @@ Edit Last Dialog - - 57, 6 - - - False - - - 57, 6 - - - False - Magenta @@ -2247,17 +2262,17 @@ Last 10 Dialogs - - 128, 22 + + 57, 6 - - R Viewer... + + False - - 128, 22 + + 57, 6 - - Plotly... + + False @@ -2297,6 +2312,18 @@ View Last Graph + + 128, 22 + + + R Viewer... + + + 128, 22 + + + Plotly... + 6, 37 @@ -2318,18 +2345,6 @@ Output Window - - 196, 22 - - - Column Metadata... - - - 196, 22 - - - Data Frame Metadata... - iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2386,17 +2401,17 @@ Column Metadata - - 160, 22 + + 196, 22 - - Log Window... + + Column Metadata... - - 160, 22 + + 196, 22 - - Script Window... + + Data Frame Metadata... @@ -2526,14 +2541,26 @@ Log Window - - Magenta - - - 34, 34 + + 160, 22 - - Reset Layout + + Log Window... + + + 160, 22 + + + Script Window... + + + Magenta + + + 34, 34 + + + Reset Layout 6, 37 @@ -2547,38 +2574,125 @@ He&lp - - 0, 24 + + 122, 95 + + + On - - No + + 37, 20 - - 834, 37 + + File - - 7 + + 59, 20 - - Tool + + Prepare - - Tool_strip + + 177, 6 - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 180, 22 - - $this + + Define... - - 2 + + 186, 22 - - 122, 95 - - - On + + Circular + + + 180, 22 + + + Low_Flow + + + 180, 22 + + + Survival + + + 180, 22 + + + Time Series + + + 177, 6 + + + 180, 22 + + + Climatic... + + + 180, 22 + + + Procurement... + + + 186, 22 + + + Options by Context... + + + 74, 20 + + + Structured + + + 88, 20 + + + Procurement + + + 122, 20 + + + Options by Context + + + 46, 20 + + + Tools + + + 0, 0 + + + 834, 24 + + + 6 + + + Menu_strip + + + mnuBar + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 Ctrl+N @@ -2652,6 +2766,12 @@ 229, 6 + + 232, 22 + + + Export + 204, 22 @@ -2676,12 +2796,6 @@ Export Graph As Image... - - 232, 22 - - - Export - 232, 22 @@ -2691,11 +2805,11 @@ 229, 6 - - 37, 20 + + 172, 22 - - File + + Data Frame 200, 22 @@ -2805,11 +2919,11 @@ Colour by Property... - + 172, 22 - - Data Frame + + Check Data 245, 22 @@ -2898,12 +3012,6 @@ Anonymise ID Column... - - 172, 22 - - - Check Data - 169, 6 @@ -2913,6 +3021,12 @@ Calculator... + + 172, 22 + + + Column: Calculate + 179, 22 @@ -2967,11 +3081,11 @@ Permute Columns... - + 172, 22 - - Column: Calculate + + Column: Factor 179, 22 @@ -3060,11 +3174,11 @@ Factor Data Frame... - + 172, 22 - - Column: Factor + + Column: Text 152, 22 @@ -3105,11 +3219,11 @@ Distance... - + 172, 22 - - Column: Text + + Column: Date 162, 22 @@ -3153,11 +3267,11 @@ Use Time... - + 172, 22 - - Column: Date + + Column: Define 176, 22 @@ -3174,15 +3288,15 @@ Circular... - - 172, 22 - - - Column: Define - 169, 6 + + 172, 22 + + + Data Reshape + 193, 22 @@ -3243,15 +3357,15 @@ Transpose... - - 172, 22 - - - Data Reshape - 169, 6 + + 172, 22 + + + Keys and Links + 207, 22 @@ -3282,11 +3396,11 @@ Add Comment... - + 172, 22 - - Keys and Links + + Data Object False @@ -3351,185 +3465,50 @@ False - - 196, 22 - - - Reorder Metadata... - - - False - - - 196, 22 - - - Delete Metadata... - - - 172, 22 - - - Data Object - - - 126, 22 - - - View... - - - 126, 22 - - - Rename... - - - 126, 22 - - - Reorder... - - - 126, 22 - - - Delete... - - - 172, 22 - - - R Objects - - - 59, 20 - - - Prepare - - - 177, 6 - - - 180, 22 - - - Define... - - - 180, 22 - - - Circular - - - 180, 22 - - - Define... - - - 180, 22 - - - Low_Flow - - - 180, 22 - - - Define... - - - 180, 22 - - - Survival - - - 180, 22 - - - Define... - - - 177, 6 - - - 180, 22 - - - One Variable... - - - 180, 22 - - - General... - - - 180, 22 - - - Describe - - - 177, 6 - - - 180, 22 - - - One Variable... - - - 180, 22 - - - General... - - - 180, 22 + + 196, 22 - - Model + + Reorder Metadata... - - 177, 6 + + False - - 180, 22 + + 196, 22 - - Time Series + + Delete Metadata... - - 177, 6 + + 172, 22 - - 180, 22 + + R Objects - - Climatic... + + 126, 22 - - 180, 22 + + View... - - Procurement... + + 126, 22 - - 180, 22 + + Rename... - - Options by Context + + 126, 22 - - 74, 20 + + Reorder... - - Structured + + 126, 22 + + + Delete... 216, 22 @@ -3543,6 +3522,12 @@ Define Procurement Data... + + 216, 22 + + + Prepare + 358, 22 @@ -3597,11 +3582,11 @@ Merge Additional Data... - + 216, 22 - - Prepare + + Describe 211, 22 @@ -3618,6 +3603,12 @@ 208, 6 + + 211, 22 + + + Categorical + 319, 22 @@ -3657,11 +3648,11 @@ Display Top N... - + 211, 22 - - Categorical + + Numeric 258, 22 @@ -3684,17 +3675,11 @@ Correlations (Red Flags or others)... - - 211, 22 - - - Numeric - - + 216, 22 - - Describe + + Mapping 189, 22 @@ -3702,11 +3687,11 @@ Map Country Values... - + 216, 22 - - Mapping + + Model 292, 22 @@ -3720,12 +3705,6 @@ Fit Model... - - 216, 22 - - - Model - 213, 6 @@ -3735,6 +3714,12 @@ Define Red Flag Variables... + + 216, 22 + + + Corruption Risk Index + 278, 22 @@ -3747,17 +3732,11 @@ Summarise CRI by Country (or other)... - - 216, 22 - - - Corruption Risk Index - - - 88, 20 + + 250, 22 - - Procurement + + Check Data 215, 22 @@ -3792,18 +3771,18 @@ One Variable Frequencies... - - 250, 22 - - - Check Data - 250, 22 Define Options by Context Data... + + 250, 22 + + + Prepare + 282, 22 @@ -3831,11 +3810,11 @@ Unstack... - + 250, 22 - - Prepare + + Describe 224, 22 @@ -3858,11 +3837,11 @@ Boxplot... - + 250, 22 - - Describe + + Model 176, 22 @@ -3876,18 +3855,6 @@ General Fit Model... - - 250, 22 - - - Model - - - 122, 20 - - - Options by Context - False @@ -3954,36 +3921,6 @@ Options... - - 46, 20 - - - Tools - - - 0, 0 - - - 834, 24 - - - 6 - - - Menu_strip - - - mnuBar - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 126, 22 @@ -4479,6 +4416,69 @@ Log Window + + 180, 22 + + + Define... + + + 180, 22 + + + Define... + + + 180, 22 + + + Define... + + + 177, 6 + + + 180, 22 + + + Describe + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 177, 6 + + + 180, 22 + + + Model + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 177, 6 + True diff --git a/instat/frmMain.vb b/instat/frmMain.vb index fb7d0cf399f..35aba36896e 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2138,4 +2138,8 @@ Public Class frmMain Private Sub mnuClimaticPrepareCompareSummary_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareCompareSummary.Click 'dlgCompareSummary.ShowDialog() 'not yet working End Sub + + Private Sub mnuStructuredCircularDefine_Click(sender As Object, e As EventArgs) Handles mnuStructuredCircularDefine.Click + dlgCircular.ShowDialog() + End Sub End Class \ No newline at end of file From 24c3975a29c311e9c60e81f81a5c7cc22be085c8 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 24 Jun 2020 09:55:33 +0300 Subject: [PATCH 36/41] enabled toolstrip place holder for the verification summary dialog --- instat/frmMain.Designer.vb | 292 +++---- instat/frmMain.resx | 1487 ++++++++++++++++++------------------ 2 files changed, 888 insertions(+), 891 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 2410f83662f..ea57315f5f7 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -503,6 +503,29 @@ Partial Class frmMain Me.mnuPrepareRObjectsRename = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareRObjectsReorder = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareRObjectsDelete = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructured = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredCircular = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredCircularDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredLow_Flow = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredLow_FlowDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredSurvival = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredSurvivalDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator60 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredTimeSeriesDescribe = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesDescribeOneVariable = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator61 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredTimeSeriesModel = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesModelOneVariable = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredTimeSeriesModelGeneral = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator62 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripSeparator63 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuStructuredClimatic = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredProcurement = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuStructuredOptionByContext = New System.Windows.Forms.ToolStripMenuItem() Me.mnuProcurement = New System.Windows.Forms.ToolStripMenuItem() Me.mnuProcurementOpenFromLibrary = New System.Windows.Forms.ToolStripMenuItem() Me.mnuProcurementDefineData = New System.Windows.Forms.ToolStripMenuItem() @@ -594,29 +617,6 @@ 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.mnuStructured = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuStructuredCircular = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredCircularDefine = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredLow_Flow = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredLow_FlowDefine = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredSurvival = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredSurvivalDefine = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredTimeSeries = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredTimeSeriesDefine = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator60 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuStructuredTimeSeriesDescribe = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredTimeSeriesDescribeOneVariable = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredTimeSeriesDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator61 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuStructuredTimeSeriesModel = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredTimeSeriesModelOneVariable = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredTimeSeriesModelGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator62 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripSeparator63 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuStructuredClimatic = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredProcurement = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuStructuredOptionByContext = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1686,8 +1686,8 @@ Partial Class frmMain ' 'mnuClimaticPrepareCompareSummary ' - resources.ApplyResources(Me.mnuClimaticPrepareCompareSummary, "mnuClimaticPrepareCompareSummary") Me.mnuClimaticPrepareCompareSummary.Name = "mnuClimaticPrepareCompareSummary" + resources.ApplyResources(Me.mnuClimaticPrepareCompareSummary, "mnuClimaticPrepareCompareSummary") ' 'ToolStripSeparator46 ' @@ -3257,6 +3257,128 @@ Partial Class frmMain resources.ApplyResources(Me.mnuPrepareRObjectsDelete, "mnuPrepareRObjectsDelete") Me.mnuPrepareRObjectsDelete.Tag = "Delete..." ' + 'mnuStructured + ' + Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext}) + Me.mnuStructured.Name = "mnuStructured" + resources.ApplyResources(Me.mnuStructured, "mnuStructured") + ' + 'ToolStripSeparator20 + ' + Me.ToolStripSeparator20.Name = "ToolStripSeparator20" + resources.ApplyResources(Me.ToolStripSeparator20, "ToolStripSeparator20") + ' + 'mnuStructuredCircular + ' + Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine}) + Me.mnuStructuredCircular.Name = "mnuStructuredCircular" + resources.ApplyResources(Me.mnuStructuredCircular, "mnuStructuredCircular") + ' + 'mnuStructuredCircularDefine + ' + Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" + resources.ApplyResources(Me.mnuStructuredCircularDefine, "mnuStructuredCircularDefine") + ' + 'mnuStructuredLow_Flow + ' + Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) + Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" + resources.ApplyResources(Me.mnuStructuredLow_Flow, "mnuStructuredLow_Flow") + ' + 'mnuStructuredLow_FlowDefine + ' + Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" + resources.ApplyResources(Me.mnuStructuredLow_FlowDefine, "mnuStructuredLow_FlowDefine") + ' + 'mnuStructuredSurvival + ' + Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) + Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" + resources.ApplyResources(Me.mnuStructuredSurvival, "mnuStructuredSurvival") + ' + 'mnuStructuredSurvivalDefine + ' + Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" + resources.ApplyResources(Me.mnuStructuredSurvivalDefine, "mnuStructuredSurvivalDefine") + ' + 'mnuStructuredTimeSeries + ' + Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) + Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" + resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") + ' + 'mnuStructuredTimeSeriesDefine + ' + Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDefine, "mnuStructuredTimeSeriesDefine") + ' + 'ToolStripSeparator60 + ' + Me.ToolStripSeparator60.Name = "ToolStripSeparator60" + resources.ApplyResources(Me.ToolStripSeparator60, "ToolStripSeparator60") + ' + 'mnuStructuredTimeSeriesDescribe + ' + Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) + Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribe, "mnuStructuredTimeSeriesDescribe") + ' + 'mnuStructuredTimeSeriesDescribeOneVariable + ' + Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeOneVariable, "mnuStructuredTimeSeriesDescribeOneVariable") + ' + 'mnuStructuredTimeSeriesDescribeGeneral + ' + Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" + resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeGeneral, "mnuStructuredTimeSeriesDescribeGeneral") + ' + 'ToolStripSeparator61 + ' + Me.ToolStripSeparator61.Name = "ToolStripSeparator61" + resources.ApplyResources(Me.ToolStripSeparator61, "ToolStripSeparator61") + ' + 'mnuStructuredTimeSeriesModel + ' + Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) + Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" + resources.ApplyResources(Me.mnuStructuredTimeSeriesModel, "mnuStructuredTimeSeriesModel") + ' + 'mnuStructuredTimeSeriesModelOneVariable + ' + Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" + resources.ApplyResources(Me.mnuStructuredTimeSeriesModelOneVariable, "mnuStructuredTimeSeriesModelOneVariable") + ' + 'mnuStructuredTimeSeriesModelGeneral + ' + Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" + resources.ApplyResources(Me.mnuStructuredTimeSeriesModelGeneral, "mnuStructuredTimeSeriesModelGeneral") + ' + 'ToolStripSeparator62 + ' + Me.ToolStripSeparator62.Name = "ToolStripSeparator62" + resources.ApplyResources(Me.ToolStripSeparator62, "ToolStripSeparator62") + ' + 'ToolStripSeparator63 + ' + Me.ToolStripSeparator63.Name = "ToolStripSeparator63" + resources.ApplyResources(Me.ToolStripSeparator63, "ToolStripSeparator63") + ' + 'mnuStructuredClimatic + ' + Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" + resources.ApplyResources(Me.mnuStructuredClimatic, "mnuStructuredClimatic") + ' + 'mnuStructuredProcurement + ' + Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" + resources.ApplyResources(Me.mnuStructuredProcurement, "mnuStructuredProcurement") + ' + 'mnuStructuredOptionByContext + ' + Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" + resources.ApplyResources(Me.mnuStructuredOptionByContext, "mnuStructuredOptionByContext") + ' 'mnuProcurement ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) @@ -3796,128 +3918,6 @@ Partial Class frmMain Me.mnuLogFile.Name = "mnuLogFile" resources.ApplyResources(Me.mnuLogFile, "mnuLogFile") ' - 'mnuStructured - ' - Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator20, Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext}) - Me.mnuStructured.Name = "mnuStructured" - resources.ApplyResources(Me.mnuStructured, "mnuStructured") - ' - 'ToolStripSeparator20 - ' - Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - resources.ApplyResources(Me.ToolStripSeparator20, "ToolStripSeparator20") - ' - 'mnuStructuredCircular - ' - Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine}) - Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - resources.ApplyResources(Me.mnuStructuredCircular, "mnuStructuredCircular") - ' - 'mnuStructuredCircularDefine - ' - Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - resources.ApplyResources(Me.mnuStructuredCircularDefine, "mnuStructuredCircularDefine") - ' - 'mnuStructuredLow_Flow - ' - Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) - Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - resources.ApplyResources(Me.mnuStructuredLow_Flow, "mnuStructuredLow_Flow") - ' - 'mnuStructuredLow_FlowDefine - ' - Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - resources.ApplyResources(Me.mnuStructuredLow_FlowDefine, "mnuStructuredLow_FlowDefine") - ' - 'mnuStructuredSurvival - ' - Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) - Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - resources.ApplyResources(Me.mnuStructuredSurvival, "mnuStructuredSurvival") - ' - 'mnuStructuredSurvivalDefine - ' - Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - resources.ApplyResources(Me.mnuStructuredSurvivalDefine, "mnuStructuredSurvivalDefine") - ' - 'mnuStructuredTimeSeries - ' - Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) - Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - resources.ApplyResources(Me.mnuStructuredTimeSeries, "mnuStructuredTimeSeries") - ' - 'mnuStructuredTimeSeriesDefine - ' - Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - resources.ApplyResources(Me.mnuStructuredTimeSeriesDefine, "mnuStructuredTimeSeriesDefine") - ' - 'ToolStripSeparator60 - ' - Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - resources.ApplyResources(Me.ToolStripSeparator60, "ToolStripSeparator60") - ' - 'mnuStructuredTimeSeriesDescribe - ' - Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) - Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribe, "mnuStructuredTimeSeriesDescribe") - ' - 'mnuStructuredTimeSeriesDescribeOneVariable - ' - Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeOneVariable, "mnuStructuredTimeSeriesDescribeOneVariable") - ' - 'mnuStructuredTimeSeriesDescribeGeneral - ' - Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - resources.ApplyResources(Me.mnuStructuredTimeSeriesDescribeGeneral, "mnuStructuredTimeSeriesDescribeGeneral") - ' - 'ToolStripSeparator61 - ' - Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - resources.ApplyResources(Me.ToolStripSeparator61, "ToolStripSeparator61") - ' - 'mnuStructuredTimeSeriesModel - ' - Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) - Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - resources.ApplyResources(Me.mnuStructuredTimeSeriesModel, "mnuStructuredTimeSeriesModel") - ' - 'mnuStructuredTimeSeriesModelOneVariable - ' - Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - resources.ApplyResources(Me.mnuStructuredTimeSeriesModelOneVariable, "mnuStructuredTimeSeriesModelOneVariable") - ' - 'mnuStructuredTimeSeriesModelGeneral - ' - Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - resources.ApplyResources(Me.mnuStructuredTimeSeriesModelGeneral, "mnuStructuredTimeSeriesModelGeneral") - ' - 'ToolStripSeparator62 - ' - Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - resources.ApplyResources(Me.ToolStripSeparator62, "ToolStripSeparator62") - ' - 'ToolStripSeparator63 - ' - Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - resources.ApplyResources(Me.ToolStripSeparator63, "ToolStripSeparator63") - ' - 'mnuStructuredClimatic - ' - Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - resources.ApplyResources(Me.mnuStructuredClimatic, "mnuStructuredClimatic") - ' - 'mnuStructuredProcurement - ' - Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - resources.ApplyResources(Me.mnuStructuredProcurement, "mnuStructuredProcurement") - ' - 'mnuStructuredOptionByContext - ' - Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - resources.ApplyResources(Me.mnuStructuredOptionByContext, "mnuStructuredOptionByContext") - ' 'frmMain ' resources.ApplyResources(Me, "$this") diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 3f4f9a81f0a..715ba8af08c 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -118,18 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 64, 20 - - - Describe - - - 180, 22 - - - One Variable - 146, 22 @@ -157,11 +145,11 @@ Rating Data... - - 180, 22 + + 172, 22 - - Two Variables + + One Variable 146, 22 @@ -184,11 +172,11 @@ Frequencies... - - 180, 22 + + 172, 22 - - Three Variables + + Two Variables @@ -218,11 +206,11 @@ Frequencies - - 180, 22 + + 172, 22 - - Specific + + Three Variables 209, 22 @@ -311,11 +299,11 @@ Mosaic Plot... - - 180, 22 + + 172, 22 - - General + + Specific 188, 22 @@ -347,14 +335,14 @@ Use Summaries... - - 177, 6 + + 172, 22 - - 180, 22 + + General - - Multivariate + + 169, 6 203, 22 @@ -374,17 +362,23 @@ Canonical Correlations... + + 172, 22 + + + Multivariate + - 177, 6 + 169, 6 - 180, 22 + 172, 22 Use Graph... - 180, 22 + 172, 22 Combine Graphs... @@ -393,28 +387,22 @@ False - 180, 22 + 172, 22 Themes... - 180, 22 + 172, 22 View Graph... - - 53, 20 - - - Model - - - 201, 22 + + 64, 20 - - Probability Distributions + + Describe 242, 22 @@ -437,14 +425,14 @@ Random Samples (Use Model)... - - 198, 6 - - + 201, 22 - - Fit Model + + Probability Distributions + + + 198, 6 223, 22 @@ -494,11 +482,11 @@ Fit Model Keyboard... - + 201, 22 - - Compare Models + + Fit Model 149, 22 @@ -506,11 +494,11 @@ One Variable... - + 201, 22 - - Use Model + + Compare Models 192, 22 @@ -554,14 +542,11 @@ Use Model Keyboard... - - False - - + 201, 22 - - Other (One Variable) + + Use Model 166, 22 @@ -596,14 +581,14 @@ Goodness of Fit... - + False - + 201, 22 - - Other (Two Variables) + + Other (One Variable) False @@ -650,14 +635,14 @@ Non Parameteric One Way ANOVA... - + False - + 201, 22 - - Other (Three Variable) + + Other (Two Variables) False @@ -680,14 +665,14 @@ Chi-square Test... - + False - + 201, 22 - - Other (General) + + Other (Three Variable) False @@ -716,6 +701,21 @@ Log Linear... + + False + + + 201, 22 + + + Other (General) + + + 53, 20 + + + Model + False @@ -740,15 +740,6 @@ False - - 212, 22 - - - Evaporation - - - False - False @@ -767,13 +758,13 @@ Penman... - + 212, 22 - - Crop + + Evaporation - + False @@ -794,6 +785,15 @@ Water Satisfaction Index... + + 212, 22 + + + Crop + + + False + False @@ -806,12 +806,6 @@ False - - 44, 20 - - - View - 211, 22 @@ -878,11 +872,11 @@ Reset to Default Layout - + 44, 20 - - Help + + View 221, 22 @@ -944,12 +938,6 @@ 218, 6 - - 221, 22 - - - Guides - 166, 22 @@ -971,6 +959,12 @@ More... + + 221, 22 + + + Guides + False @@ -992,6 +986,12 @@ Acknowlegments + + 44, 20 + + + Help + 538, 56 @@ -1001,18 +1001,6 @@ 638, 56 - - 63, 20 - - - Climatic - - - 212, 22 - - - File - 211, 22 @@ -1061,14 +1049,14 @@ Export to CPT... - - 209, 6 - - + 212, 22 - - Tidy and Examine + + File + + + 209, 6 211, 22 @@ -1142,11 +1130,11 @@ One Variable Frequencies - + 212, 22 - - Dates + + Tidy and Examine 162, 22 @@ -1190,17 +1178,17 @@ Use Time... - + 212, 22 - - Define Climatic Data... + + Dates - + 212, 22 - - Check Data + + Define Climatic Data... 174, 22 @@ -1238,11 +1226,11 @@ Homogenization... - + 212, 22 - - Prepare + + Check Data 189, 22 @@ -1295,30 +1283,27 @@ Extremes... - - 189, 22 - - - Compare - - 143, 22 + 180, 22 Calculation... - - False - False - 143, 22 + 180, 22 Summary... + + 189, 22 + + + Compare + 186, 6 @@ -1427,14 +1412,14 @@ False - - 209, 6 - - + 212, 22 - - Describe + + Prepare + + + 209, 6 False @@ -1454,18 +1439,18 @@ Temperature... - - 199, 22 - - - Wind Speed/Direction... - 139, 22 Wind Rose... + + 199, 22 + + + Wind Speed/Direction... + False @@ -1490,11 +1475,11 @@ 196, 6 - + 212, 22 - - PICSA + + Describe 246, 22 @@ -1523,11 +1508,11 @@ Crops... - + 212, 22 - - CM SAF + + PICSA 231, 22 @@ -1541,17 +1526,17 @@ Export to CM SAF R Toolbox... - + 212, 22 - - Mapping... + + CM SAF - + 212, 22 - - Model + + Mapping... 180, 22 @@ -1574,14 +1559,14 @@ Markov Modelling... - - 209, 6 - - + 212, 22 - - Seasonal Forecast Support + + Model + + + 209, 6 246, 22 @@ -1622,20 +1607,11 @@ Cumulative/Exceedance Graph... - + 212, 22 - - Climate Methods - - - False - - - 199, 22 - - - Data Manipulation + + Seasonal Forecast Support False @@ -1772,11 +1748,11 @@ Output for CDT... - + 199, 22 - - Graphics + + Data Manipulation False @@ -1895,6 +1871,12 @@ Three Summaries... + + 199, 22 + + + Graphics + False @@ -1904,12 +1886,6 @@ Model... - - 199, 22 - - - Additional - False @@ -1955,6 +1931,12 @@ Water Balance... + + 199, 22 + + + Additional + False @@ -1964,6 +1946,21 @@ Create Climate Object... + + 212, 22 + + + Climate Methods + + + False + + + 63, 20 + + + Climatic + Ctrl+S @@ -1974,12 +1971,6 @@ Save... - - 232, 22 - - - Save As - 164, 22 @@ -2004,6 +1995,12 @@ Save Script As... + + 232, 22 + + + Save As + False @@ -2034,12 +2031,6 @@ Exit - - 39, 20 - - - Edit - False @@ -2124,12 +2115,24 @@ Select All + + 39, 20 + + + Edit + 775, 56 946, 56 + + 119, 17 + + + No worksheet loaded + 0, 460 @@ -2154,42 +2157,9 @@ 1 - - 119, 17 - - - No worksheet loaded - 17, 95 - - 0, 24 - - - No - - - 834, 37 - - - 7 - - - Tool - - - Tool_strip - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Magenta @@ -2253,6 +2223,18 @@ Edit Last Dialog + + 57, 6 + + + False + + + 57, 6 + + + False + Magenta @@ -2262,17 +2244,17 @@ Last 10 Dialogs - - 57, 6 + + 128, 22 - - False + + R Viewer... - - 57, 6 + + 128, 22 - - False + + Plotly... @@ -2312,18 +2294,6 @@ View Last Graph - - 128, 22 - - - R Viewer... - - - 128, 22 - - - Plotly... - 6, 37 @@ -2345,6 +2315,18 @@ Output Window + + 196, 22 + + + Column Metadata... + + + 196, 22 + + + Data Frame Metadata... + iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2401,17 +2383,17 @@ Column Metadata - - 196, 22 + + 160, 22 - - Column Metadata... + + Log Window... - - 196, 22 + + 160, 22 - - Data Frame Metadata... + + Script Window... @@ -2541,18 +2523,6 @@ Log Window - - 160, 22 - - - Log Window... - - - 160, 22 - - - Script Window... - Magenta @@ -2574,125 +2544,38 @@ He&lp - - 122, 95 - - - On - - - 37, 20 - - - File - - - 59, 20 - - - Prepare - - - 177, 6 - - - 180, 22 - - - Define... - - - 186, 22 - - - Circular - - - 180, 22 - - - Low_Flow - - - 180, 22 - - - Survival - - - 180, 22 - - - Time Series - - - 177, 6 - - - 180, 22 - - - Climatic... - - - 180, 22 - - - Procurement... - - - 186, 22 - - - Options by Context... - - - 74, 20 - - - Structured - - - 88, 20 - - - Procurement - - - 122, 20 - - - Options by Context - - - 46, 20 - - - Tools + + 0, 24 - - 0, 0 + + No - - 834, 24 + + 834, 37 - - 6 + + 7 - - Menu_strip + + Tool - - mnuBar + + Tool_strip - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 + + + 122, 95 + + + On Ctrl+N @@ -2766,12 +2649,6 @@ 229, 6 - - 232, 22 - - - Export - 204, 22 @@ -2796,6 +2673,12 @@ Export Graph As Image... + + 232, 22 + + + Export + 232, 22 @@ -2805,11 +2688,11 @@ 229, 6 - - 172, 22 + + 37, 20 - - Data Frame + + File 200, 22 @@ -2919,11 +2802,11 @@ Colour by Property... - + 172, 22 - - Check Data + + Data Frame 245, 22 @@ -3012,6 +2895,12 @@ Anonymise ID Column... + + 172, 22 + + + Check Data + 169, 6 @@ -3021,12 +2910,6 @@ Calculator... - - 172, 22 - - - Column: Calculate - 179, 22 @@ -3081,11 +2964,11 @@ Permute Columns... - + 172, 22 - - Column: Factor + + Column: Calculate 179, 22 @@ -3174,11 +3057,11 @@ Factor Data Frame... - + 172, 22 - - Column: Text + + Column: Factor 152, 22 @@ -3219,11 +3102,11 @@ Distance... - + 172, 22 - - Column: Date + + Column: Text 162, 22 @@ -3267,11 +3150,11 @@ Use Time... - + 172, 22 - - Column: Define + + Column: Date 176, 22 @@ -3288,14 +3171,14 @@ Circular... - - 169, 6 - - + 172, 22 - - Data Reshape + + Column: Define + + + 169, 6 193, 22 @@ -3357,14 +3240,14 @@ Transpose... - - 169, 6 - - + 172, 22 - - Keys and Links + + Data Reshape + + + 169, 6 207, 22 @@ -3396,11 +3279,11 @@ Add Comment... - + 172, 22 - - Data Object + + Keys and Links False @@ -3480,11 +3363,11 @@ Delete Metadata... - + 172, 22 - - R Objects + + Data Object 126, 22 @@ -3510,8 +3393,143 @@ Delete... - - 216, 22 + + 172, 22 + + + R Objects + + + 59, 20 + + + Prepare + + + 183, 6 + + + 180, 22 + + + Define... + + + 186, 22 + + + Circular + + + 180, 22 + + + Define... + + + 186, 22 + + + Low_Flow + + + 180, 22 + + + Define... + + + 186, 22 + + + Survival + + + 180, 22 + + + Define... + + + 177, 6 + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 180, 22 + + + Describe + + + 177, 6 + + + 180, 22 + + + One Variable... + + + 180, 22 + + + General... + + + 180, 22 + + + Model + + + 177, 6 + + + 186, 22 + + + Time Series + + + 183, 6 + + + 186, 22 + + + Climatic... + + + 186, 22 + + + Procurement... + + + 186, 22 + + + Options by Context... + + + 74, 20 + + + Structured + + + 216, 22 Open From Library... @@ -3522,12 +3540,6 @@ Define Procurement Data... - - 216, 22 - - - Prepare - 358, 22 @@ -3582,11 +3594,11 @@ Merge Additional Data... - + 216, 22 - - Describe + + Prepare 211, 22 @@ -3603,12 +3615,6 @@ 208, 6 - - 211, 22 - - - Categorical - 319, 22 @@ -3648,11 +3654,11 @@ Display Top N... - + 211, 22 - - Numeric + + Categorical 258, 22 @@ -3675,11 +3681,17 @@ Correlations (Red Flags or others)... - + + 211, 22 + + + Numeric + + 216, 22 - - Mapping + + Describe 189, 22 @@ -3687,11 +3699,11 @@ Map Country Values... - + 216, 22 - - Model + + Mapping 292, 22 @@ -3705,6 +3717,12 @@ Fit Model... + + 216, 22 + + + Model + 213, 6 @@ -3714,12 +3732,6 @@ Define Red Flag Variables... - - 216, 22 - - - Corruption Risk Index - 278, 22 @@ -3732,11 +3744,17 @@ Summarise CRI by Country (or other)... - - 250, 22 + + 216, 22 - - Check Data + + Corruption Risk Index + + + 88, 20 + + + Procurement 215, 22 @@ -3771,17 +3789,17 @@ One Variable Frequencies... - + 250, 22 - - Define Options by Context Data... + + Check Data - + 250, 22 - - Prepare + + Define Options by Context Data... 282, 22 @@ -3810,11 +3828,11 @@ Unstack... - + 250, 22 - - Describe + + Prepare 224, 22 @@ -3837,11 +3855,11 @@ Boxplot... - + 250, 22 - - Model + + Describe 176, 22 @@ -3855,6 +3873,18 @@ General Fit Model... + + 250, 22 + + + Model + + + 122, 20 + + + Options by Context + False @@ -3921,6 +3951,36 @@ Options... + + 46, 20 + + + Tools + + + 0, 0 + + + 834, 24 + + + 6 + + + Menu_strip + + + mnuBar + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 126, 22 @@ -4416,69 +4476,6 @@ Log Window - - 180, 22 - - - Define... - - - 180, 22 - - - Define... - - - 180, 22 - - - Define... - - - 177, 6 - - - 180, 22 - - - Describe - - - 180, 22 - - - One Variable... - - - 180, 22 - - - General... - - - 177, 6 - - - 180, 22 - - - Model - - - 180, 22 - - - One Variable... - - - 180, 22 - - - General... - - - 177, 6 - True @@ -8883,109 +8880,247 @@ mnuPrepareKeysAndLinksAddComment - + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObject + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectDataFrameMetadata + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectRenameDataFrame + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectReorderDataFrames + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectCopyDataFrame + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectDeleteDataFrame + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator21 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectHideDataframes + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectMetadata + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectRenameMetadata + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectReorderMetadata + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareDataObjectDeleteMetadata + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareRObjects + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareRObjectsView + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareRObjectsRename + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareRObjectsReorder + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareRObjectsDelete + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructured + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator20 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredCircular + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredCircularDefine + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObject + + mnuStructuredLow_Flow - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectDataFrameMetadata + + mnuStructuredLow_FlowDefine - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectRenameDataFrame + + mnuStructuredSurvival - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectReorderDataFrames + + mnuStructuredSurvivalDefine - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectCopyDataFrame + + mnuStructuredTimeSeries - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectDeleteDataFrame + + mnuStructuredTimeSeriesDefine - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripSeparator21 + + ToolStripSeparator60 - + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectHideDataframes + + mnuStructuredTimeSeriesDescribe - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectMetadata + + mnuStructuredTimeSeriesDescribeOneVariable - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectRenameMetadata + + mnuStructuredTimeSeriesDescribeGeneral - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectReorderMetadata + + ToolStripSeparator61 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareDataObjectDeleteMetadata + + mnuStructuredTimeSeriesModel - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareRObjects + + mnuStructuredTimeSeriesModelOneVariable - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareRObjectsView + + mnuStructuredTimeSeriesModelGeneral - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareRObjectsRename + + ToolStripSeparator62 - + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator63 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuStructuredClimatic + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareRObjectsReorder + + mnuStructuredProcurement - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareRObjectsDelete + + mnuStructuredOptionByContext - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -9468,144 +9603,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuStructured - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator20 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredCircular - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredCircularDefine - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredLow_Flow - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredLow_FlowDefine - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredSurvival - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredSurvivalDefine - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeries - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesDefine - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator60 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesDescribe - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesDescribeOneVariable - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesDescribeGeneral - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator61 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesModel - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesModelOneVariable - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredTimeSeriesModelGeneral - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator62 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator63 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredClimatic - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredProcurement - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuStructuredOptionByContext - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - frmMain From 37d093dd719deafa47cec2a05ec2cd0f1d3646e1 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 24 Jun 2020 09:55:55 +0300 Subject: [PATCH 37/41] showing the dialog on the frmmain --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 35aba36896e..4d1658453b9 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2136,7 +2136,7 @@ Public Class frmMain End Sub Private Sub mnuClimaticPrepareCompareSummary_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareCompareSummary.Click - 'dlgCompareSummary.ShowDialog() 'not yet working + dlgCompareSummary.ShowDialog() End Sub Private Sub mnuStructuredCircularDefine_Click(sender As Object, e As EventArgs) Handles mnuStructuredCircularDefine.Click From 8c175e154df4e1624a74fd13f49baaa73de42cc2 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 24 Jun 2020 12:51:39 +0300 Subject: [PATCH 38/41] moved menu items one level above and added a separator --- instat/frmMain.Designer.vb | 123 ++++++++++++++++++------------------- instat/frmMain.resx | 115 +++++++++++++++++----------------- 2 files changed, 117 insertions(+), 121 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index ea57315f5f7..49dddae140d 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -228,8 +228,6 @@ 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.mnuClimaticPrepareCompare = New System.Windows.Forms.ToolStripMenuItem() - 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() @@ -603,20 +601,22 @@ Partial Class frmMain Me.splOverall = New System.Windows.Forms.SplitContainer() Me.splExtraWindows = New System.Windows.Forms.SplitContainer() Me.splMetadata = New System.Windows.Forms.SplitContainer() - Me.ucrColumnMeta = New instat.ucrColumnMetadata() - Me.ucrDataFrameMeta = New instat.ucrDataFrameMetadata() Me.splLogScript = New System.Windows.Forms.SplitContainer() - Me.ucrLogWindow = New instat.ucrLog() - Me.ucrScriptWindow = New instat.ucrScript() Me.splDataOutput = New System.Windows.Forms.SplitContainer() - Me.ucrDataViewer = New instat.ucrDataView() - Me.ucrOutput = New instat.ucrOutputWindow() Me.mnuRViewer = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPlotly = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnMetadata = New System.Windows.Forms.ToolStripMenuItem() 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.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 +1623,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.mnuClimaticPrepareCompare, 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.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,17 +1673,6 @@ Partial Class frmMain Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" resources.ApplyResources(Me.mnuClimaticPrepareExtremes, "mnuClimaticPrepareExtremes") ' - 'mnuClimaticPrepareCompare - ' - Me.mnuClimaticPrepareCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPrepareCompareCalculation, Me.mnuClimaticPrepareCompareSummary}) - Me.mnuClimaticPrepareCompare.Name = "mnuClimaticPrepareCompare" - resources.ApplyResources(Me.mnuClimaticPrepareCompare, "mnuClimaticPrepareCompare") - ' - 'mnuClimaticPrepareCompareCalculation - ' - Me.mnuClimaticPrepareCompareCalculation.Name = "mnuClimaticPrepareCompareCalculation" - resources.ApplyResources(Me.mnuClimaticPrepareCompareCalculation, "mnuClimaticPrepareCompareCalculation") - ' 'mnuClimaticPrepareCompareSummary ' Me.mnuClimaticPrepareCompareSummary.Name = "mnuClimaticPrepareCompareSummary" @@ -3817,18 +3806,6 @@ Partial Class frmMain Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) ' - 'ucrColumnMeta - ' - Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrColumnMeta, "ucrColumnMeta") - Me.ucrColumnMeta.Name = "ucrColumnMeta" - ' - 'ucrDataFrameMeta - ' - Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrDataFrameMeta, "ucrDataFrameMeta") - Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - ' 'splLogScript ' Me.splLogScript.BackColor = System.Drawing.Color.LightGray @@ -3845,19 +3822,6 @@ Partial Class frmMain Me.splLogScript.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splLogScript.Panel2.Controls.Add(Me.ucrScriptWindow) ' - 'ucrLogWindow - ' - Me.ucrLogWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrLogWindow, "ucrLogWindow") - Me.ucrLogWindow.Name = "ucrLogWindow" - ' - 'ucrScriptWindow - ' - Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrScriptWindow, "ucrScriptWindow") - Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Tag = "Script_Window" - ' 'splDataOutput ' Me.splDataOutput.BackColor = System.Drawing.Color.LightGray @@ -3874,20 +3838,6 @@ Partial Class frmMain Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) ' - 'ucrDataViewer - ' - Me.ucrDataViewer.BackColor = System.Drawing.SystemColors.Control - Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrDataViewer, "ucrDataViewer") - Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Tag = "Data_View" - ' - 'ucrOutput - ' - Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.ucrOutput, "ucrOutput") - Me.ucrOutput.Name = "ucrOutput" - ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" @@ -3918,6 +3868,55 @@ Partial Class frmMain Me.mnuLogFile.Name = "mnuLogFile" resources.ApplyResources(Me.mnuLogFile, "mnuLogFile") ' + 'mnuClimaticPrepareCompareCalculation + ' + Me.mnuClimaticPrepareCompareCalculation.Name = "mnuClimaticPrepareCompareCalculation" + resources.ApplyResources(Me.mnuClimaticPrepareCompareCalculation, "mnuClimaticPrepareCompareCalculation") + ' + 'ucrColumnMeta + ' + Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrColumnMeta, "ucrColumnMeta") + Me.ucrColumnMeta.Name = "ucrColumnMeta" + ' + 'ucrDataFrameMeta + ' + Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrDataFrameMeta, "ucrDataFrameMeta") + Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" + ' + 'ucrLogWindow + ' + Me.ucrLogWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrLogWindow, "ucrLogWindow") + Me.ucrLogWindow.Name = "ucrLogWindow" + ' + 'ucrScriptWindow + ' + Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrScriptWindow, "ucrScriptWindow") + Me.ucrScriptWindow.Name = "ucrScriptWindow" + Me.ucrScriptWindow.Tag = "Script_Window" + ' + 'ucrDataViewer + ' + Me.ucrDataViewer.BackColor = System.Drawing.SystemColors.Control + Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrDataViewer, "ucrDataViewer") + Me.ucrDataViewer.Name = "ucrDataViewer" + Me.ucrDataViewer.Tag = "Data_View" + ' + 'ucrOutput + ' + Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrOutput, "ucrOutput") + Me.ucrOutput.Name = "ucrOutput" + ' + 'ToolStripSeparator64 + ' + Me.ToolStripSeparator64.Name = "ToolStripSeparator64" + resources.ApplyResources(Me.ToolStripSeparator64, "ToolStripSeparator64") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4429,7 +4428,7 @@ Partial Class frmMain Friend WithEvents mnuClimaticTidyandExamineOneVariableSummarize As ToolStripMenuItem Friend WithEvents ToolStripSeparator50 As ToolStripSeparator Friend WithEvents mnuClimaticPrepareLengthOfSeason As ToolStripMenuItem - Friend WithEvents mnuClimaticPrepareCompare As ToolStripMenuItem + Friend WithEvents mnuClimaticPrepareCompareSummary As ToolStripMenuItem Friend WithEvents mnuClimaticFileOpenandTidyShapefile As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineMerge As ToolStripMenuItem Friend WithEvents mnuClimaticCMSAFExporttoCMSAFRToolbox As ToolStripMenuItem @@ -4517,8 +4516,6 @@ Partial Class frmMain Friend WithEvents DisplayTopNToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuModelFitModelHypothesisTestsKeyboard As ToolStripMenuItem Friend WithEvents mnuClimaticCheckDataHomogenization As ToolStripMenuItem - Friend WithEvents mnuClimaticPrepareCompareCalculation As ToolStripMenuItem - Friend WithEvents mnuClimaticPrepareCompareSummary As ToolStripMenuItem Friend WithEvents mnuStructured As ToolStripMenuItem Friend WithEvents ToolStripSeparator20 As ToolStripSeparator Friend WithEvents mnuStructuredCircular As ToolStripMenuItem @@ -4542,4 +4539,6 @@ Partial Class frmMain Friend WithEvents mnuStructuredClimatic As ToolStripMenuItem Friend WithEvents mnuStructuredProcurement As ToolStripMenuItem Friend WithEvents mnuStructuredOptionByContext As ToolStripMenuItem + Friend WithEvents mnuClimaticPrepareCompareCalculation As ToolStripMenuItem + Friend WithEvents ToolStripSeparator64 As ToolStripSeparator End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 715ba8af08c..b18b54cd318 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -1233,97 +1233,91 @@ Check Data - 189, 22 + 198, 22 Transform... - 189, 22 + 198, 22 Conversions... - 186, 6 + 195, 6 - 189, 22 + 198, 22 Climatic Summaries... - 189, 22 + 198, 22 Start of the Rains... - 189, 22 + 198, 22 End of Rains... - 189, 22 + 198, 22 Length of Season... - 189, 22 + 198, 22 Spells... - 189, 22 + 198, 22 Extremes... + + 195, 6 + - 180, 22 + 198, 22 - Calculation... - - - False + Compare: Calculation... - 180, 22 + 198, 22 - Summary... - - - 189, 22 - - - Compare + Compare: Summary... - 186, 6 + 195, 6 - 189, 22 + 198, 22 Climdex... - 189, 22 + 198, 22 SPI... - 186, 6 + 195, 6 - 189, 22 + 198, 22 Evapotranspiration... @@ -1332,7 +1326,7 @@ False - 189, 22 + 198, 22 Summary... @@ -1344,7 +1338,7 @@ False - 189, 22 + 198, 22 New Worksheet... @@ -1356,7 +1350,7 @@ False - 189, 22 + 198, 22 Import daily Data... @@ -1368,7 +1362,7 @@ False - 189, 22 + 198, 22 Make Factor... @@ -1380,7 +1374,7 @@ False - 189, 22 + 198, 22 Shift Daily Data... @@ -1392,7 +1386,7 @@ False - 189, 22 + 198, 22 Unstack Daily Data... @@ -1404,7 +1398,7 @@ False - 189, 22 + 198, 22 Stack Daily data... @@ -3409,7 +3403,7 @@ 183, 6 - 180, 22 + 117, 22 Define... @@ -3421,7 +3415,7 @@ Circular - 180, 22 + 117, 22 Define... @@ -3433,7 +3427,7 @@ Low_Flow - 180, 22 + 117, 22 Define... @@ -3445,55 +3439,55 @@ Survival - 180, 22 + 119, 22 Define... - 177, 6 + 116, 6 - 180, 22 + 149, 22 One Variable... - 180, 22 + 149, 22 General... - 180, 22 + 119, 22 Describe - 177, 6 + 116, 6 - 180, 22 + 149, 22 One Variable... - 180, 22 + 149, 22 General... - 180, 22 + 119, 22 Model - 177, 6 + 116, 6 186, 22 @@ -6216,6 +6210,9 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + NoControl + R-Instat @@ -7353,18 +7350,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuClimaticPrepareCompare - - - System.Windows.Forms.ToolStripMenuItem, 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 @@ -9603,6 +9588,18 @@ System.Windows.Forms.ToolStripMenuItem, 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 + + + ToolStripSeparator64 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain From a77f89a94219a7560f84c306f26fb1b448963f52 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Thu, 25 Jun 2020 14:45:50 +0300 Subject: [PATCH 39/41] 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 40/41] 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 From 5b274814111591541ade92419548e37f57acbf3f Mon Sep 17 00:00:00 2001 From: ivanluv Date: Fri, 26 Jun 2020 14:09:31 +0300 Subject: [PATCH 41/41] MInor change --- instat/dlgCumulativeDistribution.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 98e0f8d49a4..7e338e4a6b9 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -126,6 +126,7 @@ Public Class dlgCumulativeDistribution clsRaesFunction = New RFunction clsStatECDFFunction = New RFunction clsRggplotFunction = New RFunction + clsStatECDFAesFunction = New RFunction clsSequence = New RFunction clsSequence.SetRCommand("seq")