diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 2410f83662f..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() @@ -503,6 +501,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() @@ -580,43 +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.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.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,21 +1673,10 @@ 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 ' - resources.ApplyResources(Me.mnuClimaticPrepareCompareSummary, "mnuClimaticPrepareCompareSummary") Me.mnuClimaticPrepareCompareSummary.Name = "mnuClimaticPrepareCompareSummary" + resources.ApplyResources(Me.mnuClimaticPrepareCompareSummary, "mnuClimaticPrepareCompareSummary") ' 'ToolStripSeparator46 ' @@ -3257,6 +3246,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}) @@ -3695,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 @@ -3723,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 @@ -3752,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" @@ -3796,127 +3868,54 @@ 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 + 'mnuClimaticPrepareCompareCalculation ' - Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) - Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - resources.ApplyResources(Me.mnuStructuredTimeSeriesModel, "mnuStructuredTimeSeriesModel") + Me.mnuClimaticPrepareCompareCalculation.Name = "mnuClimaticPrepareCompareCalculation" + resources.ApplyResources(Me.mnuClimaticPrepareCompareCalculation, "mnuClimaticPrepareCompareCalculation") ' - 'mnuStructuredTimeSeriesModelOneVariable + 'ucrColumnMeta ' - Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - resources.ApplyResources(Me.mnuStructuredTimeSeriesModelOneVariable, "mnuStructuredTimeSeriesModelOneVariable") + Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrColumnMeta, "ucrColumnMeta") + Me.ucrColumnMeta.Name = "ucrColumnMeta" ' - 'mnuStructuredTimeSeriesModelGeneral + 'ucrDataFrameMeta ' - Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - resources.ApplyResources(Me.mnuStructuredTimeSeriesModelGeneral, "mnuStructuredTimeSeriesModelGeneral") + Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrDataFrameMeta, "ucrDataFrameMeta") + Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" ' - 'ToolStripSeparator62 + 'ucrLogWindow ' - Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - resources.ApplyResources(Me.ToolStripSeparator62, "ToolStripSeparator62") + Me.ucrLogWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrLogWindow, "ucrLogWindow") + Me.ucrLogWindow.Name = "ucrLogWindow" ' - 'ToolStripSeparator63 + 'ucrScriptWindow ' - Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - resources.ApplyResources(Me.ToolStripSeparator63, "ToolStripSeparator63") + Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrScriptWindow, "ucrScriptWindow") + Me.ucrScriptWindow.Name = "ucrScriptWindow" + Me.ucrScriptWindow.Tag = "Script_Window" ' - 'mnuStructuredClimatic + 'ucrDataViewer ' - Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - resources.ApplyResources(Me.mnuStructuredClimatic, "mnuStructuredClimatic") + 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" ' - 'mnuStructuredProcurement + 'ucrOutput ' - Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - resources.ApplyResources(Me.mnuStructuredProcurement, "mnuStructuredProcurement") + Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + resources.ApplyResources(Me.ucrOutput, "ucrOutput") + Me.ucrOutput.Name = "ucrOutput" ' - 'mnuStructuredOptionByContext + 'ToolStripSeparator64 ' - Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - resources.ApplyResources(Me.mnuStructuredOptionByContext, "mnuStructuredOptionByContext") + Me.ToolStripSeparator64.Name = "ToolStripSeparator64" + resources.ApplyResources(Me.ToolStripSeparator64, "ToolStripSeparator64") ' 'frmMain ' @@ -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 3f4f9a81f0a..b18b54cd318 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,107 +1226,98 @@ Homogenization... - + 212, 22 - - Prepare + + 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... - - 189, 22 - - - Compare + + 195, 6 - 143, 22 + 198, 22 - Calculation... - - - False - - - False + Compare: Calculation... - 143, 22 + 198, 22 - Summary... + 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... @@ -1347,7 +1326,7 @@ False - 189, 22 + 198, 22 Summary... @@ -1359,7 +1338,7 @@ False - 189, 22 + 198, 22 New Worksheet... @@ -1371,7 +1350,7 @@ False - 189, 22 + 198, 22 Import daily Data... @@ -1383,7 +1362,7 @@ False - 189, 22 + 198, 22 Make Factor... @@ -1395,7 +1374,7 @@ False - 189, 22 + 198, 22 Shift Daily Data... @@ -1407,7 +1386,7 @@ False - 189, 22 + 198, 22 Unstack Daily Data... @@ -1419,7 +1398,7 @@ False - 189, 22 + 198, 22 Stack Daily data... @@ -1427,14 +1406,14 @@ False - - 209, 6 - - + 212, 22 - - Describe + + Prepare + + + 209, 6 False @@ -1454,18 +1433,18 @@ Temperature... - - 199, 22 - - - Wind Speed/Direction... - 139, 22 Wind Rose... + + 199, 22 + + + Wind Speed/Direction... + False @@ -1490,11 +1469,11 @@ 196, 6 - + 212, 22 - - PICSA + + Describe 246, 22 @@ -1523,11 +1502,11 @@ Crops... - + 212, 22 - - CM SAF + + PICSA 231, 22 @@ -1541,17 +1520,17 @@ Export to CM SAF R Toolbox... - + 212, 22 - - Mapping... + + CM SAF - + 212, 22 - - Model + + Mapping... 180, 22 @@ -1574,14 +1553,14 @@ Markov Modelling... - - 209, 6 - - + 212, 22 - - Seasonal Forecast Support + + Model + + + 209, 6 246, 22 @@ -1622,20 +1601,11 @@ Cumulative/Exceedance Graph... - + 212, 22 - - Climate Methods - - - False - - - 199, 22 - - - Data Manipulation + + Seasonal Forecast Support False @@ -1772,11 +1742,11 @@ Output for CDT... - + 199, 22 - - Graphics + + Data Manipulation False @@ -1895,6 +1865,12 @@ Three Summaries... + + 199, 22 + + + Graphics + False @@ -1904,12 +1880,6 @@ Model... - - 199, 22 - - - Additional - False @@ -1955,6 +1925,12 @@ Water Balance... + + 199, 22 + + + Additional + False @@ -1964,6 +1940,21 @@ Create Climate Object... + + 212, 22 + + + Climate Methods + + + False + + + 63, 20 + + + Climatic + Ctrl+S @@ -1974,12 +1965,6 @@ Save... - - 232, 22 - - - Save As - 164, 22 @@ -2004,6 +1989,12 @@ Save Script As... + + 232, 22 + + + Save As + False @@ -2034,12 +2025,6 @@ Exit - - 39, 20 - - - Edit - False @@ -2124,12 +2109,24 @@ Select All + + 39, 20 + + + Edit + 775, 56 946, 56 + + 119, 17 + + + No worksheet loaded + 0, 460 @@ -2154,42 +2151,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,15 +2217,6 @@ Edit Last Dialog - - Magenta - - - 43, 34 - - - Last 10 Dialogs - 57, 6 @@ -2274,23 +2229,44 @@ False - - - iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ - h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv - P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq - QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S - XSKenFlAgaobakN8Xe1weJC47jiyE2phSPgalVWjZBXfLxJP+ZCT/i+UOd2kxY/Yw/mQuuEnKIg4l4hf - q7CRdRExwxg3j/wdzNWxiNncPI2l8YoOHsV7BpH+zC8oKu2He36Zq8cnfcjcfAkKTSdp0Yj9OHj4HuTP - nsfeN20IBhcke3Sc+t4Fua4TnoCPtAjJNesI4NW8AWj00V19vduDzISj5LZvaBxFc5tDmokGHhm6mzhp - ckr6UoRcfcXMIa+sl6TIxPYZH5LX1UNDsdLTOHfZJc1ERs2Raahyox9Pgfi+3YuXU36FXNNFWuQHbSNe - bFddR9VOG/a9PgKl0YLhO+GYLUYgEMC2zKtoveiRLCshEHu9PD58fwK6gugls6J6BAcOjUtaEIdqJpEi - u4zhURa/pXj3gzFKqgFJiwyBmA8GUVfngL7IKhiXwz61ALWxC8MjSxPq4yNTSJb9gdtD4Z3Pzvmwdfsl - 9PTGTj6BeIxcnbapDVnqyFl9+NMplFcMStpS1Hw+Lbjd1ORA80UninYNYP+Be9JsdISSq7HJBUMx2/Fy - Yh76UitaLkSP1779d6CjhMugQvHc+gbwwvGJDYHYzfF4u/o/aPNWlszGJjcMMbKdYU+VTSBOI+LUp05g - zhU56RZDdPWEF+lJlNXqlVldUN6Pz76akbTIaP/HjZSnzyDzyRPYVTlIOcO6UWyEXN099PAch3F/1gel - oQOc59EvujvlxbVOjqRHP8sgEM888KMsp4+6E6tcDEH8dcMFvcaML449kGzxhUA8QbVate1vKHWMmMeX + + Magenta + + + 43, 34 + + + Last 10 Dialogs + + + 128, 22 + + + R Viewer... + + + 128, 22 + + + Plotly... + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv + P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq + QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S + XSKenFlAgaobakN8Xe1weJC47jiyE2phSPgalVWjZBXfLxJP+ZCT/i+UOd2kxY/Yw/mQuuEnKIg4l4hf + q7CRdRExwxg3j/wdzNWxiNncPI2l8YoOHsV7BpH+zC8oKu2He36Zq8cnfcjcfAkKTSdp0Yj9OHj4HuTP + nsfeN20IBhcke3Sc+t4Fua4TnoCPtAjJNesI4NW8AWj00V19vduDzISj5LZvaBxFc5tDmokGHhm6mzhp + ckr6UoRcfcXMIa+sl6TIxPYZH5LX1UNDsdLTOHfZJc1ERs2Raahyox9Pgfi+3YuXU36FXNNFWuQHbSNe + bFddR9VOG/a9PgKl0YLhO+GYLUYgEMC2zKtoveiRLCshEHu9PD58fwK6gugls6J6BAcOjUtaEIdqJpEi + u4zhURa/pXj3gzFKqgFJiwyBmA8GUVfngL7IKhiXwz61ALWxC8MjSxPq4yNTSJb9gdtD4Z3Pzvmwdfsl + 9PTGTj6BeIxcnbapDVnqyFl9+NMplFcMStpS1Hw+Lbjd1ORA80UninYNYP+Be9JsdISSq7HJBUMx2/Fy + Yh76UitaLkSP1779d6CjhMugQvHc+gbwwvGJDYHYzfF4u/o/aPNWlszGJjcMMbKdYU+VTSBOI+LUp05g + zhU56RZDdPWEF+lJlNXqlVldUN6Pz76akbTIaP/HjZSnzyDzyRPYVTlIOcO6UWyEXN099PAch3F/1gel + oQOc59EvujvlxbVOjqRHP8sgEM888KMsp4+6E6tcDEH8dcMFvcaML449kGzxhUA8QbVate1vKHWMmMeX tTNIe6JWiNtb77AMfdym8PgIudrunUfxztsk+bEl+TyVxlq8QmPj+kbBFm+IO6Z+rNzSDqVW3PFHn9ih pEbA6vIb1IlWbcdz1J0KFRaohe7EEMQPZ90wnWGNICCa4oyQq3ttHIp33yIp0nl9aGO/y+VINoZYMhFb +xZQRDVaJruCTRt+hHFHL9S6LshVHTCW9tLZ7qCk60I+VbVMRQc0BjP0hT3IkN8UflnRySI7m1draZ2y @@ -2312,18 +2288,6 @@ View Last Graph - - 128, 22 - - - R Viewer... - - - 128, 22 - - - Plotly... - 6, 37 @@ -2345,6 +2309,18 @@ Output Window + + 196, 22 + + + Column Metadata... + + + 196, 22 + + + Data Frame Metadata... + iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2401,17 +2377,17 @@ Column Metadata - - 196, 22 + + 160, 22 - - Column Metadata... + + Log Window... - - 196, 22 + + 160, 22 - - Data Frame Metadata... + + Script Window... @@ -2541,18 +2517,6 @@ Log Window - - 160, 22 - - - Log Window... - - - 160, 22 - - - Script Window... - Magenta @@ -2574,125 +2538,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 +2643,6 @@ 229, 6 - - 232, 22 - - - Export - 204, 22 @@ -2796,6 +2667,12 @@ Export Graph As Image... + + 232, 22 + + + Export + 232, 22 @@ -2805,11 +2682,11 @@ 229, 6 - - 172, 22 + + 37, 20 - - Data Frame + + File 200, 22 @@ -2919,11 +2796,11 @@ Colour by Property... - + 172, 22 - - Check Data + + Data Frame 245, 22 @@ -3012,6 +2889,12 @@ Anonymise ID Column... + + 172, 22 + + + Check Data + 169, 6 @@ -3021,12 +2904,6 @@ Calculator... - - 172, 22 - - - Column: Calculate - 179, 22 @@ -3081,11 +2958,11 @@ Permute Columns... - + 172, 22 - - Column: Factor + + Column: Calculate 179, 22 @@ -3174,11 +3051,11 @@ Factor Data Frame... - + 172, 22 - - Column: Text + + Column: Factor 152, 22 @@ -3219,11 +3096,11 @@ Distance... - + 172, 22 - - Column: Date + + Column: Text 162, 22 @@ -3267,11 +3144,11 @@ Use Time... - + 172, 22 - - Column: Define + + Column: Date 176, 22 @@ -3288,14 +3165,14 @@ Circular... - - 169, 6 - - + 172, 22 - - Data Reshape + + Column: Define + + + 169, 6 193, 22 @@ -3357,14 +3234,14 @@ Transpose... - - 169, 6 - - + 172, 22 - - Keys and Links + + Data Reshape + + + 169, 6 207, 22 @@ -3396,11 +3273,11 @@ Add Comment... - + 172, 22 - - Data Object + + Keys and Links False @@ -3480,11 +3357,11 @@ Delete Metadata... - + 172, 22 - - R Objects + + Data Object 126, 22 @@ -3510,6 +3387,141 @@ Delete... + + 172, 22 + + + R Objects + + + 59, 20 + + + Prepare + + + 183, 6 + + + 117, 22 + + + Define... + + + 186, 22 + + + Circular + + + 117, 22 + + + Define... + + + 186, 22 + + + Low_Flow + + + 117, 22 + + + Define... + + + 186, 22 + + + Survival + + + 119, 22 + + + Define... + + + 116, 6 + + + 149, 22 + + + One Variable... + + + 149, 22 + + + General... + + + 119, 22 + + + Describe + + + 116, 6 + + + 149, 22 + + + One Variable... + + + 149, 22 + + + General... + + + 119, 22 + + + Model + + + 116, 6 + + + 186, 22 + + + Time Series + + + 183, 6 + + + 186, 22 + + + Climatic... + + + 186, 22 + + + Procurement... + + + 186, 22 + + + Options by Context... + + + 74, 20 + + + Structured + 216, 22 @@ -3522,12 +3534,6 @@ Define Procurement Data... - - 216, 22 - - - Prepare - 358, 22 @@ -3582,11 +3588,11 @@ Merge Additional Data... - + 216, 22 - - Describe + + Prepare 211, 22 @@ -3603,12 +3609,6 @@ 208, 6 - - 211, 22 - - - Categorical - 319, 22 @@ -3648,11 +3648,11 @@ Display Top N... - + 211, 22 - - Numeric + + Categorical 258, 22 @@ -3675,11 +3675,17 @@ Correlations (Red Flags or others)... - + + 211, 22 + + + Numeric + + 216, 22 - - Mapping + + Describe 189, 22 @@ -3687,11 +3693,11 @@ Map Country Values... - + 216, 22 - - Model + + Mapping 292, 22 @@ -3705,6 +3711,12 @@ Fit Model... + + 216, 22 + + + Model + 213, 6 @@ -3714,12 +3726,6 @@ Define Red Flag Variables... - - 216, 22 - - - Corruption Risk Index - 278, 22 @@ -3732,11 +3738,17 @@ Summarise CRI by Country (or other)... - - 250, 22 + + 216, 22 - - Check Data + + Corruption Risk Index + + + 88, 20 + + + Procurement 215, 22 @@ -3771,17 +3783,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 +3822,11 @@ Unstack... - + 250, 22 - - Describe + + Prepare 224, 22 @@ -3837,11 +3849,11 @@ Boxplot... - + 250, 22 - - Model + + Describe 176, 22 @@ -3855,6 +3867,18 @@ General Fit Model... + + 250, 22 + + + Model + + + 122, 20 + + + Options by Context + False @@ -3921,6 +3945,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 +4470,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 @@ -6219,6 +6210,9 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + NoControl + R-Instat @@ -7356,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 @@ -8988,6 +8970,144 @@ 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 + mnuProcurement @@ -9468,144 +9588,18 @@ 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 + + mnuClimaticPrepareCompareCalculation - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripSeparator62 + + ToolStripSeparator64 - - 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 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