diff --git a/instat/frmConvertToNumeric.vb b/instat/frmConvertToNumeric.vb
index 1e96b686967..d4a6082d7c0 100644
--- a/instat/frmConvertToNumeric.vb
+++ b/instat/frmConvertToNumeric.vb
@@ -68,9 +68,7 @@ Public Class frmConvertToNumeric
End Sub
Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click
- Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TableOfContents)
- 'Replace with specific page once written
- 'Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, iHelpTopicID.ToString())
+ Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "614")
End Sub
Private Sub cmdInspectValues_Click(sender As Object, e As EventArgs) Handles cmdInspectValues.Click
diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb
index 39d67feea25..9bca27aa0ba 100644
--- a/instat/ucrCalculator.Designer.vb
+++ b/instat/ucrCalculator.Designer.vb
@@ -62,6 +62,7 @@ Partial Class ucrCalculator
Me.cmd0 = New System.Windows.Forms.Button()
Me.cmd1 = New System.Windows.Forms.Button()
Me.grpDates = New System.Windows.Forms.GroupBox()
+ Me.cmdRHelp = New instat.ucrSplitButton()
Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -118,6 +119,7 @@ Partial Class ucrCalculator
Me.cmdGCD = New System.Windows.Forms.Button()
Me.cmdGeneratePrimes = New System.Windows.Forms.Button()
Me.cmdNthPrime = New System.Windows.Forms.Button()
+ Me.cmdIntegerRHelp = New instat.ucrSplitButton()
Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -140,6 +142,7 @@ Partial Class ucrCalculator
Me.cmdIsPrime = New System.Windows.Forms.Button()
Me.cmdBigZ = New System.Windows.Forms.Button()
Me.grpFactor = New System.Windows.Forms.GroupBox()
+ Me.cmdTransformHelp = New instat.ucrSplitButton()
Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.cmdShuffle = New System.Windows.Forms.Button()
@@ -163,6 +166,7 @@ Partial Class ucrCalculator
Me.cmdFactor = New System.Windows.Forms.Button()
Me.cmdAnon = New System.Windows.Forms.Button()
Me.grpHydroGOF = New System.Windows.Forms.GroupBox()
+ Me.cmdHydroHelp = New instat.ucrSplitButton()
Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.cmdVE = New System.Windows.Forms.Button()
@@ -243,6 +247,7 @@ Partial Class ucrCalculator
Me.cmdGroup = New System.Windows.Forms.Button()
Me.cmdGrade = New System.Windows.Forms.Button()
Me.grpMaths = New System.Windows.Forms.GroupBox()
+ Me.cmdMathsHelp = New instat.ucrSplitButton()
Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -276,6 +281,7 @@ Partial Class ucrCalculator
Me.cmdwhichmax = New System.Windows.Forms.Button()
Me.cmdwheremax = New System.Windows.Forms.Button()
Me.cmdwhichmin = New System.Windows.Forms.Button()
+ Me.cmdSummaryRHelp = New instat.ucrSplitButton()
Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -329,6 +335,7 @@ Partial Class ucrCalculator
Me.cmdVar = New System.Windows.Forms.Button()
Me.grpProbabilty = New System.Windows.Forms.GroupBox()
Me.cmdPascal = New System.Windows.Forms.Button()
+ Me.cmdProbRHelp = New instat.ucrSplitButton()
Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -377,6 +384,7 @@ Partial Class ucrCalculator
Me.cmdDecimals = New System.Windows.Forms.Button()
Me.cmdMASSFractions = New System.Windows.Forms.Button()
Me.cmdScale = New System.Windows.Forms.Button()
+ Me.cmdTransformRHelp = New instat.ucrSplitButton()
Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -411,6 +419,7 @@ Partial Class ucrCalculator
Me.cmdLead = New System.Windows.Forms.Button()
Me.cmdLag = New System.Windows.Forms.Button()
Me.grpLogical = New System.Windows.Forms.GroupBox()
+ Me.cmdLogicalHelp = New instat.ucrSplitButton()
Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -474,10 +483,11 @@ Partial Class ucrCalculator
Me.cmdSquishb = New System.Windows.Forms.Button()
Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components)
Me.grpCircular = New System.Windows.Forms.GroupBox()
+ Me.cmdCircularHelp = New instat.ucrSplitButton()
Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.cmdCircular = New System.Windows.Forms.Button()
- Me.cmdCircQuantile = New System.Windows.Forms.Button()
+ Me.cmdCircQuantiles = New System.Windows.Forms.Button()
Me.cmdCircMax = New System.Windows.Forms.Button()
Me.cmdA1 = New System.Windows.Forms.Button()
Me.cmdAngVar = New System.Windows.Forms.Button()
@@ -516,6 +526,7 @@ Partial Class ucrCalculator
Me.grpComplex = New System.Windows.Forms.GroupBox()
Me.cmdAsComplex = New System.Windows.Forms.Button()
Me.cmdComplexi = New System.Windows.Forms.Button()
+ Me.cmdComplexRHelp = New instat.ucrSplitButton()
Me.cmdComplexTanH = New System.Windows.Forms.Button()
Me.cmdComplexTan = New System.Windows.Forms.Button()
Me.cmdComplexPi = New System.Windows.Forms.Button()
@@ -606,17 +617,6 @@ Partial Class ucrCalculator
Me.ucrInputCalOptions = New instat.ucrInputComboBox()
Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove()
Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression()
- Me.cmdComplexRHelp = New instat.ucrSplitButton()
- Me.cmdSummaryRHelp = New instat.ucrSplitButton()
- Me.cmdTransformRHelp = New instat.ucrSplitButton()
- Me.cmdLogicalHelp = New instat.ucrSplitButton()
- Me.cmdRHelp = New instat.ucrSplitButton()
- Me.cmdHydroHelp = New instat.ucrSplitButton()
- Me.cmdTransformHelp = New instat.ucrSplitButton()
- Me.cmdCircularHelp = New instat.ucrSplitButton()
- Me.cmdMathsHelp = New instat.ucrSplitButton()
- Me.cmdProbRHelp = New instat.ucrSplitButton()
- Me.cmdIntegerRHelp = New instat.ucrSplitButton()
Me.grpBasic.SuspendLayout
Me.grpDates.SuspendLayout
Me.ContextMenuStripDate.SuspendLayout
@@ -953,6 +953,18 @@ Partial Class ucrCalculator
Me.grpDates.TabStop = False
Me.grpDates.Text = "Dates/Times"
'
+ 'cmdRHelp
+ '
+ Me.cmdRHelp.AutoSize = True
+ Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate
+ Me.cmdRHelp.Location = New System.Drawing.Point(186, 164)
+ Me.cmdRHelp.Name = "cmdRHelp"
+ Me.cmdRHelp.Size = New System.Drawing.Size(113, 38)
+ Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate
+ Me.cmdRHelp.TabIndex = 212
+ Me.cmdRHelp.Text = "R Help"
+ Me.cmdRHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripDate
'
Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -1550,6 +1562,18 @@ Partial Class ucrCalculator
Me.cmdNthPrime.Text = "nth_prime"
Me.cmdNthPrime.UseVisualStyleBackColor = True
'
+ 'cmdIntegerRHelp
+ '
+ Me.cmdIntegerRHelp.AutoSize = True
+ Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger
+ Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354)
+ Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp"
+ Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38)
+ Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger
+ Me.cmdIntegerRHelp.TabIndex = 16
+ Me.cmdIntegerRHelp.Text = "R Help"
+ Me.cmdIntegerRHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripInteger
'
Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -1755,6 +1779,18 @@ Partial Class ucrCalculator
Me.grpFactor.TabStop = False
Me.grpFactor.Text = "Factor"
'
+ 'cmdTransformHelp
+ '
+ Me.cmdTransformHelp.AutoSize = True
+ Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor
+ Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218)
+ Me.cmdTransformHelp.Name = "cmdTransformHelp"
+ Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38)
+ Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor
+ Me.cmdTransformHelp.TabIndex = 212
+ Me.cmdTransformHelp.Text = "R Help"
+ Me.cmdTransformHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripFactor
'
Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -2021,6 +2057,18 @@ Partial Class ucrCalculator
Me.grpHydroGOF.TabStop = False
Me.grpHydroGOF.Text = "hydroGOF "
'
+ 'cmdHydroHelp
+ '
+ Me.cmdHydroHelp.AutoSize = True
+ Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF
+ Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298)
+ Me.cmdHydroHelp.Name = "cmdHydroHelp"
+ Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38)
+ Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF
+ Me.cmdHydroHelp.TabIndex = 212
+ Me.cmdHydroHelp.Text = "R Help"
+ Me.cmdHydroHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripHydroGOF
'
Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -2969,6 +3017,18 @@ Partial Class ucrCalculator
Me.grpMaths.TabStop = False
Me.grpMaths.Text = "Maths"
'
+ 'cmdMathsHelp
+ '
+ Me.cmdMathsHelp.AutoSize = True
+ Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths
+ Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165)
+ Me.cmdMathsHelp.Name = "cmdMathsHelp"
+ Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38)
+ Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths
+ Me.cmdMathsHelp.TabIndex = 211
+ Me.cmdMathsHelp.Text = "R Help"
+ Me.cmdMathsHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripMaths
'
Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -3347,6 +3407,18 @@ Partial Class ucrCalculator
Me.cmdwhichmin.Text = "which.min"
Me.cmdwhichmin.UseVisualStyleBackColor = True
'
+ 'cmdSummaryRHelp
+ '
+ Me.cmdSummaryRHelp.AutoSize = True
+ Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary
+ Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238)
+ Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp"
+ Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38)
+ Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary
+ Me.cmdSummaryRHelp.TabIndex = 185
+ Me.cmdSummaryRHelp.Text = "R Help"
+ Me.cmdSummaryRHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripSummary
'
Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -3969,6 +4041,18 @@ Partial Class ucrCalculator
Me.cmdPascal.Text = "pascal"
Me.cmdPascal.UseVisualStyleBackColor = True
'
+ 'cmdProbRHelp
+ '
+ Me.cmdProbRHelp.AutoSize = True
+ Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability
+ Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239)
+ Me.cmdProbRHelp.Name = "cmdProbRHelp"
+ Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38)
+ Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability
+ Me.cmdProbRHelp.TabIndex = 212
+ Me.cmdProbRHelp.Text = "R Help"
+ Me.cmdProbRHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripProbability
'
Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -4559,6 +4643,18 @@ Partial Class ucrCalculator
Me.cmdScale.Text = "scale"
Me.cmdScale.UseVisualStyleBackColor = True
'
+ 'cmdTransformRHelp
+ '
+ Me.cmdTransformRHelp.AutoSize = True
+ Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform
+ Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245)
+ Me.cmdTransformRHelp.Name = "cmdTransformRHelp"
+ Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38)
+ Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform
+ Me.cmdTransformRHelp.TabIndex = 204
+ Me.cmdTransformRHelp.Text = "R Help"
+ Me.cmdTransformRHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripTransform
'
Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -4914,6 +5010,18 @@ Partial Class ucrCalculator
Me.grpLogical.TabStop = False
Me.grpLogical.Text = "Logical and Symbols"
'
+ 'cmdLogicalHelp
+ '
+ Me.cmdLogicalHelp.AutoSize = True
+ Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical
+ Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234)
+ Me.cmdLogicalHelp.Name = "cmdLogicalHelp"
+ Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38)
+ Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical
+ Me.cmdLogicalHelp.TabIndex = 212
+ Me.cmdLogicalHelp.Text = "R Help"
+ Me.cmdLogicalHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripLogical
'
Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -5637,7 +5745,7 @@ Partial Class ucrCalculator
'
Me.grpCircular.Controls.Add(Me.cmdCircularHelp)
Me.grpCircular.Controls.Add(Me.cmdCircular)
- Me.grpCircular.Controls.Add(Me.cmdCircQuantile)
+ Me.grpCircular.Controls.Add(Me.cmdCircQuantiles)
Me.grpCircular.Controls.Add(Me.cmdCircMax)
Me.grpCircular.Controls.Add(Me.cmdA1)
Me.grpCircular.Controls.Add(Me.cmdAngVar)
@@ -5661,6 +5769,18 @@ Partial Class ucrCalculator
Me.grpCircular.TabStop = False
Me.grpCircular.Text = "Circular"
'
+ 'cmdCircularHelp
+ '
+ Me.cmdCircularHelp.AutoSize = True
+ Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular
+ Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178)
+ Me.cmdCircularHelp.Name = "cmdCircularHelp"
+ Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38)
+ Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular
+ Me.cmdCircularHelp.TabIndex = 212
+ Me.cmdCircularHelp.Text = "R Help"
+ Me.cmdCircularHelp.UseVisualStyleBackColor = True
+ '
'ContextMenuStripCircular
'
Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -5685,16 +5805,16 @@ Partial Class ucrCalculator
Me.cmdCircular.Text = "circular"
Me.cmdCircular.UseVisualStyleBackColor = True
'
- 'cmdCircQuantile
+ 'cmdCircQuantiles
'
- Me.cmdCircQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl
- Me.cmdCircQuantile.Location = New System.Drawing.Point(150, 100)
- Me.cmdCircQuantile.Margin = New System.Windows.Forms.Padding(2)
- Me.cmdCircQuantile.Name = "cmdCircQuantile"
- Me.cmdCircQuantile.Size = New System.Drawing.Size(75, 40)
- Me.cmdCircQuantile.TabIndex = 13
- Me.cmdCircQuantile.Text = "quantile"
- Me.cmdCircQuantile.UseVisualStyleBackColor = True
+ Me.cmdCircQuantiles.ImeMode = System.Windows.Forms.ImeMode.NoControl
+ Me.cmdCircQuantiles.Location = New System.Drawing.Point(150, 100)
+ Me.cmdCircQuantiles.Margin = New System.Windows.Forms.Padding(2)
+ Me.cmdCircQuantiles.Name = "cmdCircQuantiles"
+ Me.cmdCircQuantiles.Size = New System.Drawing.Size(75, 40)
+ Me.cmdCircQuantiles.TabIndex = 13
+ Me.cmdCircQuantiles.Text = "quantiles"
+ Me.cmdCircQuantiles.UseVisualStyleBackColor = True
'
'cmdCircMax
'
@@ -6156,6 +6276,18 @@ Partial Class ucrCalculator
Me.cmdComplexi.Text = "i"
Me.cmdComplexi.UseVisualStyleBackColor = True
'
+ 'cmdComplexRHelp
+ '
+ Me.cmdComplexRHelp.AutoSize = True
+ Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex
+ Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212)
+ Me.cmdComplexRHelp.Name = "cmdComplexRHelp"
+ Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38)
+ Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex
+ Me.cmdComplexRHelp.TabIndex = 209
+ Me.cmdComplexRHelp.Text = "R Help"
+ Me.cmdComplexRHelp.UseVisualStyleBackColor = True
+ '
'cmdComplexTanH
'
Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
@@ -7225,145 +7357,12 @@ Partial Class ucrCalculator
Me.ucrReceiverForCalculation.TabIndex = 120
Me.ucrReceiverForCalculation.ucrSelector = Nothing
'
- 'cmdComplexRHelp
- '
- Me.cmdComplexRHelp.AutoSize = True
- Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex
- Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212)
- Me.cmdComplexRHelp.Name = "cmdComplexRHelp"
- Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38)
- Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex
- Me.cmdComplexRHelp.TabIndex = 209
- Me.cmdComplexRHelp.Text = "R Help"
- Me.cmdComplexRHelp.UseVisualStyleBackColor = True
- '
- 'cmdSummaryRHelp
- '
- Me.cmdSummaryRHelp.AutoSize = True
- Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary
- Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238)
- Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp"
- Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38)
- Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary
- Me.cmdSummaryRHelp.TabIndex = 185
- Me.cmdSummaryRHelp.Text = "R Help"
- Me.cmdSummaryRHelp.UseVisualStyleBackColor = True
- '
- 'cmdTransformRHelp
- '
- Me.cmdTransformRHelp.AutoSize = True
- Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform
- Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245)
- Me.cmdTransformRHelp.Name = "cmdTransformRHelp"
- Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38)
- Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform
- Me.cmdTransformRHelp.TabIndex = 204
- Me.cmdTransformRHelp.Text = "R Help"
- Me.cmdTransformRHelp.UseVisualStyleBackColor = True
- '
- 'cmdLogicalHelp
- '
- Me.cmdLogicalHelp.AutoSize = True
- Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical
- Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234)
- Me.cmdLogicalHelp.Name = "cmdLogicalHelp"
- Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38)
- Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical
- Me.cmdLogicalHelp.TabIndex = 212
- Me.cmdLogicalHelp.Text = "R Help"
- Me.cmdLogicalHelp.UseVisualStyleBackColor = True
- '
- 'cmdRHelp
- '
- Me.cmdRHelp.AutoSize = True
- Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate
- Me.cmdRHelp.Location = New System.Drawing.Point(186, 164)
- Me.cmdRHelp.Name = "cmdRHelp"
- Me.cmdRHelp.Size = New System.Drawing.Size(113, 38)
- Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate
- Me.cmdRHelp.TabIndex = 212
- Me.cmdRHelp.Text = "R Help"
- Me.cmdRHelp.UseVisualStyleBackColor = True
- '
- 'cmdHydroHelp
- '
- Me.cmdHydroHelp.AutoSize = True
- Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF
- Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298)
- Me.cmdHydroHelp.Name = "cmdHydroHelp"
- Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38)
- Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF
- Me.cmdHydroHelp.TabIndex = 212
- Me.cmdHydroHelp.Text = "R Help"
- Me.cmdHydroHelp.UseVisualStyleBackColor = True
- '
- 'cmdTransformHelp
- '
- Me.cmdTransformHelp.AutoSize = True
- Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor
- Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218)
- Me.cmdTransformHelp.Name = "cmdTransformHelp"
- Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38)
- Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor
- Me.cmdTransformHelp.TabIndex = 212
- Me.cmdTransformHelp.Text = "R Help"
- Me.cmdTransformHelp.UseVisualStyleBackColor = True
- '
- 'cmdCircularHelp
- '
- Me.cmdCircularHelp.AutoSize = True
- Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular
- Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178)
- Me.cmdCircularHelp.Name = "cmdCircularHelp"
- Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38)
- Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular
- Me.cmdCircularHelp.TabIndex = 212
- Me.cmdCircularHelp.Text = "R Help"
- Me.cmdCircularHelp.UseVisualStyleBackColor = True
- '
- 'cmdMathsHelp
- '
- Me.cmdMathsHelp.AutoSize = True
- Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths
- Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165)
- Me.cmdMathsHelp.Name = "cmdMathsHelp"
- Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38)
- Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths
- Me.cmdMathsHelp.TabIndex = 211
- Me.cmdMathsHelp.Text = "R Help"
- Me.cmdMathsHelp.UseVisualStyleBackColor = True
- '
- 'cmdProbRHelp
- '
- Me.cmdProbRHelp.AutoSize = True
- Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability
- Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239)
- Me.cmdProbRHelp.Name = "cmdProbRHelp"
- Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38)
- Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability
- Me.cmdProbRHelp.TabIndex = 212
- Me.cmdProbRHelp.Text = "R Help"
- Me.cmdProbRHelp.UseVisualStyleBackColor = True
- '
- 'cmdIntegerRHelp
- '
- Me.cmdIntegerRHelp.AutoSize = True
- Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger
- Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354)
- Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp"
- Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38)
- Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger
- Me.cmdIntegerRHelp.TabIndex = 16
- Me.cmdIntegerRHelp.Text = "R Help"
- Me.cmdIntegerRHelp.UseVisualStyleBackColor = True
- '
'ucrCalculator
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi
Me.AutoSize = True
Me.Controls.Add(Me.grpList)
- Me.Controls.Add(Me.grpComplex)
Me.Controls.Add(Me.cmdRhelpList)
Me.Controls.Add(Me.cmdWakefieldHelp)
Me.Controls.Add(Me.cmdStringRHelp)
@@ -7376,6 +7375,13 @@ Partial Class ucrCalculator
Me.Controls.Add(Me.ucrReceiverForCalculation)
Me.Controls.Add(Me.lblExpression)
Me.Controls.Add(Me.grpSymbols)
+ Me.Controls.Add(Me.grpCircular)
+ Me.Controls.Add(Me.grpMaths)
+ Me.Controls.Add(Me.grpProbabilty)
+ Me.Controls.Add(Me.grpInteger)
+ Me.Controls.Add(Me.grpTestString)
+ Me.Controls.Add(Me.grpModifier)
+ Me.Controls.Add(Me.grpComplex)
Me.Controls.Add(Me.grpSummary)
Me.Controls.Add(Me.grpWakefield)
Me.Controls.Add(Me.grpTransform)
@@ -7383,54 +7389,48 @@ Partial Class ucrCalculator
Me.Controls.Add(Me.grpDates)
Me.Controls.Add(Me.grpHydroGOF)
Me.Controls.Add(Me.grpFactor)
- Me.Controls.Add(Me.grpCircular)
- Me.Controls.Add(Me.grpMaths)
- Me.Controls.Add(Me.grpProbabilty)
- Me.Controls.Add(Me.grpInteger)
- Me.Controls.Add(Me.grpTestString)
- Me.Controls.Add(Me.grpModifier)
Me.Name = "ucrCalculator"
Me.Size = New System.Drawing.Size(1123, 572)
Me.grpBasic.ResumeLayout(False)
Me.grpDates.ResumeLayout(False)
- Me.grpDates.PerformLayout
+ Me.grpDates.PerformLayout()
Me.ContextMenuStripDate.ResumeLayout(False)
Me.ContextMenuStripComplex.ResumeLayout(False)
Me.grpInteger.ResumeLayout(False)
- Me.grpInteger.PerformLayout
+ Me.grpInteger.PerformLayout()
Me.ContextMenuStripInteger.ResumeLayout(False)
Me.grpFactor.ResumeLayout(False)
- Me.grpFactor.PerformLayout
+ Me.grpFactor.PerformLayout()
Me.ContextMenuStripFactor.ResumeLayout(False)
Me.grpHydroGOF.ResumeLayout(False)
- Me.grpHydroGOF.PerformLayout
+ Me.grpHydroGOF.PerformLayout()
Me.ContextMenuStripHydroGOF.ResumeLayout(False)
Me.grpWakefield.ResumeLayout(False)
Me.grpMaths.ResumeLayout(False)
- Me.grpMaths.PerformLayout
+ Me.grpMaths.PerformLayout()
Me.ContextMenuStripMaths.ResumeLayout(False)
Me.grpSummary.ResumeLayout(False)
- Me.grpSummary.PerformLayout
+ Me.grpSummary.PerformLayout()
Me.ContextMenuStripSummary.ResumeLayout(False)
Me.grpFrequencies.ResumeLayout(False)
Me.grpProbabilty.ResumeLayout(False)
- Me.grpProbabilty.PerformLayout
+ Me.grpProbabilty.PerformLayout()
Me.ContextMenuStripProbability.ResumeLayout(False)
Me.grpRandom.ResumeLayout(False)
Me.grpTransform.ResumeLayout(False)
- Me.grpTransform.PerformLayout
+ Me.grpTransform.PerformLayout()
Me.ContextMenuStripTransform.ResumeLayout(False)
Me.grpLogical.ResumeLayout(False)
- Me.grpLogical.PerformLayout
+ Me.grpLogical.PerformLayout()
Me.ContextMenuStripLogical.ResumeLayout(False)
Me.grpTestString.ResumeLayout(False)
Me.grpCircular.ResumeLayout(False)
- Me.grpCircular.PerformLayout
+ Me.grpCircular.PerformLayout()
Me.ContextMenuStripCircular.ResumeLayout(False)
Me.grpModifier.ResumeLayout(False)
Me.grpSymbols.ResumeLayout(False)
Me.grpComplex.ResumeLayout(False)
- Me.grpComplex.PerformLayout
+ Me.grpComplex.PerformLayout()
Me.ContextMenuStripTxtString.ResumeLayout(False)
Me.ContextMenuStripWakefield.ResumeLayout(False)
Me.ContextMenuStripList.ResumeLayout(False)
@@ -7438,7 +7438,7 @@ Partial Class ucrCalculator
Me.GroupBox1.ResumeLayout(False)
Me.grpMathBloc.ResumeLayout(False)
Me.ResumeLayout(False)
- Me.PerformLayout
+ Me.PerformLayout()
End Sub
@@ -7691,7 +7691,7 @@ Partial Class ucrCalculator
Friend WithEvents cmdCircRange As Button
Friend WithEvents cmdMedianHL As Button
Friend WithEvents cmdCircRho As Button
- Friend WithEvents cmdCircQuantile As Button
+ Friend WithEvents cmdCircQuantiles As Button
Friend WithEvents cmdCircular As Button
Friend WithEvents cmdMovmin As Button
diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx
index 876f47d358d..88d8710e379 100644
--- a/instat/ucrCalculator.resx
+++ b/instat/ucrCalculator.resx
@@ -163,6 +163,6 @@
759, 103
- 299
+ 182
\ No newline at end of file
diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb
index 80934c61369..ff43b949970 100644
--- a/instat/ucrCalculator.vb
+++ b/instat/ucrCalculator.vb
@@ -73,39 +73,38 @@ Public Class ucrCalculator
ttCalculator.SetToolTip(cmdRound, "round(x) to round to whole numbers, round(x,2) to round to 2 decimal places, round(x,-2) to round to the nearest 100")
ttCalculator.SetToolTip(cmdSiginf, "signif(x,3) to round to 3 significant figures")
- ttCalculator.SetToolTip(cmdSortF, "sorts a vector into ascending or descending order. For example sort(c(5,7,4,4,3)) = (3,4,4,5,7)")
- ttCalculator.SetToolTip(cmdScale, "centre and scale the data - usually by producing (x - xbar)/s")
- ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.")
- ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.")
- ttCalculator.SetToolTip(cmdLag, "shift a variable down. For example lag(1:5) = (NA,1,2,3,4); lag(1:5,3) = (NA,NA,NA, 1,2)")
- ttCalculator.SetToolTip(cmdLead, "shift a variable up. For example lead(1:5) = (2,3,4,5,NA); lead(1:5;3) = (4,5, NA,NA,NA)")
- ttCalculator.SetToolTip(cmdDiff, "difference between successive elements. For example diff(c(1,4,3,7)) = (NA 3,-1,4)")
- ttCalculator.SetToolTip(cmdRev, "reverse a variable. For example rev(c(1,2,3,4,5)) =(5,4,3,2,1)")
- ttCalculator.SetToolTip(cmdPMax, " maximum of a set of variables. For examples pmax(c(1,3,5),c(6,4,2)) = (6,4,5)")
- ttCalculator.SetToolTip(cmdPMin, "minimum of a set of variables. For examples pmin(c(1,3,5),c(6,4,2)) = (1,3,2)")
- ttCalculator.SetToolTip(cmdCumMax, "cumulative maxima. For example cummax(c(3,2,1,4,0)) = (3,3,3,4,4)")
- ttCalculator.SetToolTip(cmdMovMax, "moving (or rolling) maxima. For example rollmax(x=c(3,2,1,4,0) ,3,fill=NA, align=""right"") = (NA,NA, 3,4,4)")
- ttCalculator.SetToolTip(cmdCumSum, "cumulative sums. For example cumsum(c(3,2,1,4,0)) = (3,5,6,10,10)")
- ttCalculator.SetToolTip(cmdCumProd, "cumulative products. For example cumprod(c(2,3,5,7)) = (2,6,30,210)")
- ttCalculator.SetToolTip(cmdMovProd, "moving products Fror example rollapply(c(2,3,5,7,11),width=3,fill=NA, FUN=prod) = (NA,30,105,385,NA)")
- ttCalculator.SetToolTip(cmdCumMean, "cumulative means. For example cummean(c(3,2,1,4,0)) = (3,2.5,2,2.5,2)")
- ttCalculator.SetToolTip(cmdCumMin, "cumulative minima. For example cummin(c(3,2,1,4,0)) = (3,2.,1,1,0)")
- ttCalculator.SetToolTip(cmdMovSum, "moving (or rolling) totals. For example rollsum(c(3,2,1,4,0) ,3,fill=NA, align=""left"") = (6,7,5,NA,NA)")
- ttCalculator.SetToolTip(cmdMovMean, "moving (or rolling) mean. For example rollmean(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,3,3,NA)")
- ttCalculator.SetToolTip(cmMovMed, "moving (or rolling) medians. For example rollmedian(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,2,2,NA)")
- ttCalculator.SetToolTip(cmdMovmin, "moving (or rolling) minima. For example rollapply(c(3,2,1,6,2),width=3,fill=NA, FUN=min) = (NA,1,1,1,NA)")
- ttCalculator.SetToolTip(cmdNtile, " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)")
- ttCalculator.SetToolTip(cmdCumdist, "proportion of values less than or equal to the current rank. For example cume_dist(c(2,4,6,8,3)) = (0.2, 0.6, 0.8, 1.0, 0.4)")
- ttCalculator.SetToolTip(cmdRowRank, "row numbers as ranks. For example :row_number(c(15,11,13,12,NA,12)) = (5,1,3,2,NA,3)")
- ttCalculator.SetToolTip(cmdPercentRank, "rescale of minimum ranks to [0,1]. For example percent_rank(c(15,11,13,12,NA,12)) = (1,0,0.75,0.25,NA,0.25)")
- ttCalculator.SetToolTip(cmdDRank, "dense ranks. For example d_rank(c(15,11,13,12,NA,12)) = (4,1,3,2,NA,2)")
- ttCalculator.SetToolTip(cmdMRank, " minimum ranks. For example m_rank(c(15,11,13,12,NA,12)) = (5,1,4,2,NA,2)")
- ttCalculator.SetToolTip(cmdNafill, "fills missing values at the start, middle and end. For example na.fill(c(NA,2,NA,4,5,NA),fill=""extend"") = (2,2,3,4,5,5); while fill=c(15,""extend"",NA) = (15,2,3,4,5,NA)")
- ttCalculator.SetToolTip(cmdNaapprox, "linear interpolation of missing values. For example na.approx(c(5,NA,NA,2,2,NA,4,7,NA),maxgap=1,na.rm=FALSE) = (5,NA,NA,2,2,3,4,7,NA)")
+ ttCalculator.SetToolTip(cmdSortF, "Sorts a vector into ascending or descending order. For example sort(c(5,7,4,4,3)) = (3,4,4,5,7)")
+ ttCalculator.SetToolTip(cmdScale, "Centre and scale the data - usually by producing (x - xbar)/s")
+ ttCalculator.SetToolTip(cmdMASSFractions, "Changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.")
+ ttCalculator.SetToolTip(cmdDecimals, "The inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.")
+ ttCalculator.SetToolTip(cmdLag, "Shift a variable down. For example lag(1:5) = (NA,1,2,3,4); lag(1:5,3) = (NA,NA,NA, 1,2)")
+ ttCalculator.SetToolTip(cmdLead, "Shift a variable up. For example lead(1:5) = (2,3,4,5,NA); lead(1:5;3) = (4,5, NA,NA,NA)")
+ ttCalculator.SetToolTip(cmdDiff, "Difference between successive elements. For example diff(c(1,4,3,7)) = (NA 3,-1,4)")
+ ttCalculator.SetToolTip(cmdRev, "Reverse a variable. For example rev(c(1,2,3,4,5)) =(5,4,3,2,1)")
+ ttCalculator.SetToolTip(cmdPMax, " Maximum of a set of variables. For examples pmax(c(1,3,5),c(6,4,2)) = (6,4,5)")
+ ttCalculator.SetToolTip(cmdPMin, "Minimum of a set of variables. For examples pmin(c(1,3,5),c(6,4,2)) = (1,3,2)")
+ ttCalculator.SetToolTip(cmdCumMax, "Cumulative maxima. For example cummax(c(3,2,1,4,0)) = (3,3,3,4,4)")
+ ttCalculator.SetToolTip(cmdMovMax, "Moving (or rolling) maxima. For example rollmax(x=c(3,2,1,4,0) ,3,fill=NA, align=""right"") = (NA,NA, 3,4,4)")
+ ttCalculator.SetToolTip(cmdCumSum, "Cumulative sums. For example cumsum(c(3,2,1,4,0)) = (3,5,6,10,10)")
+ ttCalculator.SetToolTip(cmdCumProd, "Cumulative products. For example cumprod(c(2,3,5,7)) = (2,6,30,210)")
+ ttCalculator.SetToolTip(cmdMovProd, "Moving products Fror example rollapply(c(2,3,5,7,11),width=3,fill=NA, FUN=prod) = (NA,30,105,385,NA)")
+ ttCalculator.SetToolTip(cmdCumMean, "Cumulative means. For example cummean(c(3,2,1,4,0)) = (3,2.5,2,2.5,2)")
+ ttCalculator.SetToolTip(cmdCumMin, "Cumulative minima. For example cummin(c(3,2,1,4,0)) = (3,2.,1,1,0)")
+ ttCalculator.SetToolTip(cmdMovSum, "Moving (or rolling) totals. For example rollsum(c(3,2,1,4,0) ,3,fill=NA, align=""left"") = (6,7,5,NA,NA)")
+ ttCalculator.SetToolTip(cmdMovMean, "Moving (or rolling) mean. For example rollmean(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,3,3,NA)")
+ ttCalculator.SetToolTip(cmMovMed, "Moving (or rolling) medians. For example rollmedian(c(3,2,1,6,2) ,3,fill=NA) = (NA,2,2,2,NA)")
+ ttCalculator.SetToolTip(cmdMovmin, "Moving (or rolling) minima. For example rollapply(c(3,2,1,6,2),width=3,fill=NA, FUN=min) = (NA,1,1,1,NA)")
+ ttCalculator.SetToolTip(cmdNtile, " Use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)")
+ ttCalculator.SetToolTip(cmdCumdist, "Proportion of values less than or equal to the current rank. For example cume_dist(c(2,4,6,8,3)) = (0.2, 0.6, 0.8, 1.0, 0.4)")
+ ttCalculator.SetToolTip(cmdRowRank, "Row numbers as ranks. For example :row_number(c(15,11,13,12,NA,12)) = (5,1,3,2,NA,3)")
+ ttCalculator.SetToolTip(cmdPercentRank, "Rescale of minimum ranks to [0,1]. For example percent_rank(c(15,11,13,12,NA,12)) = (1,0,0.75,0.25,NA,0.25)")
+ ttCalculator.SetToolTip(cmdDRank, "Dense ranks. For example d_rank(c(15,11,13,12,NA,12)) = (4,1,3,2,NA,2)")
+ ttCalculator.SetToolTip(cmdMRank, " Minimum ranks. For example m_rank(c(15,11,13,12,NA,12)) = (5,1,4,2,NA,2)")
+ ttCalculator.SetToolTip(cmdNafill, "Fills missing values at the start, middle and end. For example na.fill(c(NA,2,NA,4,5,NA),fill=""extend"") = (2,2,3,4,5,5); while fill=c(15,""extend"",NA) = (15,2,3,4,5,NA)")
+ ttCalculator.SetToolTip(cmdNaapprox, "Linear interpolation of missing values. For example na.approx(c(5,NA,NA,2,2,NA,4,7,NA),maxgap=1,na.rm=FALSE) = (5,NA,NA,2,2,3,4,7,NA)")
ttCalculator.SetToolTip(cmdNasplin, "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)")
ttCalculator.SetToolTip(cmdNaest, "Missing values as the mean (usually) overall or with a factor. For example na.aggregate(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,3.75,4,7,3.75)")
-
ttCalculator.SetToolTip(cmdPower, "power(^)or exponent and can also be given as **. For example 2^3 = 8")
ttCalculator.SetToolTip(cmdLesser, "less than(<). For example (2 < 3) is TRUE. (2 < 2) is FALSE, (2 < 1) is FALSE")
ttCalculator.SetToolTip(cmdLesserOrEqualsTo, "less than or equals(<=). For example (2 <= 3) is TRUE, (2 <=2) is TRUE, (2 <= 1) is FALSE")
@@ -136,14 +135,14 @@ Public Class ucrCalculator
ttCalculator.SetToolTip(cmdPf, "F probabilities. For example pf(2,1,10) = 0.8123; pf(2,50,50) = 0.9921")
ttCalculator.SetToolTip(cmdQnorm, "qnormal quantiles. For example qnorm(0.05) = -1.6449; qnorm(0.9772, 100,15) = 130")
- ttCalculator.SetToolTip(cmdPbirth, "simultaneous birthday probabilities. For example pbirthday(10) = 0.1169 ; pbirthday(50) = 0.97")
- ttCalculator.SetToolTip(cmdQbirth, "simultaneous birthday quantiles. For example qbirthday(0.5) = 23, qbirthday(0.99) = 57")
- ttCalculator.SetToolTip(cmdPbinom, "binomial probabilities. For example pbinom(3,5,0.4) = 0.0.913")
- ttCalculator.SetToolTip(cmdQbinom, " binomial quantiles. For example qbinom(0.9,5,0.4) = 3")
+ ttCalculator.SetToolTip(cmdPbirth, "Simultaneous birthday probabilities. For example pbirthday(10) = 0.1169 ; pbirthday(50) = 0.97")
+ ttCalculator.SetToolTip(cmdQbirth, "Simultaneous birthday quantiles. For example qbirthday(0.5) = 23, qbirthday(0.99) = 57")
+ ttCalculator.SetToolTip(cmdPbinom, "Binomial probabilities. For example pbinom(3,5,0.4) = 0.0.913")
+ ttCalculator.SetToolTip(cmdQbinom, " Binomial quantiles. For example qbinom(0.9,5,0.4) = 3")
ttCalculator.SetToolTip(cmdPpois, "Poisson probabilities. For example ppois(8, 5) = 0.93")
ttCalculator.SetToolTip(cmdQpois, "Poisson quantiles. For example qpois(0.9, 5) = 8")
- ttCalculator.SetToolTip(cmdPnbin, "negative binomial probabilities. For example pnbinom(4,1,0.4) = 0.922 (geometric); pnbinom(13,5,0.4) = 0.9058")
- ttCalculator.SetToolTip(cmdQnbin, "negative binomial quantiles. For example qnbinom(0.9,1,0.4) = 4 (geometric); qnbinom(0.9, 5,0.4) = 13")
+ ttCalculator.SetToolTip(cmdPnbin, "Negative binomial probabilities. For example pnbinom(4,1,0.4) = 0.922 (geometric); pnbinom(13,5,0.4) = 0.9058")
+ ttCalculator.SetToolTip(cmdQnbin, "Negative binomial quantiles. For example qnbinom(0.9,1,0.4) = 4 (geometric); qnbinom(0.9, 5,0.4) = 13")
ttCalculator.SetToolTip(cmdFact, "factorial. For example factorial(4) = 4*3*2*1 = 24; factorial(3.5) = gamma(4.5) = 11.63")
ttCalculator.SetToolTip(cmdLfact, "log factorial. For example lfactorial(400) = 2001")
ttCalculator.SetToolTip(cmdChoose, "binomial coefficient. For example choose(7,4) = 7!/(4!*3!) = 35")
@@ -179,7 +178,7 @@ Public Class ucrCalculator
ttCalculator.SetToolTip(cmdSin, "sine of angle in radians. For example sin(pi/2) = sin(rad(90)) = 1.")
ttCalculator.SetToolTip(cmdAsin, "angle corresponding to a given sine (in the range (0 to pi). For example asin(1) = 1.57 = pi/2.")
ttCalculator.SetToolTip(cmdFloor, "integer below the given value. For example floor(3.5)=3; floor(-3.5) = -4.")
- ttCalculator.SetToolTip(cmdRad, "change from degrees to radians. For example rad(90) = 2*pi * 90/360 = 1.57 ( = pi/2)")
+ ttCalculator.SetToolTip(cmdRad, "Change from degrees to radians. For example rad(90) = 2*pi * 90/360 = 1.57 ( = pi/2)")
ttCalculator.SetToolTip(cmdLogTen, "logarithm to base 10. For example log10(1000) =3 (=10^3)")
ttCalculator.SetToolTip(cmdTan, " tangent of angle in radians. For example tan(pi/4) = sin(pi/4)/cos(pi/4) = tan(rad(45)) = 1")
ttCalculator.SetToolTip(cmdAtan, "angle corresponding to a given tangent (in the range 0 to pi). For example atan(1) = 0.7854 (= pi/4); deg(atan(1)) = 45.")
@@ -299,23 +298,42 @@ Public Class ucrCalculator
ttCalculator.SetToolTip(cmdCp, "coefficent of persistence between sim and obs")
ttCalculator.SetToolTip(cmdD, "Index of agreement between sim and obs")
ttCalculator.SetToolTip(cmdKGE, "Kling-Gupta efficiency between sim and obs")
- ttCalculator.SetToolTip(cmdMae, "mean absolute error between sim and obs")
- ttCalculator.SetToolTip(cmdMd, "modified index of agreement between sim and obsmNSE")
- ttCalculator.SetToolTip(cmdMe, "mean error between sim and obs")
- ttCalculator.SetToolTip(cmdmNSE, "modified Nash-Sutcliffe efficiency between sim and obs")
- ttCalculator.SetToolTip(cmdMse, "mean squared error between sim and obs")
- ttCalculator.SetToolTip(cmdNrmse, "normalized root mean square error between sim and obs")
+ ttCalculator.SetToolTip(cmdMae, "Mean absolute error between sim and obs")
+ ttCalculator.SetToolTip(cmdMd, "Modified index of agreement between sim and obsmNSE")
+ ttCalculator.SetToolTip(cmdMe, "Mean error between sim and obs")
+ ttCalculator.SetToolTip(cmdmNSE, "Modified Nash-Sutcliffe efficiency between sim and obs")
+ ttCalculator.SetToolTip(cmdMse, "Mean squared error between sim and obs")
+ ttCalculator.SetToolTip(cmdNrmse, "Normalized root mean square error between sim and obs")
ttCalculator.SetToolTip(cmdNSE, "Nash-Sutcliffe efficiency between sim and obs")
- ttCalculator.SetToolTip(cmdPbias, "percent bias between sim and obs")
- ttCalculator.SetToolTip(cmdPbiasfdc, "percent bias in the slope of the midsegment of the flow duration curve")
- ttCalculator.SetToolTip(cmdRd, "relative index of agreement (d) between sim and obs. (Value is between 0 and 1)")
- ttCalculator.SetToolTip(cmdRmse, "root mean square error between sim and obs, so the standard deviation of the model prediction error")
- ttCalculator.SetToolTip(cmdRNSE, "relative Nash-Sutcliffe efficiency between sim and obs")
- ttCalculator.SetToolTip(cmdRPearson, "correlation between sim and obs")
- ttCalculator.SetToolTip(cmdRSD, "ratio of standard deviations between sim and obs")
- ttCalculator.SetToolTip(cmdRsr, "ratio of the root mean square error between sim and obs to the standard deviation of obs")
- ttCalculator.SetToolTip(cmdSsq, "sum of squared residuals between sim and obs")
- ttCalculator.SetToolTip(cmdVE, " volumetric efficiency between sim and obs (Value is between 0 and 1)")
+ ttCalculator.SetToolTip(cmdPbias, "Percent bias between sim and obs")
+ ttCalculator.SetToolTip(cmdPbiasfdc, "Percent bias in the slope of the midsegment of the flow duration curve")
+ ttCalculator.SetToolTip(cmdRd, "Relative index of agreement (d) between sim and obs. (Value is between 0 and 1)")
+ ttCalculator.SetToolTip(cmdRmse, "Root mean square error between sim and obs, so the standard deviation of the model prediction error")
+ ttCalculator.SetToolTip(cmdRNSE, "Relative Nash-Sutcliffe efficiency between sim and obs")
+ ttCalculator.SetToolTip(cmdRPearson, "Correlation between sim and obs")
+ ttCalculator.SetToolTip(cmdRSD, "Ratio of standard deviations between sim and obs")
+ ttCalculator.SetToolTip(cmdRsr, "Ratio of the root mean square error between sim and obs to the standard deviation of obs")
+ ttCalculator.SetToolTip(cmdSsq, "Sum of squared residuals between sim and obs")
+ ttCalculator.SetToolTip(cmdVE, " Volumetric efficiency between sim and obs (Value is between 0 and 1)")
+
+ ' circular keyboard tooltips
+ ttCalculator.SetToolTip(cmdCircular, "Define a variable as circular. Specify whether the data are in radians (default), degrees, or hours.")
+ ttCalculator.SetToolTip(cmdCircMean, "The circular mean. For example with 1, 2, 3, 6, mean(circular(c(1,2,3,6)) gives 1.51.")
+ ttCalculator.SetToolTip(cmdCircSd, "The circular standard deviation. This is not the sqrt(circular.var). It is reasonably close to the ordinary sd for data in radians.")
+ ttCalculator.SetToolTip(cmdCircRho, "The mean resultant length is between 0 and 1. Small values imply large (circular) variation. For 1,2,3,6 rho is 0.4036. With 1,2,3,4,5,6 it is 0.049.")
+ ttCalculator.SetToolTip(cmdCircRange, "Circular range is the shortest arc containing the data. For example with 1,2,3,6 gives 3.28 (6 is also -0.28 on circle from 0 to 2*pi)")
+ ttCalculator.SetToolTip(cmdCircVar, "The circular variance is (1 - rho), so between 0 and 1, with small values implying low (circular) variation. For 1,2,3,6 var is 0.5964. With 1,2,3,4,5,6 var is 0.951.")
+ ttCalculator.SetToolTip(cmdCircQuantiles, "Defined quantiles round the circle. With 0.5 it is the (circular) median, so is 1.5 for 1,2,3,6.")
+ ttCalculator.SetToolTip(cmdCircMax, "Largest value round the circle. For example, for 1,2,3,6 max is 3.")
+ ttCalculator.SetToolTip(cmdCircMin, " Smallest value round the circle. For 1,2,3,6 min is 6. (values are from 6 (almost 2 * pi to 3)")
+ ttCalculator.SetToolTip(cmdCircQ1, "Lower quartile round the circle. For 1,2,3,6, q1 is 0.68")
+ ttCalculator.SetToolTip(cmdCircQ3, "Upper quartile round the circle. For 1,2,3,6 q3 is 2.25.")
+ ttCalculator.SetToolTip(cmdMedianHL, " Median using Hodges-Lehmann estimate. For example with 1,2,3,6, medianHL (and median) give 1.5.")
+ ttCalculator.SetToolTip(cmdCircMedian, "Circular median. For example with 23 and 2 representing hours, median(circular(c(23,2), units=""hours"")) gives 0,5.")
+ ttCalculator.SetToolTip(cmdAngVar, "The angular variance is twice the circular variance, so between 0 and 2.")
+ ttCalculator.SetToolTip(cmdA1, "Ratio of Bessel functions for values of kappa parameter. Used in the von Mises (circular normal) distribution kappa = 0.9 gives A1 same as rho value for 1,2,3,6 data.")
+ ttCalculator.SetToolTip(cmdAngDev, "The angular deviation is square root of the angular variance, so between 0 and sqrt(2).")
+
Const strTooltipCmdLength = "number of observations: For example length(c(1,2,3,4,NA)) = 5 "
ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength)
@@ -3245,7 +3263,7 @@ Public Class ucrCalculator
Private Sub cmdCircMean_Click(sender As Object, e As EventArgs) Handles cmdCircMean.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular:: mean.circular(x = , na.rm = FALSE, control.circular = list())", 44)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular:: mean.circular(x = , na.rm = TRUE, control.circular = list())", 43)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::mean.circular()", 1)
End If
@@ -3253,7 +3271,7 @@ Public Class ucrCalculator
Private Sub cmdCircMedian_Click(sender As Object, e As EventArgs) Handles cmdCircMedian.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x = , na.rm = FALSE)", 17)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x = , na.rm = TRUE)", 16)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular()", 1)
End If
@@ -3261,7 +3279,7 @@ Public Class ucrCalculator
Private Sub cmdMedianHL_Click(sender As Object, e As EventArgs) Handles cmdMedianHL.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x = , na.rm = FALSE, method = c(HL1,HL2,HL3), prop = NULL)", 55)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x = , na.rm = TRUE, method = c(""HL1"",""HL2"",""HL3""), prop = NULL)", 60)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular()", 1)
End If
@@ -3269,7 +3287,7 @@ Public Class ucrCalculator
Private Sub cmdCircRange_Click(sender As Object, e As EventArgs) Handles cmdCircRange.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular(x = , test = FALSE, na.rm = FALSE, finite = FALSE, control.circular = list(), )", 76)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular(x = , test = FALSE, na.rm = TRUE, finite = FALSE, control.circular = list(), )", 75)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular()", 1)
End If
@@ -3277,7 +3295,7 @@ Public Class ucrCalculator
Private Sub cmdCircSd_Click(sender As Object, e As EventArgs) Handles cmdCircSd.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular(x = , na.rm = FALSE)", 18)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular(x = , na.rm = TRUE)", 17)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular()", 1)
End If
@@ -3285,7 +3303,7 @@ Public Class ucrCalculator
Private Sub cmdCircVar_Click(sender As Object, e As EventArgs) Handles cmdCircVar.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular(x = , na.rm = FALSE)", 18)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular(x = , na.rm = TRUE)", 17)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular()", 1)
End If
@@ -3295,13 +3313,13 @@ Public Class ucrCalculator
If chkShowParameters.Checked Then
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1(kappa = )", 2)
Else
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::besselI()", 1)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1()", 1)
End If
End Sub
Private Sub cmdAngVar_Click(sender As Object, e As EventArgs) Handles cmdAngVar.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance(x = , na.rm = FALSE)", 17)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance(x = , na.rm = TRUE)", 16)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance()", 1)
End If
@@ -3309,7 +3327,7 @@ Public Class ucrCalculator
Private Sub cmdAngDev_Click(sender As Object, e As EventArgs) Handles cmdAngDev.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation(x = , na.rm = FALSE)", 17)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation(x = , na.rm = TRUE)", 16)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation()", 1)
End If
@@ -3317,7 +3335,7 @@ Public Class ucrCalculator
Private Sub cmdCircQ1_Click(sender As Object, e As EventArgs) Handles cmdCircQ1.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.25, na.rm = FALSE, names = TRUE, type = 7)", 55)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.25, na.rm = TRUE, names = TRUE, type = 7)", 54)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.25)", 16)
End If
@@ -3325,7 +3343,7 @@ Public Class ucrCalculator
Private Sub cmdCircMin_Click(sender As Object, e As EventArgs) Handles cmdCircMin.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0, na.rm = FALSE, names = TRUE, type = 7)", 52)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0, na.rm = TRUE, names = TRUE, type = 7)", 51)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0)", 13)
End If
@@ -3333,7 +3351,7 @@ Public Class ucrCalculator
Private Sub cmdCircMax_Click(sender As Object, e As EventArgs) Handles cmdCircMax.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 1, na.rm = FALSE, names = TRUE, type = 7)", 52)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 1, na.rm = TRUE, names = TRUE, type = 7)", 51)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 1)", 13)
End If
@@ -3341,23 +3359,23 @@ Public Class ucrCalculator
Private Sub cmdCircQ3_Click(sender As Object, e As EventArgs) Handles cmdCircQ3.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.75, na.rm = FALSE, names = TRUE, type = 7)", 55)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.75, na.rm = TRUE, names = TRUE, type = 7)", 54)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.75)", 16)
End If
End Sub
- Private Sub cmdCircQuantile_Click_1(sender As Object, e As EventArgs) Handles cmdCircQuantile.Click
+ Private Sub cmdCircQuantiles_Click_1(sender As Object, e As EventArgs) Handles cmdCircQuantiles.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25), na.rm = FALSE, names = TRUE, type = 7)", 66)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25), na.rm = TRUE, names = TRUE, type = 7)", 65)
Else
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 28)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 27)
End If
End Sub
Private Sub cmdCircRho_Click_1(sender As Object, e As EventArgs) Handles cmdCircRho.Click
If chkShowParameters.Checked Then
- ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular(x = , na.rm = FALSE)", 17)
+ ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular(x = , na.rm = TRUE)", 16)
Else
ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular()", 1)
End If