diff --git a/instat/dlgCalculateTreatmentDifferences.vb b/instat/dlgCalculateTreatmentDifferences.vb index 3fdc77e134f..23eb222a9a3 100644 --- a/instat/dlgCalculateTreatmentDifferences.vb +++ b/instat/dlgCalculateTreatmentDifferences.vb @@ -49,6 +49,7 @@ Public Class dlgCalculateTreatmentDifferences End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 581 ucrChkCalculateDiffCategories.SetText("Calculate Difference Categories") ucrChkCalculateDiffCategories.AddToLinkedControls(ucrInputBreakPoints, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkCalculateDiffCategories.AddToLinkedControls(ucrInputLabels, {True}, bNewLinkedHideIfParameterMissing:=True) diff --git a/instat/dlgClimaticCheckDataRain.vb b/instat/dlgClimaticCheckDataRain.vb index 714ee283e5a..0770f30561e 100644 --- a/instat/dlgClimaticCheckDataRain.vb +++ b/instat/dlgClimaticCheckDataRain.vb @@ -77,6 +77,7 @@ Public Class dlgClimaticCheckDataRain End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 511 Dim lstControls As New List(Of Control) lstControls.AddRange({lblMissingThreshold, cmdOmitMonths, lblThresholdmm}) diff --git a/instat/dlgClimaticCheckDataTemperature.vb b/instat/dlgClimaticCheckDataTemperature.vb index 191d81b4524..6b272e89960 100644 --- a/instat/dlgClimaticCheckDataTemperature.vb +++ b/instat/dlgClimaticCheckDataTemperature.vb @@ -57,6 +57,7 @@ Public Class dlgClimaticCheckDataTemperature End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 559 'TODO: Not yet implemented. rdoMultiple.Enabled = False rdoSatelite.Enabled = False diff --git a/instat/dlgClimaticLengthOfSeason.vb b/instat/dlgClimaticLengthOfSeason.vb index b1b962197c2..846aa735886 100644 --- a/instat/dlgClimaticLengthOfSeason.vb +++ b/instat/dlgClimaticLengthOfSeason.vb @@ -38,7 +38,7 @@ Public Class dlgClimaticLengthOfSeason End Sub Private Sub InitialiseDialog() - + ucrBase.iHelpTopicID = 564 ucrReceiverStartofRains.SetParameter(New RParameter("start_doy", 1, bNewIncludeArgumentName:=False)) ucrReceiverStartofRains.SetParameterIsString() ucrReceiverStartofRains.bWithQuotes = False diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index fc7e651a4c9..7ea4541c639 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -53,6 +53,7 @@ Public Class dlgClimaticStationMaps End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 558 ucrBase.clsRsyntax.iCallType = 3 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False diff --git a/instat/dlgCompare.vb b/instat/dlgCompare.vb index 7a84f368abb..db0f44647d9 100644 --- a/instat/dlgCompare.vb +++ b/instat/dlgCompare.vb @@ -48,6 +48,7 @@ Public Class dlgCompare End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 562 ucrPnlCompare.AddRadioButton(rdoDifferences) ucrPnlCompare.AddRadioButton(rdoAnomalies) ucrPnlCompare.AddParameterPresentCondition(rdoDifferences, "manipulations", False) diff --git a/instat/dlgCompareTreatmentLines.vb b/instat/dlgCompareTreatmentLines.vb index d644fad74e5..4f464a8dd99 100644 --- a/instat/dlgCompareTreatmentLines.vb +++ b/instat/dlgCompareTreatmentLines.vb @@ -51,8 +51,9 @@ Public Class dlgCompareTreatmentLines End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 585 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False - 'ucrBase.iHelpTopicID = + ucrBase.clsRsyntax.iCallType = 3 ucrSelectorPlot.SetParameter(New RParameter("data", 0)) diff --git a/instat/dlgConversions.vb b/instat/dlgConversions.vb index 02ba0100b87..2951440a54d 100644 --- a/instat/dlgConversions.vb +++ b/instat/dlgConversions.vb @@ -36,6 +36,7 @@ Public Class dlgConversions End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 563 Dim dctPrecipitationUnits As New Dictionary(Of String, String) Dim dctTemperatureUnits As New Dictionary(Of String, String) Dim dctWindSpeedUnits As New Dictionary(Of String, String) diff --git a/instat/dlgDefineOptionsByContext.vb b/instat/dlgDefineOptionsByContext.vb index 777509b6d8e..569c7737fa7 100644 --- a/instat/dlgDefineOptionsByContext.vb +++ b/instat/dlgDefineOptionsByContext.vb @@ -38,6 +38,7 @@ Public Class dlgDefineOptionsByContext End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 572 'TODO not yet implemented lblKeyColumns.Hide() ucrInputKeyCheck.Hide() diff --git a/instat/dlgDisplayDailyData.vb b/instat/dlgDisplayDailyData.vb index dd3965baf91..17ba882ad44 100644 --- a/instat/dlgDisplayDailyData.vb +++ b/instat/dlgDisplayDailyData.vb @@ -41,6 +41,8 @@ Public Class dlgDisplayDailyData End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 361 + Dim dctBarColour As New Dictionary(Of String, String) Dim dctRugColour As New Dictionary(Of String, String) Dim dctSummary As New Dictionary(Of String, String) diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 5d110e9f1de..ced2b878147 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -46,8 +46,9 @@ Public Class dlgEvapotranspiration End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 565 ucrBase.clsRsyntax.iCallType = 2 - 'ucrBase.iHelpTopicID = 510 + Dim dctInputCrops As New Dictionary(Of String, String) Dim dctInputTimeStep As New Dictionary(Of String, String) Dim dctInputSolar As New Dictionary(Of String, String) diff --git a/instat/dlgExportToCMSAF.vb b/instat/dlgExportToCMSAF.vb index a0dc7a2007a..e45bd8f6779 100644 --- a/instat/dlgExportToCMSAF.vb +++ b/instat/dlgExportToCMSAF.vb @@ -37,6 +37,7 @@ Public Class dlgExportToCMSAF End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 569 ucrReceiverStation.Selector = ucrSelectorImportToCMSAF ucrReceiverDate.Selector = ucrSelectorImportToCMSAF ucrReceiverLongitude.Selector = ucrSelectorImportToCMSAF diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index c3038ee125b..915a76d96b0 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -80,11 +80,10 @@ Public Class dlgPICSARainfall TestOkEnabled() End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 118 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False - ucrBase.clsRsyntax.iCallType = 3 - - 'ucrBase.iHelpTopicID= - + ucrBase.clsRsyntax.iCallType = 3 + ucrPICSARainfallSelector.SetParameter(New RParameter("data", 0)) ucrPICSARainfallSelector.SetParameterIsrfunction() diff --git a/instat/dlgPlotRegion.vb b/instat/dlgPlotRegion.vb index 38fea264aeb..c21d4d54275 100644 --- a/instat/dlgPlotRegion.vb +++ b/instat/dlgPlotRegion.vb @@ -38,6 +38,7 @@ Public Class dlgPlotRegion End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 568 ucrBase.clsRsyntax.iCallType = 3 ucrReceiverLongitude.SetParameter(New RParameter("lon", 1)) diff --git a/instat/dlgSPI.vb b/instat/dlgSPI.vb index 16e0154a872..3a0e8f24e58 100644 --- a/instat/dlgSPI.vb +++ b/instat/dlgSPI.vb @@ -36,7 +36,7 @@ Public Class dlgSPI Private Sub InitialiseDialog() ucrBase.clsRsyntax.iCallType = 2 - ucrBase.iHelpTopicID = 510 + ucrBase.iHelpTopicID = 566 ucrSelectorVariable.SetParameterIsString() diff --git a/instat/dlgTidyDailyData.vb b/instat/dlgTidyDailyData.vb index cd2533039d5..c6e3aba1574 100644 --- a/instat/dlgTidyDailyData.vb +++ b/instat/dlgTidyDailyData.vb @@ -44,6 +44,8 @@ Public Class dlgTidyDailyData End Sub Private Sub InitialiseDialog() + + ucrBase.iHelpTopicID = 561 ucrBase.clsRsyntax.iCallType = 2 ucrPnlReshapeClimaticData.AddRadioButton(rdoYear) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index e74aa86dda3..3af44a3da88 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -213,6 +213,7 @@ Partial Class frmMain Me.mnuClimaticCheckDataQCTemperatures = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepare = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCimaticPrepareTransform = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticPrepareConversions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareCompare = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator37 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticPrepareClimaticSummaries = New System.Windows.Forms.ToolStripMenuItem() @@ -550,14 +551,15 @@ 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.splLogScript = New System.Windows.Forms.SplitContainer() - Me.splDataOutput = 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.mnuHelpAcknowledgments = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1278,7 +1280,7 @@ Partial Class frmMain ' 'mnuHelp ' - Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpHistFAQ, Me.mnuHelpSpreadsheet, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpMenus, Me.mnuHelpR, Me.mnuHelpRPackagesCommands, Me.mnuHelpDataset, Me.ToolStripSeparator29, Me.mnuHelpGuide, Me.mnuHelpAboutRInstat, Me.mnuHelpLicence}) + Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpHistFAQ, Me.mnuHelpSpreadsheet, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpMenus, Me.mnuHelpR, Me.mnuHelpRPackagesCommands, Me.mnuHelpDataset, Me.ToolStripSeparator29, Me.mnuHelpGuide, Me.mnuHelpAboutRInstat, Me.mnuHelpLicence, Me.mnuHelpAcknowledgments}) Me.mnuHelp.Name = "mnuHelp" resources.ApplyResources(Me.mnuHelp, "mnuHelp") Me.mnuHelp.Tag = "Help" @@ -1550,7 +1552,7 @@ Partial Class frmMain ' 'mnuClimaticPrepare ' - Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareCompare, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator46, 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.mnuClimaticPrepareCompare, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator46, 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" @@ -1560,6 +1562,11 @@ Partial Class frmMain Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" resources.ApplyResources(Me.mnuCimaticPrepareTransform, "mnuCimaticPrepareTransform") ' + 'mnuClimaticPrepareConversions + ' + Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" + resources.ApplyResources(Me.mnuClimaticPrepareConversions, "mnuClimaticPrepareConversions") + ' 'mnuClimaticPrepareCompare ' Me.mnuClimaticPrepareCompare.Name = "mnuClimaticPrepareCompare" @@ -3514,6 +3521,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 @@ -3530,6 +3549,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 @@ -3546,31 +3578,6 @@ Partial Class frmMain Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) ' - '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 @@ -3585,6 +3592,11 @@ Partial Class frmMain resources.ApplyResources(Me.ucrOutput, "ucrOutput") Me.ucrOutput.Name = "ucrOutput" ' + 'mnuHelpAcknowledgments + ' + Me.mnuHelpAcknowledgments.Name = "mnuHelpAcknowledgments" + resources.ApplyResources(Me.mnuHelpAcknowledgments, "mnuHelpAcknowledgments") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -4148,4 +4160,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticCMSAFExporttoCMSAFRToolbox As ToolStripMenuItem Friend WithEvents mnuClimaticCheckDataStationMaps As ToolStripMenuItem Friend WithEvents ToolStripSeparator51 As ToolStripSeparator + Friend WithEvents mnuClimaticPrepareConversions As ToolStripMenuItem + Friend WithEvents mnuHelpAcknowledgments As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index bdcf6af59d5..51817a7a3df 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -119,61 +119,61 @@ - 201, 30 + 146, 22 Summarise... - 201, 30 + 146, 22 Graph... - 198, 6 + 143, 6 - 201, 30 + 146, 22 Frequencies... - 201, 30 + 146, 22 Rating Data... - 241, 30 + 172, 22 One Variable - 201, 30 + 146, 22 Summarise... - 201, 30 + 146, 22 Graph... - 198, 6 + 143, 6 - 201, 30 + 146, 22 Frequencies... - 241, 30 + 172, 22 Two Variables @@ -183,7 +183,7 @@ False - 196, 30 + 142, 22 Summarise... @@ -192,34 +192,34 @@ False - 196, 30 + 142, 22 Graph... - 193, 6 + 139, 6 - 196, 30 + 142, 22 Frequencies - 241, 30 + 172, 22 Three Variables - 294, 30 + 209, 22 Frequency Tables... - 294, 30 + 209, 22 Summary Tables... @@ -228,34 +228,34 @@ False - 294, 30 + 209, 22 Multiple Response... - 291, 6 + 206, 6 - 294, 30 + 209, 22 Scatter Plot... - 294, 30 + 209, 22 Line Plot... - 294, 30 + 209, 22 Histogram... - 294, 30 + 209, 22 Boxplot... @@ -264,31 +264,31 @@ False - 294, 30 + 209, 22 Dot Plot... - 294, 30 + 209, 22 Rug Plot... - 294, 30 + 209, 22 Bar Chart... - 294, 30 + 209, 22 Cumulative Distribution... - 294, 30 + 209, 22 Parallel Coordinate Plot... @@ -297,19 +297,19 @@ False - 294, 30 + 209, 22 Mosaic... - 241, 30 + 172, 22 Specific - 263, 30 + 188, 22 Column Summaries... @@ -318,70 +318,70 @@ False - 263, 30 + 188, 22 Tabulation... - 263, 30 + 188, 22 Graphics... - 260, 6 + 185, 6 - 263, 30 + 188, 22 Use Summaries... - 241, 30 + 172, 22 General - 238, 6 + 169, 6 - 284, 30 + 203, 22 Correlations... - 284, 30 + 203, 22 Principal Components... - 284, 30 + 203, 22 Canonical Correlations... - 241, 30 + 172, 22 Multivariate - 238, 6 + 169, 6 - 241, 30 + 172, 22 Use Graph... - 241, 30 + 172, 22 Combine Graphs... @@ -390,25 +390,25 @@ False - 241, 30 + 172, 22 Themes... - 241, 30 + 172, 22 View Graph... - 92, 29 + 64, 20 Describe - 348, 30 + 242, 22 Show Model... @@ -417,52 +417,52 @@ False - 348, 30 + 242, 22 Compare Models... - 348, 30 + 242, 22 Random Samples (Use Model)... - 287, 30 + 201, 22 Probability Distributions - 284, 6 + 198, 6 - 245, 30 + 174, 22 Fit Model... - 245, 30 + 174, 22 Compare Models... - 245, 30 + 174, 22 Use Model... - 287, 30 + 201, 22 One Variable - 224, 30 + 160, 22 Fit Model... @@ -471,25 +471,25 @@ False - 224, 30 + 160, 22 Choose Model... - 224, 30 + 160, 22 Use Model... - 287, 30 + 201, 22 Two Variables - 224, 30 + 160, 22 Fit Model... @@ -498,7 +498,7 @@ False - 224, 30 + 160, 22 Choose Model... @@ -507,19 +507,19 @@ False - 224, 30 + 160, 22 Use Model... - 287, 30 + 201, 22 Three Variables - 224, 30 + 160, 22 Fit Model... @@ -528,7 +528,7 @@ False - 224, 30 + 160, 22 Choose Model... @@ -537,19 +537,19 @@ False - 224, 30 + 160, 22 Use Model... - 287, 30 + 201, 22 Four Variables - 224, 30 + 160, 22 Fit Model... @@ -558,7 +558,7 @@ False - 224, 30 + 160, 22 Choose Model... @@ -567,28 +567,28 @@ False - 224, 30 + 160, 22 Use Model... - 287, 30 + 201, 22 General - 284, 6 + 198, 6 - 287, 30 + 201, 22 Hypothesis Tests... - 234, 30 + 166, 22 Exact Results... @@ -597,7 +597,7 @@ False - 234, 30 + 166, 22 Summary Data... @@ -606,7 +606,7 @@ False - 234, 30 + 166, 22 Non Parametric... @@ -615,7 +615,7 @@ False - 234, 30 + 166, 22 Goodness of Fit... @@ -624,7 +624,7 @@ False - 287, 30 + 201, 22 Other (One Variable) @@ -633,7 +633,7 @@ False - 381, 30 + 266, 22 Two Samples... @@ -642,19 +642,19 @@ False - 381, 30 + 266, 22 Summary Data... - 381, 30 + 266, 22 Simple Regression... - 381, 30 + 266, 22 One Way ANOVA... @@ -663,13 +663,13 @@ False - 381, 30 + 266, 22 Non Parametric Two Samples... - 381, 30 + 266, 22 Non Parameteric One Way ANOVA... @@ -678,7 +678,7 @@ False - 287, 30 + 201, 22 Other (Two Variables) @@ -687,19 +687,19 @@ False - 371, 30 + 260, 22 Simple With Groups... - 371, 30 + 260, 22 Non Parametric Two Way ANOVA... - 371, 30 + 260, 22 Chi-square Test... @@ -708,7 +708,7 @@ False - 287, 30 + 201, 22 Other (Three Variable) @@ -717,7 +717,7 @@ False - 233, 30 + 166, 22 ANOVA General... @@ -726,7 +726,7 @@ False - 233, 30 + 166, 22 Regression... @@ -735,7 +735,7 @@ False - 233, 30 + 166, 22 Log Linear... @@ -744,13 +744,13 @@ False - 287, 30 + 201, 22 Other (General) - 75, 29 + 53, 20 Model @@ -759,7 +759,7 @@ False - 307, 30 + 212, 22 Examine... @@ -771,7 +771,7 @@ False - 307, 30 + 212, 22 Process... @@ -783,7 +783,7 @@ False - 171, 30 + 127, 22 Site... @@ -792,13 +792,13 @@ False - 171, 30 + 127, 22 Penman... - 307, 30 + 212, 22 Evaporation @@ -810,7 +810,7 @@ False - 298, 30 + 209, 22 Crop Coefficients... @@ -819,13 +819,13 @@ False - 298, 30 + 209, 22 Water Satisfaction Index... - 307, 30 + 212, 22 Crop @@ -837,7 +837,7 @@ False - 307, 30 + 212, 22 Heat Sum... @@ -846,139 +846,139 @@ False - 301, 30 + 210, 22 Data View - 301, 30 + 210, 22 Output Window - 301, 30 + 210, 22 Log Window - 301, 30 + 210, 22 Script Window - 301, 30 + 210, 22 Column Metadata - 301, 30 + 210, 22 Data Frame Metadata - 298, 6 + 207, 6 - 301, 30 + 210, 22 Climatic Menu - 301, 30 + 210, 22 Procurement Menu - 301, 30 + 210, 22 Options by Context Menu - 298, 6 + 207, 6 - 301, 30 + 210, 22 Reset to Default Layout - 61, 29 + 44, 20 View - 316, 30 + 221, 22 Introduction - 316, 30 + 221, 22 History and FAQ - 316, 30 + 221, 22 Spreadsheet - 316, 30 + 221, 22 Getting Started - 313, 6 + 218, 6 - 316, 30 + 221, 22 Menus and Dialogs - 316, 30 + 221, 22 About R - 316, 30 + 221, 22 R Packages and Commands - 316, 30 + 221, 22 Datasets - 313, 6 + 218, 6 - 234, 30 + 166, 22 Case Study Guide - 234, 30 + 166, 22 Glossary @@ -987,13 +987,13 @@ False - 234, 30 + 166, 22 More... - 316, 30 + 221, 22 Guides @@ -1002,19 +1002,25 @@ False - 316, 30 + 221, 22 About R-Instat - 316, 30 + 221, 22 Licence... + + 221, 22 + + + Acknowlegments + - 61, 29 + 44, 20 Help @@ -1023,37 +1029,37 @@ 538, 56 - 304, 6 + 209, 6 638, 56 - 310, 30 + 215, 22 Open SST... - 310, 30 + 215, 22 Import Gridded Data (IRI)... - 310, 30 + 215, 22 Open NetCDF... - 310, 30 + 215, 22 Import Shape Files... - 310, 30 + 215, 22 ClimSoft... @@ -1062,88 +1068,88 @@ False - 310, 30 + 215, 22 CliData... - 307, 6 + 212, 6 - 310, 30 + 215, 22 Export to CPT... - 307, 30 + 212, 22 File - 304, 6 + 209, 6 - 301, 30 + 211, 22 Tidy Daily Data... - 301, 30 + 211, 22 Non-numeric Cases... - 301, 30 + 211, 22 Replace Values... - 301, 30 + 211, 22 Merge... - 298, 6 + 208, 6 - 301, 30 + 211, 22 One Variable Summarise... - 307, 30 + 212, 22 Tidy and Examine - 257, 30 + 182, 22 Generate Dates... - 257, 30 + 182, 22 Make Date... - 257, 30 + 182, 22 Infill Missing Dates... - 257, 30 + 182, 22 Use Date... @@ -1152,7 +1158,7 @@ False - 257, 30 + 182, 22 Make Time... @@ -1161,124 +1167,130 @@ False - 257, 30 + 182, 22 Use Time... - 307, 30 + 212, 22 Dates - 307, 30 + 212, 22 Define Climatic Data... - 244, 30 + 175, 22 Station Maps... - 241, 6 + 172, 6 - 244, 30 + 175, 22 Inventory... - 244, 30 + 175, 22 Display Daily... - 244, 30 + 175, 22 Boxplot... - 244, 30 + 175, 22 QC Rainfall... - 244, 30 + 175, 22 QC Temperatures... - 307, 30 + 212, 22 Check Data - 263, 30 + 189, 22 Transform... + + 189, 22 + + + Conversions... + - 263, 30 + 189, 22 Compare... - 260, 6 + 186, 6 - 263, 30 + 189, 22 Climatic Summaries... - 263, 30 + 189, 22 Start of the Rains... - 263, 30 + 189, 22 End of Rains... - 263, 30 + 189, 22 Length of Season... - 263, 30 + 189, 22 Spells... - 263, 30 + 189, 22 Extremes... - 260, 6 + 186, 6 - 263, 30 + 189, 22 Evapotranspiration... @@ -1287,7 +1299,7 @@ False - 263, 30 + 189, 22 Summary... @@ -1299,7 +1311,7 @@ False - 263, 30 + 189, 22 New Worksheet... @@ -1311,7 +1323,7 @@ False - 263, 30 + 189, 22 Import daily Data... @@ -1323,7 +1335,7 @@ False - 263, 30 + 189, 22 Make Factor... @@ -1335,7 +1347,7 @@ False - 263, 30 + 189, 22 Shift Daily Data... @@ -1347,7 +1359,7 @@ False - 263, 30 + 189, 22 Unstack Daily Data... @@ -1359,7 +1371,7 @@ False - 263, 30 + 189, 22 Stack Daily data... @@ -1368,25 +1380,25 @@ False - 307, 30 + 212, 22 Prepare - 307, 30 + 212, 22 Climdex... - 304, 6 + 209, 6 False - 283, 30 + 199, 22 Rainfall... @@ -1395,19 +1407,19 @@ False - 283, 30 + 199, 22 Temperature... - 193, 30 + 139, 22 Wind Rose... - 283, 30 + 199, 22 Wind Speed/Direction... @@ -1416,40 +1428,40 @@ False - 283, 30 + 199, 22 Sunshine/Radiation... - 280, 6 + 196, 6 False - 283, 30 + 199, 22 General - 280, 6 + 196, 6 - 307, 30 + 212, 22 Describe - 307, 30 + 212, 22 SPI... - 218, 30 + 157, 22 Rainfall Graph... @@ -1458,43 +1470,43 @@ False - 218, 30 + 157, 22 Temperature... - 218, 30 + 157, 22 Crops... - 307, 30 + 212, 22 PICSA - 333, 30 + 230, 22 Plot Region... - 333, 30 + 230, 22 Export to CM SAF R Toolbox... - 307, 30 + 212, 22 CM SAF - 253, 30 + 180, 22 Extremes... @@ -1503,67 +1515,67 @@ False - 253, 30 + 180, 22 Circular... - 253, 30 + 180, 22 Markov Modelling... - 307, 30 + 212, 22 Model - 304, 6 + 209, 6 - 354, 30 + 250, 22 Open SST... - 354, 30 + 250, 22 Export to CPT... - 351, 6 + 247, 6 - 354, 30 + 250, 22 Correlations... - 354, 30 + 250, 22 Principal Components... - 354, 30 + 250, 22 Canonical Correlations... - 354, 30 + 250, 22 Cumulative/Exceedance Graphs... - 307, 30 + 212, 22 Seasonal Forecast Support @@ -1572,7 +1584,7 @@ False - 324, 30 + 227, 22 Start of Rain... @@ -1581,7 +1593,7 @@ False - 324, 30 + 227, 22 End of Rain... @@ -1590,7 +1602,7 @@ False - 324, 30 + 227, 22 Change Format Day Month... @@ -1599,7 +1611,7 @@ False - 324, 30 + 227, 22 Export CPT to Tabular... @@ -1608,7 +1620,7 @@ False - 324, 30 + 227, 22 Day Month... @@ -1617,7 +1629,7 @@ False - 324, 30 + 227, 22 Display Daily... @@ -1626,7 +1638,7 @@ False - 324, 30 + 227, 22 Display DOY of Year... @@ -1635,7 +1647,7 @@ False - 324, 30 + 227, 22 Display Rain Running Total... @@ -1644,7 +1656,7 @@ False - 324, 30 + 227, 22 Display Spell Length... @@ -1653,7 +1665,7 @@ False - 324, 30 + 227, 22 Export for PICSA... @@ -1662,7 +1674,7 @@ False - 324, 30 + 227, 22 Extreme Events... @@ -1671,7 +1683,7 @@ False - 324, 30 + 227, 22 Missing Data... @@ -1680,7 +1692,7 @@ False - 324, 30 + 227, 22 Missing Data Table... @@ -1689,7 +1701,7 @@ False - 324, 30 + 227, 22 Monthly Summaries... @@ -1698,13 +1710,13 @@ False - 324, 30 + 227, 22 Output for CDT... - 279, 30 + 199, 22 Data Manipulation @@ -1713,7 +1725,7 @@ False - 307, 30 + 219, 22 Cliboxplot... @@ -1722,7 +1734,7 @@ False - 307, 30 + 219, 22 Cliplot... @@ -1731,7 +1743,7 @@ False - 307, 30 + 219, 22 Missing Values... @@ -1740,7 +1752,7 @@ False - 307, 30 + 219, 22 Histogram... @@ -1749,7 +1761,7 @@ False - 307, 30 + 219, 22 Cummulative Exceedance... @@ -1758,7 +1770,7 @@ False - 307, 30 + 219, 22 Boxplot... @@ -1767,7 +1779,7 @@ False - 307, 30 + 219, 22 Inventory... @@ -1776,7 +1788,7 @@ False - 307, 30 + 219, 22 Annual Rainfall... @@ -1785,7 +1797,7 @@ False - 307, 30 + 219, 22 Rain Count... @@ -1794,7 +1806,7 @@ False - 307, 30 + 219, 22 Timeseries... @@ -1803,7 +1815,7 @@ False - 307, 30 + 219, 22 Windrose... @@ -1812,7 +1824,7 @@ False - 307, 30 + 219, 22 Multple Lines... @@ -1821,13 +1833,13 @@ False - 307, 30 + 219, 22 Three Summaries... - 279, 30 + 199, 22 Graphics @@ -1836,7 +1848,7 @@ False - 279, 30 + 199, 22 Model... @@ -1845,7 +1857,7 @@ False - 298, 30 + 209, 22 Output for CPT... @@ -1854,7 +1866,7 @@ False - 298, 30 + 209, 22 Rains Statistics... @@ -1863,7 +1875,7 @@ False - 298, 30 + 209, 22 Seasonal Summary... @@ -1872,7 +1884,7 @@ False - 298, 30 + 209, 22 Seasonal Summary Rain... @@ -1881,13 +1893,13 @@ False - 298, 30 + 209, 22 Water Balance... - 279, 30 + 199, 22 Additional @@ -1896,13 +1908,13 @@ False - 279, 30 + 199, 22 Create Climate Object... - 307, 30 + 212, 22 Climate Methods @@ -1911,7 +1923,7 @@ False - 86, 29 + 63, 20 Climatic @@ -1921,37 +1933,37 @@ Ctrl+S - 303, 30 + 213, 22 Save... - 303, 30 + 211, 22 Save Data As... - 303, 30 + 211, 22 Save Output Window As... - 303, 30 + 211, 22 Save Log As... - 303, 30 + 211, 22 Save Script Window As... - 303, 30 + 213, 22 Save As @@ -1963,7 +1975,7 @@ Ctrl+P - 303, 30 + 213, 22 Print... @@ -1972,16 +1984,16 @@ False - 303, 30 + 213, 22 Print Preview... - 300, 6 + 210, 6 - 303, 30 + 213, 22 Exit @@ -1993,7 +2005,7 @@ Ctrl+F - 259, 30 + 183, 22 Find @@ -2002,7 +2014,7 @@ False - 259, 30 + 183, 22 Find Next @@ -2011,7 +2023,7 @@ False - 259, 30 + 183, 22 Replace @@ -2023,7 +2035,7 @@ Ctrl+X - 259, 30 + 183, 22 Cut @@ -2032,7 +2044,7 @@ Ctrl+C - 259, 30 + 183, 22 Copy @@ -2044,7 +2056,7 @@ Ctrl+Y - 259, 30 + 183, 22 Copy Special @@ -2056,7 +2068,7 @@ Ctrl+V - 259, 30 + 183, 22 Paste @@ -2065,13 +2077,13 @@ Ctrl+A - 259, 30 + 183, 22 Select All - 54, 29 + 39, 20 Edit @@ -2083,19 +2095,16 @@ 946, 56 - 182, 25 + 119, 17 No worksheet loaded - 0, 712 - - - 2, 0, 21, 0 + 0, 460 - 1251, 30 + 834, 22 8 @@ -2122,7 +2131,7 @@ Magenta - 51, 34 + 46, 34 &Open @@ -2182,13 +2191,13 @@ Edit Last Dialog - 69, 6 + 57, 6 False - 69, 6 + 57, 6 False @@ -2197,7 +2206,7 @@ Magenta - 48, 34 + 43, 34 Last 10 Dialogs @@ -2272,16 +2281,13 @@ He&lp - 0, 35 - - - 0, 0, 2, 0 + 0, 24 No - 1251, 37 + 834, 37 7 @@ -2311,7 +2317,7 @@ Ctrl+N - 303, 30 + 213, 22 New Data Frame... @@ -2320,22 +2326,22 @@ Ctrl+O - 303, 30 + 213, 22 Open From File... - 303, 30 + 213, 22 Open From Library... - 300, 6 + 210, 6 - 303, 30 + 213, 22 Import from ODK... @@ -2344,7 +2350,7 @@ False - 303, 30 + 213, 22 Import from CSPRO... @@ -2353,154 +2359,154 @@ False - 303, 30 + 213, 22 Import from Databases... - 303, 30 + 213, 22 Open NetCDF... - 300, 6 + 210, 6 False - 303, 30 + 213, 22 Convert... - 300, 6 + 210, 6 - 292, 30 + 203, 22 Export Dataset... - 292, 30 + 203, 22 Export R Objects... - 292, 30 + 203, 22 Export R Workspace... - 292, 30 + 203, 22 Export Graph As Image... - 303, 30 + 213, 22 Export - 303, 30 + 213, 22 Close Data File - 300, 6 + 210, 6 - 50, 29 + 37, 20 File - 282, 30 + 200, 22 View Data... - 282, 30 + 200, 22 Rename Column... - 282, 30 + 200, 22 Row Numbers/Names... - 279, 6 + 197, 6 - 282, 30 + 200, 22 Sort... - 282, 30 + 200, 22 Filter... - 282, 30 + 200, 22 Replace Values... - 279, 6 + 197, 6 - 282, 30 + 200, 22 Convert Columns... - 282, 30 + 200, 22 Column Metadata... - 282, 30 + 200, 22 Column Structure... - 279, 6 + 197, 6 - 282, 30 + 200, 22 Reorder Columns... - 282, 30 + 200, 22 Insert Columns/Rows... - 282, 30 + 200, 22 Delete Columns/Rows... @@ -2509,13 +2515,13 @@ False - 282, 30 + 200, 22 Protect Column... - 282, 30 + 200, 22 Hide/Show Columns... @@ -2524,91 +2530,91 @@ False - 282, 30 + 200, 22 Freeze Columns... - 282, 30 + 200, 22 Colour by Property... - 237, 30 + 172, 22 Data Frame - 352, 30 + 245, 22 Duplicates... - 352, 30 + 245, 22 Compare Columns... - 352, 30 + 245, 22 Non-numeric Cases... - 349, 6 + 242, 6 - 352, 30 + 245, 22 Boxplot... - 352, 30 + 245, 22 One Variable Summarise... - 352, 30 + 245, 22 One Variable Graph... - 352, 30 + 245, 22 One Variable Frequencies... - 349, 6 + 242, 6 - 352, 30 + 245, 22 Export To OpenRefine... - 352, 30 + 245, 22 Import From OpenRefine... - 349, 6 + 242, 6 False - 352, 30 + 245, 22 Jitter... @@ -2617,49 +2623,49 @@ False - 352, 30 + 245, 22 Prepare to Share (sdc package)... - 352, 30 + 245, 22 Anonymise ID Column... - 237, 30 + 172, 22 Check Data - 234, 6 + 169, 6 - 263, 30 + 188, 22 Calculations... - 263, 30 + 188, 22 Column Summaries... - 263, 30 + 188, 22 General Summaries... - 260, 6 + 185, 6 - 263, 30 + 188, 22 Duplicate Column... @@ -2668,181 +2674,181 @@ False - 263, 30 + 188, 22 Transform... - 263, 30 + 188, 22 Rank... - 263, 30 + 188, 22 Polynomials... - 263, 30 + 188, 22 Row Summary... - 237, 30 + 172, 22 Column: Calculate - 248, 30 + 179, 22 Regular Sequence... - 248, 30 + 179, 22 Count in Factor... - 245, 6 + 176, 6 - 248, 30 + 179, 22 Enter... - 248, 30 + 179, 22 Random Samples... - 248, 30 + 179, 22 Permute Columns... - 237, 30 + 172, 22 Column: Generate - 252, 30 + 179, 22 Convert To Factor... - 252, 30 + 179, 22 Recode Numeric... - 249, 6 + 176, 6 - 252, 30 + 179, 22 Recode Factor... - 252, 30 + 179, 22 Combine Factors... - 252, 30 + 179, 22 Dummy Variables... - 249, 6 + 176, 6 - 252, 30 + 179, 22 Levels/Labels... - 252, 30 + 179, 22 View Labels... - 252, 30 + 179, 22 Reorder Levels... - 252, 30 + 179, 22 Reference Level... - 252, 30 + 179, 22 Unused Levels... - 252, 30 + 179, 22 Contrasts... - 249, 6 + 176, 6 - 252, 30 + 179, 22 Factor Data Frame... - 237, 30 + 172, 22 Column: Factor - 209, 30 + 152, 22 Find/Replace... - 209, 30 + 152, 22 Transform... - 209, 30 + 152, 22 Split... - 209, 30 + 152, 22 Combine... @@ -2851,43 +2857,43 @@ False - 209, 30 + 152, 22 Match... - 209, 30 + 152, 22 Distance... - 237, 30 + 172, 22 Column: Text - 257, 30 + 182, 22 Generate Dates... - 257, 30 + 182, 22 Make Date... - 257, 30 + 182, 22 Infill Missing Dates... - 257, 30 + 182, 22 Use Date... @@ -2896,7 +2902,7 @@ False - 257, 30 + 182, 22 Make Time... @@ -2905,118 +2911,118 @@ False - 257, 30 + 182, 22 Use Time... - 237, 30 + 172, 22 Column: Date - 276, 30 + 193, 22 Column Summaries... - 276, 30 + 193, 22 General Summaries... - 273, 6 + 190, 6 - 276, 30 + 193, 22 Stack... - 276, 30 + 193, 22 Unstack... - 276, 30 + 193, 22 Merge... - 273, 6 + 190, 6 - 276, 30 + 193, 22 Append Data Frames... - 276, 30 + 193, 22 Subset... - 276, 30 + 193, 22 Random Subset... - 276, 30 + 193, 22 Transpose... - 237, 30 + 172, 22 Column: Reshape - 234, 6 + 169, 6 - 293, 30 + 207, 22 Add Key... - 293, 30 + 207, 22 View and Remove Keys... - 293, 30 + 207, 22 Add Link... - 293, 30 + 207, 22 View and Remove Links... - 293, 30 + 207, 22 Add Comment... - 237, 30 + 172, 22 Keys and Links @@ -3025,13 +3031,13 @@ False - 279, 30 + 196, 22 Data Frame Metadata... - 279, 30 + 196, 22 Rename Data Frame... @@ -3040,34 +3046,34 @@ False - 279, 30 + 196, 22 Reorder Data Frames... - 279, 30 + 196, 22 Copy Data Frame... - 279, 30 + 196, 22 Delete Data Frames... - 276, 6 + 193, 6 - 279, 30 + 196, 22 Hide Dataframes... - 279, 30 + 196, 22 Metadata... @@ -3076,7 +3082,7 @@ False - 279, 30 + 196, 22 Rename Metadata... @@ -3085,7 +3091,7 @@ False - 279, 30 + 196, 22 Reorder Metadata... @@ -3094,301 +3100,301 @@ False - 279, 30 + 196, 22 Delete Metadata... - 237, 30 + 172, 22 Data Object - 171, 30 + 126, 22 View... - 171, 30 + 126, 22 Rename... - 171, 30 + 126, 22 Reorder... - 171, 30 + 126, 22 Delete... - 237, 30 + 172, 22 R Objects - 84, 29 + 59, 20 Prepare - 307, 30 + 216, 22 Define Procurement Data... - 521, 30 + 358, 22 Filter by Country (or other)... - 518, 6 + 355, 6 - 521, 30 + 358, 22 Define Contract Value Categories... - 521, 30 + 358, 22 Recode Numeric into Quantiles... - 521, 30 + 358, 22 Set Factor Reference Level... - 521, 30 + 358, 22 Use Award Date (or other)... - 518, 6 + 355, 6 - 521, 30 + 358, 22 Summarise Red Flags by Country (or other)... - 521, 30 + 358, 22 Summarise Red Flags by Country and Year (or other)... - 521, 30 + 358, 22 Merge Additional Data... - 307, 30 + 216, 22 Prepare - 464, 30 + 320, 22 One Variable Summarise... - 464, 30 + 320, 22 One Variable Graph... - 464, 30 + 320, 22 One Variable Frequencies... - 461, 6 + 317, 6 - 464, 30 + 320, 22 Two Variable Frequencies by Sector (or other)... - 464, 30 + 320, 22 Correlations (Red Flags or others)... - 307, 30 + 216, 22 Describe - 267, 30 + 189, 22 Map Country Values... - 307, 30 + 216, 22 Mapping - 424, 30 + 292, 22 Define Corruption Risk Output Variables... - 424, 30 + 292, 22 Fit Model... - 307, 30 + 216, 22 Model - 304, 6 + 213, 6 - 307, 30 + 216, 22 Define Red Flag Variables... - 400, 30 + 278, 22 Calculate Corruption Risk Index (CRI)... - 400, 30 + 278, 22 Summarise CRI by Country (or other)... - 307, 30 + 216, 22 Corruption Risk Index - 125, 29 + 88, 20 Procurement - 306, 30 + 215, 22 Duplicates... - 306, 30 + 215, 22 Compare Columns... - 303, 6 + 212, 6 - 306, 30 + 215, 22 One Variable Summarise... - 306, 30 + 215, 22 One Variable Graph... - 306, 30 + 215, 22 One Variable Frequencies... - 361, 30 + 249, 22 Check Data - 361, 30 + 249, 22 Define Options by Context Data... - 404, 30 + 282, 22 Calculate DIfference Between Options... - 401, 6 + 279, 6 - 404, 30 + 282, 22 Merge Additional Data... - 404, 30 + 282, 22 Stack... - 404, 30 + 282, 22 Unstack... - 361, 30 + 249, 22 Prepare - 319, 30 + 224, 22 Compare Two Options... @@ -3397,43 +3403,43 @@ False - 319, 30 + 224, 22 Compare Multiple Options... - 319, 30 + 224, 22 Boxplot... - 361, 30 + 249, 22 Describe - 247, 30 + 176, 22 Fit Model... - 247, 30 + 176, 22 General Fit Model... - 361, 30 + 249, 22 Model - 179, 29 + 121, 20 Options by Context @@ -3442,7 +3448,7 @@ False - 280, 30 + 198, 22 Run R Code... @@ -3451,7 +3457,7 @@ False - 280, 30 + 198, 22 Restart R @@ -3460,25 +3466,25 @@ False - 280, 30 + 198, 22 Check for Updates... - 280, 30 + 198, 22 Clear Output Window... - 277, 6 + 195, 6 False - 280, 30 + 198, 22 Save Current Options... @@ -3487,19 +3493,19 @@ False - 280, 30 + 198, 22 Load Options... - 280, 30 + 198, 22 Options... - 65, 29 + 47, 20 Tools @@ -3507,11 +3513,8 @@ 0, 0 - - 9, 3, 0, 3 - - 1251, 35 + 834, 24 6 @@ -3541,10 +3544,7 @@ Fill - 0, 72 - - - 4, 5, 4, 5 + 0, 61 Horizontal @@ -3555,18 +3555,12 @@ 0, 0 - - 4, 5, 4, 5 - Fill 0, 0 - - 4, 5, 4, 5 - Fill @@ -3574,10 +3568,10 @@ 0, 0 - 6, 8, 6, 8 + 4, 5, 4, 5 - 111, 280 + 74, 174 0 @@ -3613,10 +3607,10 @@ 0, 0 - 6, 8, 6, 8 + 4, 5, 4, 5 - 265, 280 + 177, 174 0 @@ -3646,13 +3640,13 @@ 1 - 384, 280 + 256, 174 - 111 + 74 - 8 + 5 0 @@ -3687,9 +3681,6 @@ 0, 0 - - 4, 5, 4, 5 - Fill @@ -3697,10 +3688,10 @@ 0, 0 - 6, 8, 6, 8 + 4, 5, 4, 5 - 268, 280 + 178, 174 0 @@ -3736,10 +3727,10 @@ 0, 0 - 6, 8, 6, 8 + 4, 5, 4, 5 - 583, 280 + 390, 174 0 @@ -3769,13 +3760,13 @@ 1 - 859, 280 + 573, 174 - 268 + 178 - 8 + 5 0 @@ -3805,13 +3796,13 @@ 1 - 1251, 280 + 834, 174 - 384 + 256 - 8 + 5 0 @@ -3846,9 +3837,6 @@ 0, 0 - - 4, 5, 4, 5 - Fill @@ -3856,10 +3844,10 @@ 0, 0 - 6, 8, 6, 8 + 4, 5, 4, 5 - 576, 352 + 384, 220 0 @@ -3895,10 +3883,10 @@ 0, 0 - 6, 8, 6, 8 + 4, 5, 4, 5 - 667, 352 + 445, 220 0 @@ -3928,13 +3916,13 @@ 1 - 1251, 352 + 834, 220 - 576 + 384 - 8 + 5 0 @@ -3964,13 +3952,13 @@ 1 - 1251, 640 + 834, 399 - 280 + 174 - 8 + 5 10 @@ -3994,10 +3982,10 @@ 29 - 9, 20 + 6, 13 - 1251, 742 + 834, 482 @@ -5727,12 +5715,6 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - - NoControl - - - 4, 5, 4, 5 - R-Instat @@ -6780,6 +6762,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuClimaticPrepareConversions + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + mnuClimaticPrepareCompare @@ -8766,6 +8754,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuHelpAcknowledgments + + + 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 5afb995d185..f3b10f7cbf1 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2023,4 +2023,16 @@ Public Class frmMain Private Sub mnuClimaticCheckDataStationMaps_Click(sender As Object, e As EventArgs) Handles mnuClimaticCheckDataStationMaps.Click dlgClimaticStationMaps.ShowDialog() End Sub + + Private Sub mnuClimaticPrepareConversions_Click(sender As Object, e As EventArgs) Handles mnuClimaticPrepareConversions.Click + dlgConversions.ShowDialog() + End Sub + + Private Sub mnuOptionsByContextGeneralFitModel_Click(sender As Object, e As EventArgs) Handles mnuOptionsByContextGeneralFitModel.Click + dlgFitModel.ShowDialog() + End Sub + + Private Sub mnuHelpAcknowledgments_Click(sender As Object, e As EventArgs) Handles mnuHelpAcknowledgments.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "151") + End Sub End Class \ No newline at end of file diff --git a/instat/static/Help/R-Instat.chm b/instat/static/Help/R-Instat.chm index 10e1c148790..90e394e1533 100644 Binary files a/instat/static/Help/R-Instat.chm and b/instat/static/Help/R-Instat.chm differ