From ff11e265dd4a6361121e5be0f54dc7477e9cffbb Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 12 Feb 2024 09:21:31 +0100 Subject: [PATCH 01/27] Improve Heatmap Dialog --- instat/dlgHeatMapPlot.Designer.vb | 121 +++++++-- instat/dlgHeatMapPlot.resx | 412 +++++++++++++++++++++--------- instat/dlgHeatMapPlot.vb | 133 +++++----- 3 files changed, 452 insertions(+), 214 deletions(-) diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb index 9ff7ff37d50..50ecfd1a2c8 100644 --- a/instat/dlgHeatMapPlot.Designer.vb +++ b/instat/dlgHeatMapPlot.Designer.vb @@ -65,8 +65,6 @@ Partial Class dlgHeatMapPlot Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() Me.cmdOptions = New instat.ucrSplitButton() - Me.ucrChkPoints = New instat.ucrCheck() - Me.ucrChkFlipCoordinates = New instat.ucrCheck() Me.ucrReceiverPointsHeatMap = New instat.ucrReceiverSingle() Me.ucrNudShapeHeatMap = New instat.ucrNud() Me.ucrChkColourPalette = New instat.ucrCheck() @@ -80,7 +78,6 @@ Partial Class dlgHeatMapPlot Me.ucrReceiverLongitude = New instat.ucrReceiverSingle() Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() Me.ucrReceiverFillChoropleth = New instat.ucrReceiverSingle() - Me.ucrVariableAsFactorForHeatMap = New instat.ucrVariablesAsFactor() Me.ucrInputReorderVariableX = New instat.ucrInputComboBox() Me.ucrInputSize = New instat.ucrInputComboBox() Me.ucrInputPosition = New instat.ucrInputComboBox() @@ -88,6 +85,16 @@ Partial Class dlgHeatMapPlot Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrReceiverGroup = New instat.ucrReceiverSingle() Me.ucrChkAddLabels = New instat.ucrCheck() + Me.ucrChkPoints = New instat.ucrCheck() + Me.ucrChkFlipCoordinates = New instat.ucrCheck() + Me.lblYvariable = New System.Windows.Forms.Label() + Me.ucrReceiverY = New instat.ucrReceiverSingle() + Me.lblHeith = New System.Windows.Forms.Label() + Me.ucrNudHeigth = New instat.ucrNud() + Me.lblWidth = New System.Windows.Forms.Label() + Me.ucrNudWidth = New instat.ucrNud() + Me.ucrChkJitter = New instat.ucrCheck() + Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -186,7 +193,7 @@ Partial Class dlgHeatMapPlot ' 'contextMenuStripOptions ' - Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemTileOptions, Me.toolStripMenuItemPolygonOptions}) + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemTileOptions, Me.toolStripMenuItemPolygonOptions, Me.toolStripMenuItemJitterOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" resources.ApplyResources(Me.contextMenuStripOptions, "contextMenuStripOptions") ' @@ -251,18 +258,6 @@ Partial Class dlgHeatMapPlot Me.cmdOptions.Tag = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' - 'ucrChkPoints - ' - resources.ApplyResources(Me.ucrChkPoints, "ucrChkPoints") - Me.ucrChkPoints.Checked = False - Me.ucrChkPoints.Name = "ucrChkPoints" - ' - 'ucrChkFlipCoordinates - ' - resources.ApplyResources(Me.ucrChkFlipCoordinates, "ucrChkFlipCoordinates") - Me.ucrChkFlipCoordinates.Checked = False - Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" - ' 'ucrReceiverPointsHeatMap ' resources.ApplyResources(Me.ucrReceiverPointsHeatMap, "ucrReceiverPointsHeatMap") @@ -363,16 +358,6 @@ Partial Class dlgHeatMapPlot Me.ucrReceiverFillChoropleth.strNcFilePath = "" Me.ucrReceiverFillChoropleth.ucrSelector = Nothing ' - 'ucrVariableAsFactorForHeatMap - ' - resources.ApplyResources(Me.ucrVariableAsFactorForHeatMap, "ucrVariableAsFactorForHeatMap") - Me.ucrVariableAsFactorForHeatMap.frmParent = Me - Me.ucrVariableAsFactorForHeatMap.Name = "ucrVariableAsFactorForHeatMap" - Me.ucrVariableAsFactorForHeatMap.Selector = Nothing - Me.ucrVariableAsFactorForHeatMap.strNcFilePath = "" - Me.ucrVariableAsFactorForHeatMap.ucrSelector = Nothing - Me.ucrVariableAsFactorForHeatMap.ucrVariableSelector = Nothing - ' 'ucrInputReorderVariableX ' Me.ucrInputReorderVariableX.AddQuotesIfUnrecognised = True @@ -429,10 +414,84 @@ Partial Class dlgHeatMapPlot Me.ucrChkAddLabels.Checked = False Me.ucrChkAddLabels.Name = "ucrChkAddLabels" ' + 'ucrChkPoints + ' + resources.ApplyResources(Me.ucrChkPoints, "ucrChkPoints") + Me.ucrChkPoints.Checked = False + Me.ucrChkPoints.Name = "ucrChkPoints" + ' + 'ucrChkFlipCoordinates + ' + resources.ApplyResources(Me.ucrChkFlipCoordinates, "ucrChkFlipCoordinates") + Me.ucrChkFlipCoordinates.Checked = False + Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" + ' + 'lblYvariable + ' + resources.ApplyResources(Me.lblYvariable, "lblYvariable") + Me.lblYvariable.Name = "lblYvariable" + ' + 'ucrReceiverY + ' + resources.ApplyResources(Me.ucrReceiverY, "ucrReceiverY") + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.ucrSelector = Nothing + ' + 'lblHeith + ' + resources.ApplyResources(Me.lblHeith, "lblHeith") + Me.lblHeith.Name = "lblHeith" + ' + 'ucrNudHeigth + ' + resources.ApplyResources(Me.ucrNudHeigth, "ucrNudHeigth") + Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Name = "ucrNudHeigth" + Me.ucrNudHeigth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblWidth + ' + resources.ApplyResources(Me.lblWidth, "lblWidth") + Me.lblWidth.Name = "lblWidth" + ' + 'ucrNudWidth + ' + resources.ApplyResources(Me.ucrNudWidth, "ucrNudWidth") + Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Name = "ucrNudWidth" + Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkJitter + ' + resources.ApplyResources(Me.ucrChkJitter, "ucrChkJitter") + Me.ucrChkJitter.Checked = False + Me.ucrChkJitter.Name = "ucrChkJitter" + ' + 'toolStripMenuItemJitterOptions + ' + Me.toolStripMenuItemJitterOptions.Name = "toolStripMenuItemJitterOptions" + resources.ApplyResources(Me.toolStripMenuItemJitterOptions, "toolStripMenuItemJitterOptions") + ' 'dlgHeatMapPlot ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrChkJitter) + Me.Controls.Add(Me.lblHeith) + Me.Controls.Add(Me.ucrNudHeigth) + Me.Controls.Add(Me.lblWidth) + Me.Controls.Add(Me.ucrNudWidth) + Me.Controls.Add(Me.lblYvariable) + Me.Controls.Add(Me.ucrReceiverY) Me.Controls.Add(Me.ucrInputStation) Me.Controls.Add(Me.ucr1stFactorReceiver) Me.Controls.Add(Me.lblFacetBy) @@ -463,7 +522,6 @@ Partial Class dlgHeatMapPlot Me.Controls.Add(Me.lblLatitude) Me.Controls.Add(Me.lblReorderValue) Me.Controls.Add(Me.ucrReceiverFillChoropleth) - Me.Controls.Add(Me.ucrVariableAsFactorForHeatMap) Me.Controls.Add(Me.ucrInputReorderVariableX) Me.Controls.Add(Me.ucrInputSize) Me.Controls.Add(Me.lblLabelPosition) @@ -491,7 +549,6 @@ Partial Class dlgHeatMapPlot Friend WithEvents ucrReceiverX As ucrReceiverSingle Friend WithEvents lblXVariable As Label Friend WithEvents ucrSaveGraph As ucrSave - Friend WithEvents ucrVariableAsFactorForHeatMap As ucrVariablesAsFactor Friend WithEvents lblFill As Label Friend WithEvents ucrReceiverFill As ucrReceiverSingle Friend WithEvents ucrChkAddLabels As ucrCheck @@ -534,4 +591,12 @@ Partial Class dlgHeatMapPlot Friend WithEvents lblFacetBy As Label Friend WithEvents ucrInputLegendPosition As ucrInputComboBox Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents lblYvariable As Label + Friend WithEvents ucrReceiverY As ucrReceiverSingle + Friend WithEvents lblHeith As Label + Friend WithEvents ucrNudHeigth As ucrNud + Friend WithEvents lblWidth As Label + Friend WithEvents ucrNudWidth As ucrNud + Friend WithEvents ucrChkJitter As ucrCheck + Friend WithEvents toolStripMenuItemJitterOptions As ToolStripMenuItem End Class \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index 3835b0a3259..c1b25eb5b6b 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -127,7 +127,7 @@ - 273, 197 + 273, 173 58, 13 @@ -148,7 +148,7 @@ $this - 26 + 33 True @@ -157,7 +157,7 @@ NoControl - 273, 284 + 273, 251 22, 13 @@ -178,7 +178,7 @@ $this - 17 + 24 True @@ -187,7 +187,7 @@ NoControl - 126, 391 + 120, 402 47, 13 @@ -208,7 +208,7 @@ $this - 34 + 40 True @@ -217,7 +217,7 @@ NoControl - 229, 391 + 224, 402 40, 13 @@ -238,7 +238,7 @@ $this - 36 + 42 True @@ -247,7 +247,7 @@ NoControl - 322, 391 + 318, 402 30, 13 @@ -268,7 +268,7 @@ $this - 38 + 44 True @@ -277,7 +277,7 @@ NoControl - 273, 328 + 8, 270 87, 13 @@ -298,7 +298,7 @@ $this - 11 + 18 True @@ -307,7 +307,7 @@ NoControl - 275, 369 + 135, 288 30, 13 @@ -328,7 +328,7 @@ $this - 12 + 19 True @@ -337,7 +337,7 @@ NoControl - 273, 240 + 273, 212 48, 13 @@ -358,7 +358,7 @@ $this - 40 + 46 True @@ -367,7 +367,7 @@ NoControl - 273, 112 + 273, 97 48, 13 @@ -388,7 +388,7 @@ $this - 29 + 36 Button @@ -424,7 +424,7 @@ $this - 9 + 16 Button @@ -460,7 +460,7 @@ $this - 10 + 17 True @@ -469,7 +469,7 @@ NoControl - 273, 63 + 273, 53 57, 13 @@ -490,7 +490,7 @@ $this - 24 + 31 True @@ -499,7 +499,7 @@ NoControl - 273, 111 + 273, 96 48, 13 @@ -520,7 +520,7 @@ $this - 28 + 35 True @@ -529,7 +529,7 @@ NoControl - 273, 154 + 273, 135 22, 13 @@ -550,7 +550,7 @@ $this - 8 + 15 True @@ -559,7 +559,7 @@ NoControl - 273, 197 + 273, 173 55, 13 @@ -580,20 +580,11 @@ $this - 7 + 14 17, 17 - - 164, 70 - - - contextMenuStripOptions - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 163, 22 @@ -612,6 +603,21 @@ Polygon Options + + 163, 22 + + + Jitter Options + + + 164, 92 + + + contextMenuStripOptions + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -619,7 +625,7 @@ NoControl - 207, 411 + 207, 425 52, 13 @@ -640,13 +646,13 @@ $this - 3 + 10 GrowAndShrink - 316, 425 + 316, 439 101, 21 @@ -664,7 +670,7 @@ $this - 1 + 8 True @@ -676,13 +682,196 @@ 6, 13 - 420, 538 + 420, 568 + + + True + + + 8, 368 + + + 113, 23 + + + 101 + + + ucrChkJitter + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + True + + + 223, 370 + + + 41, 13 + + + 99 + + + Heigth: + + + lblHeith + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + 264, 368 + + + 45, 20 + + + 100 + + + ucrNudHeigth + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + True + + + 120, 370 + + + 38, 13 + + + 97 + + + Width: + + + lblWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 168, 368 + + + 45, 20 + + + 98 + + + ucrNudWidth + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 5 + + + True + + + NoControl + + + 273, 54 + + + 58, 13 + + + 94 + + + Y Variable: + + + lblYvariable + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 273, 72 + + + 0, 0, 0, 0 + + + 120, 20 + + + 1 + + + ucrReceiverY + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 7 GrowAndShrink - 86, 425 + 86, 439 112, 21 @@ -700,13 +889,13 @@ $this - 4 + 11 True - 8, 426 + 8, 440 98, 24 @@ -724,7 +913,7 @@ $this - 5 + 12 True @@ -733,7 +922,7 @@ NoControl - 8, 247 + 8, 238 149, 23 @@ -754,19 +943,19 @@ $this - 6 + 13 True - 273, 343 + 8, 285 0, 0, 0, 0 - 125, 20 + 113, 20 24 @@ -781,13 +970,13 @@ $this - 13 + 20 True - 308, 366 + 168, 285 41, 20 @@ -805,13 +994,13 @@ $this - 14 + 21 True - 8, 346 + 8, 339 128, 23 @@ -829,13 +1018,13 @@ $this - 15 + 22 GrowAndShrink - 142, 346 + 142, 339 63, 21 @@ -853,13 +1042,13 @@ $this - 16 + 23 True - 273, 300 + 273, 267 0, 0, 0, 0 @@ -880,19 +1069,19 @@ $this - 18 + 25 GrowAndShrink - 8, 453 + 8, 479 4, 5, 4, 5 - 370, 32 + 370, 27 37 @@ -907,13 +1096,13 @@ $this - 19 + 26 GrowAndShrink - 8, 487 + 8, 508 410, 58 @@ -931,7 +1120,7 @@ $this - 20 + 27 GrowAndShrink @@ -955,13 +1144,13 @@ $this - 21 + 28 GrowAndShrink - 273, 127 + 273, 112 93, 21 @@ -979,13 +1168,13 @@ $this - 22 + 29 True - 8, 60 + 8, 51 0, 0, 0, 0 @@ -1006,13 +1195,13 @@ $this - 23 + 30 True - 273, 84 + 273, 72 0, 0, 0, 0 @@ -1033,13 +1222,13 @@ $this - 25 + 32 True - 273, 127 + 273, 112 0, 0, 0, 0 @@ -1060,13 +1249,13 @@ $this - 27 + 34 True - 273, 170 + 273, 151 0, 0, 0, 0 @@ -1087,37 +1276,13 @@ $this - 30 - - - True - - - 273, 54 - - - 125, 138 - - - 6 - - - ucrVariableAsFactorForHeatMap - - - instat.ucrVariablesAsFactor, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 31 + 37 GrowAndShrink - 273, 256 + 273, 228 93, 21 @@ -1135,13 +1300,13 @@ $this - 32 + 38 GrowAndShrink - 349, 387 + 349, 398 59, 23 @@ -1159,13 +1324,13 @@ $this - 33 + 39 GrowAndShrink - 173, 387 + 168, 398 52, 23 @@ -1183,13 +1348,13 @@ $this - 35 + 41 GrowAndShrink - 269, 387 + 264, 398 50, 23 @@ -1207,13 +1372,13 @@ $this - 37 + 43 True - 273, 213 + 273, 189 0, 0, 0, 0 @@ -1234,13 +1399,13 @@ $this - 39 + 45 True - 273, 213 + 273, 189 0, 0, 0, 0 @@ -1261,13 +1426,13 @@ $this - 41 + 47 True - 8, 387 + 8, 398 128, 23 @@ -1285,13 +1450,13 @@ $this - 42 + 48 True - 8, 314 + 8, 312 166, 23 @@ -1309,13 +1474,13 @@ $this - 43 + 49 True - 8, 315 + 8, 313 166, 23 @@ -1333,10 +1498,7 @@ $this - 44 - - - NoControl + 50 CenterScreen @@ -1362,6 +1524,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripMenuItemJitterOptions + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + dlgHeatMapPlot @@ -1369,7 +1537,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 204, 426 + 204, 440 0, 0, 0, 0 @@ -1390,6 +1558,6 @@ $this - 2 + 9 \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index e27f4c5f5d8..4ec11be6834 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -53,7 +53,7 @@ Public Class dlgHeatMapPlot clsSizeChoroplethAesFunction, clsHeatmapAesFunction, clsChoroplethAesFunction, clsXlabsFunction, clsYlabFunction, clsXScalecontinuousFunction, clsYScalecontinuousFunction, clsRFacetFunction, clsThemeFunction, clsRoundFunction, clsXRangeFunction, clsYRangeFunction, clsXMeanFunction, clsYMeanFunction, clsGroupByFunction, - clsSummariseFunction, clsDummyFunction As New RFunction + clsSummariseFunction, clsDummyFunction, clsGeomJitterFunction As New RFunction Private Sub dlgHeatMapPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -91,7 +91,7 @@ Public Class dlgHeatMapPlot ucrPnlOptions.AddToLinkedControls({ucrChkAddLabels, ucrChkColourPalette}, {rdoHeatMap, rdoChoroplethMap}) ucrPnlOptions.AddToLinkedControls({ucrChkPoints, ucrReceiverFillChoropleth, ucrReceiverLongitude, ucrReceiverLatitude, ucrReceiverGroup}, {rdoChoroplethMap}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - ucrPnlOptions.AddToLinkedControls({ucrChkColourPalette, ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverPointsHeatMap, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrVariableAsFactorForHeatMap}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrChkColourPalette, ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverPointsHeatMap, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrReceiverY}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrReceiverX.SetLinkedDisplayControl(lblXVariable) ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude) ucrReceiverLongitude.SetLinkedDisplayControl(lblLongitude) @@ -129,14 +129,13 @@ Public Class dlgHeatMapPlot ucrReceiverGroup.SetParameterIsString() ucrReceiverGroup.bWithQuotes = False - ucrVariableAsFactorForHeatMap.Selector = ucrHeatMapSelector - ucrVariableAsFactorForHeatMap.SetFactorReceiver(ucrReceiverX) - ucrVariableAsFactorForHeatMap.SetParameter(New RParameter("y", 1)) - ucrVariableAsFactorForHeatMap.SetParameterIsString() - ucrVariableAsFactorForHeatMap.bChangeParameterValue = False - ucrVariableAsFactorForHeatMap.bWithQuotes = False - ucrVariableAsFactorForHeatMap.SetValuesToIgnore({Chr(34) & Chr(34)}) - ucrVariableAsFactorForHeatMap.bAddParameterIfEmpty = True + ucrReceiverY.Selector = ucrHeatMapSelector + ucrReceiverY.SetParameter(New RParameter("y", 1)) + ucrReceiverY.SetParameterIsString() + ucrReceiverY.bChangeParameterValue = False + ucrReceiverY.bWithQuotes = False + ucrReceiverY.SetValuesToIgnore({Chr(34) & Chr(34)}) + ucrReceiverY.bAddParameterIfEmpty = True ucrReceiverFill.Selector = ucrHeatMapSelector ucrReceiverFill.SetParameter(New RParameter("fill", 2)) @@ -247,6 +246,27 @@ Public Class dlgHeatMapPlot clsCoordFlipParam.SetArgument(clsCoordFlipFunction) ucrChkFlipCoordinates.SetText("Swap x and y") ucrChkFlipCoordinates.SetParameter(clsCoordFlipParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + + ucrChkJitter.SetText("Add Jitter") + ucrChkJitter.AddToLinkedControls({ucrNudHeigth, ucrNudWidth}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkLegend.AddParameterPresentCondition(True, "geom_jitter") + ucrChkLegend.AddParameterPresentCondition(False, "ggeom_jitter", False) + + ucrNudHeigth.SetParameter(New RParameter("height", 5)) + ucrNudHeigth.Maximum = 0.5 + ucrNudHeigth.Minimum = 0 + ucrNudHeigth.Increment = 0.01 + ucrNudHeigth.DecimalPlaces = 2 + ucrNudHeigth.SetLinkedDisplayControl(lblHeith) + ucrNudHeigth.SetRDefault(0.4) + + ucrNudWidth.SetParameter(New RParameter("width", 6)) + ucrNudWidth.Maximum = 0.5 + ucrNudWidth.Minimum = 0 + ucrNudWidth.Increment = 0.01 + ucrNudWidth.DecimalPlaces = 2 + ucrNudWidth.SetLinkedDisplayControl(lblWidth) + ucrNudWidth.SetRDefault(0.4) End Sub Private Sub SetDefaults() @@ -283,12 +303,13 @@ Public Class dlgHeatMapPlot clsFacetVariablesOperator = New ROperator clsFacetRowOp = New ROperator clsFacetColOp = New ROperator + clsGeomJitterFunction = New RFunction ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True ucrSaveGraph.Reset() - ucrVariableAsFactorForHeatMap.SetMeAsReceiver() + ucrReceiverY.SetMeAsReceiver() ucrHeatMapSelector.Reset() ucrHeatMapSelector.SetGgplotFunction(clsBaseOperator) bResetSubdialog = True @@ -314,6 +335,11 @@ Public Class dlgHeatMapPlot clsRgeomTileFunction.SetPackageName("ggplot2") clsRgeomTileFunction.SetRCommand("geom_tile") + clsGeomJitterFunction.SetPackageName("ggplot2") + clsGeomJitterFunction.SetRCommand("geom_jitter") + clsGeomJitterFunction.AddParameter("width", 0.4, iPosition:=0) + clsGeomJitterFunction.AddParameter("height", 0.4, iPosition:=1) + clsGeomTextFunction.SetPackageName("ggplot2") clsGeomTextFunction.SetRCommand("geom_text") clsGeomTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsLabelAesFunction, iPosition:=1) @@ -460,7 +486,7 @@ Public Class dlgHeatMapPlot ucrReceiverX.AddAdditionalCodeParameterPair(clsReorderFunction, New RParameter("x", 0), iAdditionalPairNo:=1) - ucrVariableAsFactorForHeatMap.AddAdditionalCodeParameterPair(clsReorderValueFunction, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverY.AddAdditionalCodeParameterPair(clsReorderValueFunction, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverLongitude.AddAdditionalCodeParameterPair(clsXRangeFunction, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) @@ -473,7 +499,7 @@ Public Class dlgHeatMapPlot ucrReceiverX.SetRCode(clsHeatmapAesFunction, bReset) ucrReceiverLongitude.SetRCode(clsChoroplethAesFunction, bReset) ucrReceiverLatitude.SetRCode(clsChoroplethAesFunction, bReset) - ucrVariableAsFactorForHeatMap.SetRCode(clsHeatmapAesFunction, bReset) + ucrReceiverY.SetRCode(clsHeatmapAesFunction, bReset) ucrReceiverFill.SetRCode(clsHeatmapAesFunction, bReset) ucrReceiverFillChoropleth.SetRCode(clsChoroplethAesFunction, bReset) ucrReceiverGroup.SetRCode(clsGroupFunction, bReset) @@ -489,9 +515,12 @@ Public Class dlgHeatMapPlot ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + If bReset Then + ucrNudHeigth.SetRCode(clsGeomJitterFunction, bReset) + ucrNudWidth.SetRCode(clsGeomJitterFunction, bReset) + ucrChkJitter.SetRCode(clsGeomJitterFunction, bReset) + End If bRCodeSet = True - - UnstackColumns() End Sub Private Sub TestOkEnabled() @@ -501,7 +530,7 @@ Public Class dlgHeatMapPlot End If If rdoHeatMap.Checked Then - ucrBase.OKEnabled(Not ucrVariableAsFactorForHeatMap.IsEmpty AndAlso Not ucrReceiverX.IsEmpty) + ucrBase.OKEnabled(Not ucrReceiverY.IsEmpty AndAlso Not ucrReceiverX.IsEmpty) Else If Not ucrReceiverLongitude.IsEmpty AndAlso Not ucrReceiverLatitude.IsEmpty Then ucrBase.OKEnabled(Not ucrChkAddLabels.Checked _ @@ -540,12 +569,9 @@ Public Class dlgHeatMapPlot Private Sub TempOptionsDisabledInMultipleVariablesCase() cmdOptions.Enabled = True - toolStripMenuItemTileOptions.Enabled = rdoHeatMap.Checked AndAlso ucrVariableAsFactorForHeatMap.bSingleVariable + toolStripMenuItemTileOptions.Enabled = rdoHeatMap.Checked toolStripMenuItemPolygonOptions.Enabled = rdoChoroplethMap.Checked - End Sub - - Private Sub UcrVariablesAsFactor_ControlValueChanged() Handles ucrVariableAsFactorForHeatMap.ControlValueChanged, ucrPnlOptions.ControlValueChanged - TempOptionsDisabledInMultipleVariablesCase() + toolStripMenuItemJitterOptions.Enabled = ucrChkJitter.Checked End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click @@ -559,7 +585,7 @@ Public Class dlgHeatMapPlot bResetSubdialog = False End Sub - Private Sub toolStripMenuItemTileOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTileOptions.Click, toolStripMenuItemPolygonOptions.Click + Private Sub toolStripMenuItemTileOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTileOptions.Click, toolStripMenuItemPolygonOptions.Click, toolStripMenuItemJitterOptions.Click ''''''' i wonder if all this will be needed for the new system sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, @@ -572,8 +598,8 @@ Public Class dlgHeatMapPlot bResetRugLayerSubdialog = False If rdoHeatMap.Checked Then For Each clsParam In clsHeatmapAesFunction.clsParameters - If clsParam.strArgumentName = "y" AndAlso (clsParam.strArgumentValue <> "value" OrElse ucrVariableAsFactorForHeatMap.bSingleVariable) Then - ucrVariableAsFactorForHeatMap.Add(clsParam.strArgumentValue) + If clsParam.strArgumentName = "y" AndAlso clsParam.strArgumentValue <> "value" Then + ucrReceiverY.Add(clsParam.strArgumentValue) ElseIf clsParam.strArgumentName = "x" Then ucrReceiverX.Add(clsParam.strArgumentValue) ElseIf clsParam.strArgumentName = "fill" Then @@ -619,7 +645,7 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged, ucrInputReorderValue.ControlValueChanged + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrReceiverY.ControlValueChanged clsGeomTextFunction.RemoveParameterByName("data") clsLabelAesFunction.RemoveParameterByName("x") clsLabelAesFunction.RemoveParameterByName("y") @@ -641,17 +667,6 @@ Public Class dlgHeatMapPlot ucrSaveGraph.SetPrefix("choroplethmap") End If - UnstackColumns() - End Sub - - Private Sub ucrVariableAsFactorForHeatMap_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrVariableAsFactorForHeatMap.ControlValueChanged - MakeVisible() - End Sub - - Private Sub MakeVisible() - If rdoHeatMap.Checked Then - ucrInputReorderValue.Visible = If(ucrVariableAsFactorForHeatMap.bSingleVariable, True, False) - End If End Sub Private Sub ucrReceiverLongitude_ControlContentsChanged() Handles ucrReceiverLongitude.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged @@ -660,9 +675,9 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrVariableAsFactorForHeatMap_ControlContentsChanged() Handles ucrVariableAsFactorForHeatMap.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged + Private Sub ucrReceiverY_ControlContentsChanged() Handles ucrReceiverY.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged If rdoHeatMap.Checked Then - ucrVariableAsFactorForHeatMap.SetMeAsReceiver() + ucrReceiverY.SetMeAsReceiver() End If End Sub @@ -682,17 +697,17 @@ Public Class dlgHeatMapPlot clsReorderValueFunction.AddParameter("X", "-" & ucrReceiverX.GetVariableNames(False), iPosition:=1) clsHeatmapAesFunction.AddParameter("y", clsRFunctionParameter:=clsReorderValueFunction, iPosition:=0) Case strReverse - clsForecatsReverseValueFunction.AddParameter("f", ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=0) + clsForecatsReverseValueFunction.AddParameter("f", ucrReceiverY.GetVariableNames(False), iPosition:=0) clsHeatmapAesFunction.AddParameter("y", clsRFunctionParameter:=clsForecatsReverseValueFunction, iPosition:=0) Case strNone - clsHeatmapAesFunction.AddParameter("y", ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=0) + clsHeatmapAesFunction.AddParameter("y", ucrReceiverY.GetVariableNames(False), iPosition:=0) End Select Select Case ucrInputReorderVariableX.GetText() Case strAscending - clsReorderFunction.AddParameter("X", ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=1) + clsReorderFunction.AddParameter("X", ucrReceiverY.GetVariableNames(False), iPosition:=1) clsHeatmapAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strDescending - clsReorderFunction.AddParameter("X", "-" & ucrVariableAsFactorForHeatMap.GetVariableNames(False), iPosition:=1) + clsReorderFunction.AddParameter("X", "-" & ucrReceiverY.GetVariableNames(False), iPosition:=1) clsHeatmapAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strReverse clsForecatsReverseFunction.AddParameter("f", ucrReceiverX.GetVariableNames(False), iPosition:=0) @@ -703,34 +718,14 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrVariableAsFactorForHeatMap.ControlValueChanged, + Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrChkAddLabels.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged MakeNudVisible() UpdateParameter() - MakeVisible() AddRemoveGeomParameter() End Sub - Private Sub UnstackColumns() - If Not bRCodeSet Then - Exit Sub - End If - If rdoChoroplethMap.Checked Then - If Not ucrVariableAsFactorForHeatMap.bSingleVariable Then - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.RemoveParameterByName("measure.vars") - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.RemoveParameterByName("stack_data") - End If - Else - If Not ucrVariableAsFactorForHeatMap.bSingleVariable Then - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.AddParameter("stack_data", "TRUE") - If Not ucrVariableAsFactorForHeatMap.ucrMultipleVariables.IsEmpty Then - ucrHeatMapSelector.ucrAvailableDataFrames.clsCurrDataFrame.AddParameter("measure.vars", ucrVariableAsFactorForHeatMap.ucrMultipleVariables.GetVariableNames()) - End If - End If - End If - End Sub - Private Sub AutoFacetStation() Dim currentReceiver As ucrReceiver = ucrHeatMapSelector.CurrentReceiver @@ -902,7 +897,17 @@ Public Class dlgHeatMapPlot clsDummyFunction.AddParameter("choropleth_geom_point", ucrChkPoints.Checked, iPosition:=0) End Sub - Private Sub AllControlsContentsChanged() Handles ucrInputColour.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrVariableAsFactorForHeatMap.ControlContentsChanged, ucrReceiverLongitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged + Private Sub AllControlsContentsChanged() Handles ucrInputColour.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrReceiverLongitude.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrChkJitter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkJitter.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrNudHeigth.ControlValueChanged + If ucrChkJitter.Checked Then + clsGeomJitterFunction.AddParameter("width", ucrNudWidth.GetText, iPosition:=0) + clsGeomJitterFunction.AddParameter("height", ucrNudHeigth.GetText, iPosition:=1) + clsBaseOperator.AddParameter("geom_jitter", clsRFunctionParameter:=clsGeomJitterFunction, iPosition:=2) + Else + clsBaseOperator.RemoveParameterByName("geom_jitter") + End If + End Sub End Class From 4bf5cce780489715800a285d23d761709e97ba64 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 12 Feb 2024 10:09:10 +0100 Subject: [PATCH 02/27] minor change --- instat/dlgHeatMapPlot.Designer.vb | 12 ++++++------ instat/dlgHeatMapPlot.resx | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb index 50ecfd1a2c8..a4e46e08877 100644 --- a/instat/dlgHeatMapPlot.Designer.vb +++ b/instat/dlgHeatMapPlot.Designer.vb @@ -59,6 +59,7 @@ Partial Class dlgHeatMapPlot Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTileOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemPolygonOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() Me.lblFacetBy = New System.Windows.Forms.Label() Me.ucrInputStation = New instat.ucrInputComboBox() Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() @@ -94,7 +95,6 @@ Partial Class dlgHeatMapPlot Me.lblWidth = New System.Windows.Forms.Label() Me.ucrNudWidth = New instat.ucrNud() Me.ucrChkJitter = New instat.ucrCheck() - Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -212,6 +212,11 @@ Partial Class dlgHeatMapPlot Me.toolStripMenuItemPolygonOptions.Name = "toolStripMenuItemPolygonOptions" resources.ApplyResources(Me.toolStripMenuItemPolygonOptions, "toolStripMenuItemPolygonOptions") ' + 'toolStripMenuItemJitterOptions + ' + Me.toolStripMenuItemJitterOptions.Name = "toolStripMenuItemJitterOptions" + resources.ApplyResources(Me.toolStripMenuItemJitterOptions, "toolStripMenuItemJitterOptions") + ' 'lblFacetBy ' resources.ApplyResources(Me.lblFacetBy, "lblFacetBy") @@ -476,11 +481,6 @@ Partial Class dlgHeatMapPlot Me.ucrChkJitter.Checked = False Me.ucrChkJitter.Name = "ucrChkJitter" ' - 'toolStripMenuItemJitterOptions - ' - Me.toolStripMenuItemJitterOptions.Name = "toolStripMenuItemJitterOptions" - resources.ApplyResources(Me.toolStripMenuItemJitterOptions, "toolStripMenuItemJitterOptions") - ' 'dlgHeatMapPlot ' resources.ApplyResources(Me, "$this") diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index c1b25eb5b6b..3eb3c25abaf 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -409,7 +409,7 @@ 2 - Chorolopleth Map + Choropleth Map MiddleCenter From da9947a9398b02062f895fb0729c79e7c5aef6c0 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 12 Feb 2024 11:05:59 +0100 Subject: [PATCH 03/27] change made --- instat/dlgHeatMapPlot.Designer.vb | 42 ------- instat/dlgHeatMapPlot.resx | 185 ++++++------------------------ instat/dlgHeatMapPlot.vb | 2 +- 3 files changed, 38 insertions(+), 191 deletions(-) diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb index a4e46e08877..64c88890fbf 100644 --- a/instat/dlgHeatMapPlot.Designer.vb +++ b/instat/dlgHeatMapPlot.Designer.vb @@ -45,8 +45,6 @@ Partial Class dlgHeatMapPlot Me.lblLabelPosition = New System.Windows.Forms.Label() Me.lblLabelColour = New System.Windows.Forms.Label() Me.lblLabelSize = New System.Windows.Forms.Label() - Me.lblPointsOptional = New System.Windows.Forms.Label() - Me.lblPointsSize = New System.Windows.Forms.Label() Me.lblReorderVariableX = New System.Windows.Forms.Label() Me.lblReorderValue = New System.Windows.Forms.Label() Me.rdoChoroplethMap = New System.Windows.Forms.RadioButton() @@ -66,8 +64,6 @@ Partial Class dlgHeatMapPlot Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() Me.cmdOptions = New instat.ucrSplitButton() - Me.ucrReceiverPointsHeatMap = New instat.ucrReceiverSingle() - Me.ucrNudShapeHeatMap = New instat.ucrNud() Me.ucrChkColourPalette = New instat.ucrCheck() Me.ucrInputColourPalette = New instat.ucrInputComboBox() Me.ucrReceiverFill = New instat.ucrReceiverSingle() @@ -125,17 +121,6 @@ Partial Class dlgHeatMapPlot resources.ApplyResources(Me.lblLabelSize, "lblLabelSize") Me.lblLabelSize.Name = "lblLabelSize" ' - 'lblPointsOptional - ' - resources.ApplyResources(Me.lblPointsOptional, "lblPointsOptional") - Me.lblPointsOptional.Name = "lblPointsOptional" - Me.lblPointsOptional.Tag = "Points_Optional" - ' - 'lblPointsSize - ' - resources.ApplyResources(Me.lblPointsSize, "lblPointsSize") - Me.lblPointsSize.Name = "lblPointsSize" - ' 'lblReorderVariableX ' resources.ApplyResources(Me.lblReorderVariableX, "lblReorderVariableX") @@ -263,25 +248,6 @@ Partial Class dlgHeatMapPlot Me.cmdOptions.Tag = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' - 'ucrReceiverPointsHeatMap - ' - resources.ApplyResources(Me.ucrReceiverPointsHeatMap, "ucrReceiverPointsHeatMap") - Me.ucrReceiverPointsHeatMap.frmParent = Me - Me.ucrReceiverPointsHeatMap.Name = "ucrReceiverPointsHeatMap" - Me.ucrReceiverPointsHeatMap.Selector = Nothing - Me.ucrReceiverPointsHeatMap.strNcFilePath = "" - Me.ucrReceiverPointsHeatMap.ucrSelector = Nothing - ' - 'ucrNudShapeHeatMap - ' - resources.ApplyResources(Me.ucrNudShapeHeatMap, "ucrNudShapeHeatMap") - Me.ucrNudShapeHeatMap.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudShapeHeatMap.Name = "ucrNudShapeHeatMap" - Me.ucrNudShapeHeatMap.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'ucrChkColourPalette ' resources.ApplyResources(Me.ucrChkColourPalette, "ucrChkColourPalette") @@ -502,10 +468,6 @@ Partial Class dlgHeatMapPlot Me.Controls.Add(Me.lblFillChoropleth) Me.Controls.Add(Me.rdoChoroplethMap) Me.Controls.Add(Me.rdoHeatMap) - Me.Controls.Add(Me.lblPointsOptional) - Me.Controls.Add(Me.lblPointsSize) - Me.Controls.Add(Me.ucrReceiverPointsHeatMap) - Me.Controls.Add(Me.ucrNudShapeHeatMap) Me.Controls.Add(Me.ucrChkColourPalette) Me.Controls.Add(Me.ucrInputColourPalette) Me.Controls.Add(Me.lblFill) @@ -560,10 +522,6 @@ Partial Class dlgHeatMapPlot Friend WithEvents lblLabelSize As Label Friend WithEvents ucrInputColourPalette As ucrInputComboBox Friend WithEvents ucrChkColourPalette As ucrCheck - Friend WithEvents lblPointsOptional As Label - Friend WithEvents lblPointsSize As Label - Friend WithEvents ucrReceiverPointsHeatMap As ucrReceiverSingle - Friend WithEvents ucrNudShapeHeatMap As ucrNud Friend WithEvents lblReorderVariableX As Label Friend WithEvents ucrInputReorderVariableX As ucrInputComboBox Friend WithEvents ucrInputReorderValue As ucrInputComboBox diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index 3eb3c25abaf..3f34e40860c 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -148,7 +148,7 @@ $this - 33 + 29 True @@ -178,7 +178,7 @@ $this - 24 + 20 True @@ -187,7 +187,7 @@ NoControl - 120, 402 + 126, 391 47, 13 @@ -208,7 +208,7 @@ $this - 40 + 36 True @@ -238,7 +238,7 @@ $this - 42 + 38 True @@ -268,67 +268,7 @@ $this - 44 - - - True - - - NoControl - - - 8, 270 - - - 87, 13 - - - 23 - - - Points (Optional): - - - lblPointsOptional - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 18 - - - True - - - NoControl - - - 135, 288 - - - 30, 13 - - - 25 - - - Size: - - - lblPointsSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 19 + 40 True @@ -358,7 +298,7 @@ $this - 46 + 42 True @@ -388,7 +328,7 @@ $this - 36 + 32 Button @@ -490,7 +430,7 @@ $this - 31 + 27 True @@ -520,7 +460,7 @@ $this - 35 + 31 True @@ -652,7 +592,7 @@ GrowAndShrink - 316, 439 + 316, 425 101, 21 @@ -871,7 +811,7 @@ GrowAndShrink - 86, 439 + 86, 425 112, 21 @@ -895,7 +835,7 @@ True - 8, 440 + 8, 426 98, 24 @@ -945,57 +885,6 @@ 13 - - True - - - 8, 285 - - - 0, 0, 0, 0 - - - 113, 20 - - - 24 - - - ucrReceiverPointsHeatMap - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 20 - - - True - - - 168, 285 - - - 41, 20 - - - 26 - - - ucrNudShapeHeatMap - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 21 - True @@ -1018,7 +907,7 @@ $this - 22 + 18 GrowAndShrink @@ -1042,7 +931,7 @@ $this - 23 + 19 True @@ -1069,13 +958,13 @@ $this - 25 + 21 GrowAndShrink - 8, 479 + 8, 453 4, 5, 4, 5 @@ -1096,13 +985,13 @@ $this - 26 + 22 GrowAndShrink - 8, 508 + 8, 487 410, 58 @@ -1120,7 +1009,7 @@ $this - 27 + 23 GrowAndShrink @@ -1144,7 +1033,7 @@ $this - 28 + 24 GrowAndShrink @@ -1168,7 +1057,7 @@ $this - 29 + 25 True @@ -1195,7 +1084,7 @@ $this - 30 + 26 True @@ -1222,7 +1111,7 @@ $this - 32 + 28 True @@ -1249,7 +1138,7 @@ $this - 34 + 30 True @@ -1276,7 +1165,7 @@ $this - 37 + 33 GrowAndShrink @@ -1300,7 +1189,7 @@ $this - 38 + 34 GrowAndShrink @@ -1324,7 +1213,7 @@ $this - 39 + 35 GrowAndShrink @@ -1348,7 +1237,7 @@ $this - 41 + 37 GrowAndShrink @@ -1372,7 +1261,7 @@ $this - 43 + 39 True @@ -1399,7 +1288,7 @@ $this - 45 + 41 True @@ -1426,13 +1315,13 @@ $this - 47 + 43 True - 8, 398 + 8, 387 128, 23 @@ -1450,7 +1339,7 @@ $this - 48 + 44 True @@ -1474,7 +1363,7 @@ $this - 49 + 45 True @@ -1498,7 +1387,7 @@ $this - 50 + 46 CenterScreen @@ -1537,7 +1426,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 204, 440 + 204, 426 0, 0, 0, 0 diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index 4ec11be6834..586d7e24498 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -629,7 +629,7 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrReceiverPoints_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPointsHeatMap.ControlValueChanged, ucrPnlOptions.ControlValueChanged + Private Sub ucrReceiverPoints_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged If bRCodeSet Then clsBaseOperator.RemoveParameterByName("heatmap_geom_point") MakeNudVisible() From 67de6786d177ce0bc463e15aaa339d4a5721f01e Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 13 Feb 2024 10:33:04 +0100 Subject: [PATCH 04/27] Change made --- instat/dlgHeatMapPlot.Designer.vb | 151 ++++++--- instat/dlgHeatMapPlot.resx | 531 +++++++++++++++++++----------- instat/dlgHeatMapPlot.vb | 153 ++++++--- 3 files changed, 564 insertions(+), 271 deletions(-) diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb index 64c88890fbf..6f41d8a598f 100644 --- a/instat/dlgHeatMapPlot.Designer.vb +++ b/instat/dlgHeatMapPlot.Designer.vb @@ -59,6 +59,13 @@ Partial Class dlgHeatMapPlot Me.toolStripMenuItemPolygonOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() Me.lblFacetBy = New System.Windows.Forms.Label() + Me.lblYvariable = New System.Windows.Forms.Label() + Me.lblHeith = New System.Windows.Forms.Label() + Me.lblWidth = New System.Windows.Forms.Label() + Me.ucrChkJitter = New instat.ucrCheck() + Me.ucrNudHeigth = New instat.ucrNud() + Me.ucrNudWidth = New instat.ucrNud() + Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.ucrInputStation = New instat.ucrInputComboBox() Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() @@ -84,13 +91,12 @@ Partial Class dlgHeatMapPlot Me.ucrChkAddLabels = New instat.ucrCheck() Me.ucrChkPoints = New instat.ucrCheck() Me.ucrChkFlipCoordinates = New instat.ucrCheck() - Me.lblYvariable = New System.Windows.Forms.Label() - Me.ucrReceiverY = New instat.ucrReceiverSingle() - Me.lblHeith = New System.Windows.Forms.Label() - Me.ucrNudHeigth = New instat.ucrNud() - Me.lblWidth = New System.Windows.Forms.Label() - Me.ucrNudWidth = New instat.ucrNud() - Me.ucrChkJitter = New instat.ucrCheck() + Me.ucrPnlPalette = New instat.UcrPanel() + Me.rdoPalette = New System.Windows.Forms.RadioButton() + Me.ucrInputPalette = New instat.ucrInputComboBox() + Me.rdoFRomTo = New System.Windows.Forms.RadioButton() + Me.ucrColourTo = New instat.ucrColors() + Me.ucrColourFrom = New instat.ucrColors() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' @@ -208,6 +214,56 @@ Partial Class dlgHeatMapPlot Me.lblFacetBy.Name = "lblFacetBy" Me.lblFacetBy.Tag = "" ' + 'lblYvariable + ' + resources.ApplyResources(Me.lblYvariable, "lblYvariable") + Me.lblYvariable.Name = "lblYvariable" + ' + 'lblHeith + ' + resources.ApplyResources(Me.lblHeith, "lblHeith") + Me.lblHeith.Name = "lblHeith" + ' + 'lblWidth + ' + resources.ApplyResources(Me.lblWidth, "lblWidth") + Me.lblWidth.Name = "lblWidth" + ' + 'ucrChkJitter + ' + resources.ApplyResources(Me.ucrChkJitter, "ucrChkJitter") + Me.ucrChkJitter.Checked = False + Me.ucrChkJitter.Name = "ucrChkJitter" + ' + 'ucrNudHeigth + ' + resources.ApplyResources(Me.ucrNudHeigth, "ucrNudHeigth") + Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHeigth.Name = "ucrNudHeigth" + Me.ucrNudHeigth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudWidth + ' + resources.ApplyResources(Me.ucrNudWidth, "ucrNudWidth") + Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Name = "ucrNudWidth" + Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrReceiverY + ' + resources.ApplyResources(Me.ucrReceiverY, "ucrReceiverY") + Me.ucrReceiverY.frmParent = Me + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.ucrSelector = Nothing + ' 'ucrInputStation ' Me.ucrInputStation.AddQuotesIfUnrecognised = True @@ -397,60 +453,59 @@ Partial Class dlgHeatMapPlot Me.ucrChkFlipCoordinates.Checked = False Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" ' - 'lblYvariable + 'ucrPnlPalette ' - resources.ApplyResources(Me.lblYvariable, "lblYvariable") - Me.lblYvariable.Name = "lblYvariable" + resources.ApplyResources(Me.ucrPnlPalette, "ucrPnlPalette") + Me.ucrPnlPalette.Name = "ucrPnlPalette" ' - 'ucrReceiverY + 'rdoPalette ' - resources.ApplyResources(Me.ucrReceiverY, "ucrReceiverY") - Me.ucrReceiverY.frmParent = Me - Me.ucrReceiverY.Name = "ucrReceiverY" - Me.ucrReceiverY.Selector = Nothing - Me.ucrReceiverY.strNcFilePath = "" - Me.ucrReceiverY.ucrSelector = Nothing + resources.ApplyResources(Me.rdoPalette, "rdoPalette") + Me.rdoPalette.Name = "rdoPalette" + Me.rdoPalette.TabStop = True + Me.rdoPalette.UseVisualStyleBackColor = True ' - 'lblHeith + 'ucrInputPalette ' - resources.ApplyResources(Me.lblHeith, "lblHeith") - Me.lblHeith.Name = "lblHeith" + Me.ucrInputPalette.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputPalette, "ucrInputPalette") + Me.ucrInputPalette.GetSetSelectedIndex = -1 + Me.ucrInputPalette.IsReadOnly = False + Me.ucrInputPalette.Name = "ucrInputPalette" ' - 'ucrNudHeigth + 'rdoFRomTo ' - resources.ApplyResources(Me.ucrNudHeigth, "ucrNudHeigth") - Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudHeigth.Name = "ucrNudHeigth" - Me.ucrNudHeigth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + resources.ApplyResources(Me.rdoFRomTo, "rdoFRomTo") + Me.rdoFRomTo.Name = "rdoFRomTo" + Me.rdoFRomTo.TabStop = True + Me.rdoFRomTo.UseVisualStyleBackColor = True ' - 'lblWidth + 'ucrColourTo ' - resources.ApplyResources(Me.lblWidth, "lblWidth") - Me.lblWidth.Name = "lblWidth" + Me.ucrColourTo.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrColourTo, "ucrColourTo") + Me.ucrColourTo.GetSetSelectedIndex = -1 + Me.ucrColourTo.IsReadOnly = False + Me.ucrColourTo.Name = "ucrColourTo" ' - 'ucrNudWidth + 'ucrColourFrom ' - resources.ApplyResources(Me.ucrNudWidth, "ucrNudWidth") - Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWidth.Name = "ucrNudWidth" - Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkJitter - ' - resources.ApplyResources(Me.ucrChkJitter, "ucrChkJitter") - Me.ucrChkJitter.Checked = False - Me.ucrChkJitter.Name = "ucrChkJitter" + Me.ucrColourFrom.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrColourFrom, "ucrColourFrom") + Me.ucrColourFrom.GetSetSelectedIndex = -1 + Me.ucrColourFrom.IsReadOnly = False + Me.ucrColourFrom.Name = "ucrColourFrom" ' 'dlgHeatMapPlot ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrColourFrom) + Me.Controls.Add(Me.ucrColourTo) + Me.Controls.Add(Me.rdoFRomTo) + Me.Controls.Add(Me.ucrInputPalette) + Me.Controls.Add(Me.rdoPalette) + Me.Controls.Add(Me.ucrPnlPalette) Me.Controls.Add(Me.ucrChkJitter) Me.Controls.Add(Me.lblHeith) Me.Controls.Add(Me.ucrNudHeigth) @@ -557,4 +612,10 @@ Partial Class dlgHeatMapPlot Friend WithEvents ucrNudWidth As ucrNud Friend WithEvents ucrChkJitter As ucrCheck Friend WithEvents toolStripMenuItemJitterOptions As ToolStripMenuItem + Friend WithEvents rdoPalette As RadioButton + Friend WithEvents ucrPnlPalette As UcrPanel + Friend WithEvents rdoFRomTo As RadioButton + Friend WithEvents ucrInputPalette As ucrInputComboBox + Friend WithEvents ucrColourFrom As ucrColors + Friend WithEvents ucrColourTo As ucrColors End Class \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index 3f34e40860c..3dfbfd47c7c 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -127,7 +127,7 @@ - 273, 173 + 273, 177 58, 13 @@ -148,7 +148,7 @@ $this - 29 + 35 True @@ -157,7 +157,7 @@ NoControl - 273, 251 + 273, 255 22, 13 @@ -178,7 +178,7 @@ $this - 20 + 26 True @@ -208,7 +208,7 @@ $this - 36 + 42 True @@ -217,7 +217,7 @@ NoControl - 224, 402 + 229, 391 40, 13 @@ -238,7 +238,7 @@ $this - 38 + 44 True @@ -247,7 +247,7 @@ NoControl - 318, 402 + 322, 391 30, 13 @@ -268,7 +268,7 @@ $this - 40 + 46 True @@ -277,7 +277,7 @@ NoControl - 273, 212 + 273, 216 48, 13 @@ -298,7 +298,7 @@ $this - 42 + 48 True @@ -307,7 +307,7 @@ NoControl - 273, 97 + 273, 100 48, 13 @@ -328,7 +328,7 @@ $this - 32 + 38 Button @@ -364,7 +364,7 @@ $this - 16 + 22 Button @@ -400,7 +400,7 @@ $this - 17 + 23 True @@ -409,7 +409,7 @@ NoControl - 273, 53 + 273, 57 57, 13 @@ -430,7 +430,7 @@ $this - 27 + 33 True @@ -439,7 +439,7 @@ NoControl - 273, 96 + 273, 100 48, 13 @@ -460,7 +460,7 @@ $this - 31 + 37 True @@ -469,7 +469,7 @@ NoControl - 273, 135 + 273, 139 22, 13 @@ -490,7 +490,7 @@ $this - 15 + 21 True @@ -499,7 +499,7 @@ NoControl - 273, 173 + 274, 177 55, 13 @@ -520,7 +520,7 @@ $this - 14 + 20 17, 17 @@ -565,7 +565,7 @@ NoControl - 207, 425 + 207, 410 52, 13 @@ -586,73 +586,46 @@ $this - 10 - - - GrowAndShrink - - - 316, 425 - - - 101, 21 - - - 91 - - - ucrInputStation - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 8 - - - True + 16 - + True - - - 6, 13 - - 420, 568 + + NoControl - - True + + 273, 58 - - 8, 368 + + 58, 13 - - 113, 23 + + 94 - - 101 + + Y Variable: - - ucrChkJitter + + lblYvariable - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 1 + + 12 True + + NoControl + - 223, 370 + 223, 360 41, 13 @@ -673,37 +646,16 @@ $this - 2 - - - True - - - 264, 368 - - - 45, 20 - - - 100 - - - ucrNudHeigth - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 3 + 8 True + + NoControl + - 120, 370 + 120, 360 38, 13 @@ -724,13 +676,61 @@ $this - 4 + 10 + + + True + + + 8, 358 + + + 113, 23 + + + 101 + + + ucrChkJitter + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 7 + + + True + + + 264, 358 + + + 45, 20 + + + 100 + + + ucrNudHeigth + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 9 True - 168, 368 + 168, 358 45, 20 @@ -748,64 +748,223 @@ $this - 5 + 11 - + True - + + True + + + 6, 13 + + + 426, 538 + + + GrowAndShrink + + + 212, 326 + + + 63, 21 + + + 107 + + + ucrColourFrom + + + instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + GrowAndShrink + + + 279, 325 + + + 63, 21 + + + 106 + + + ucrColourTo + + + instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + True + + NoControl - - 273, 54 + + 145, 326 - - 58, 13 + + 66, 17 - - 94 + + 105 - - Y Variable: + + From/To - - lblYvariable + + rdoFRomTo - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + + 3 + + + GrowAndShrink + + + 71, 326 + + + 63, 21 + + + 104 + + + ucrInputPalette + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 4 + + + True + + + 8, 330 + + + 58, 17 + + + 103 + + + Palette + + + rdoPalette + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + GrowAndShrink + + + 0, 322 + + + 373, 30 + + + 102 + + + ucrPnlPalette + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + 6 - + + GrowAndShrink + + + 316, 425 + + + 101, 21 + + + 91 + + + ucrInputStation + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 14 + + True - - 273, 72 + + 204, 426 - + 0, 0, 0, 0 - - 120, 20 + + 110, 26 - - 1 + + 90 - - ucrReceiverY + + ucr1stFactorReceiver - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 7 + + 15 GrowAndShrink @@ -829,7 +988,7 @@ $this - 11 + 17 True @@ -853,7 +1012,7 @@ $this - 12 + 18 True @@ -862,7 +1021,7 @@ NoControl - 8, 238 + 8, 242 149, 23 @@ -883,13 +1042,13 @@ $this - 13 + 19 True - 8, 339 + 8, 299 128, 23 @@ -907,13 +1066,13 @@ $this - 18 + 24 GrowAndShrink - 142, 339 + 139, 299 63, 21 @@ -931,13 +1090,13 @@ $this - 19 + 25 True - 273, 267 + 273, 271 0, 0, 0, 0 @@ -958,7 +1117,7 @@ $this - 21 + 27 GrowAndShrink @@ -985,7 +1144,7 @@ $this - 22 + 28 GrowAndShrink @@ -1009,7 +1168,7 @@ $this - 23 + 29 GrowAndShrink @@ -1033,13 +1192,13 @@ $this - 24 + 30 GrowAndShrink - 273, 112 + 273, 116 93, 21 @@ -1057,13 +1216,13 @@ $this - 25 + 31 True - 8, 51 + 8, 55 0, 0, 0, 0 @@ -1084,13 +1243,13 @@ $this - 26 + 32 True - 273, 72 + 273, 76 0, 0, 0, 0 @@ -1111,13 +1270,13 @@ $this - 28 + 34 True - 273, 112 + 273, 116 0, 0, 0, 0 @@ -1138,13 +1297,13 @@ $this - 30 + 36 True - 273, 151 + 273, 155 0, 0, 0, 0 @@ -1165,13 +1324,13 @@ $this - 33 + 39 GrowAndShrink - 273, 228 + 273, 232 93, 21 @@ -1189,13 +1348,13 @@ $this - 34 + 40 GrowAndShrink - 349, 398 + 349, 387 59, 23 @@ -1213,13 +1372,13 @@ $this - 35 + 41 GrowAndShrink - 168, 398 + 173, 387 52, 23 @@ -1237,13 +1396,13 @@ $this - 37 + 43 GrowAndShrink - 264, 398 + 269, 387 50, 23 @@ -1261,13 +1420,13 @@ $this - 39 + 45 True - 273, 189 + 273, 193 0, 0, 0, 0 @@ -1288,13 +1447,13 @@ $this - 41 + 47 True - 273, 189 + 273, 193 0, 0, 0, 0 @@ -1315,7 +1474,7 @@ $this - 43 + 49 True @@ -1339,13 +1498,13 @@ $this - 44 + 50 True - 8, 312 + 8, 274 166, 23 @@ -1363,13 +1522,13 @@ $this - 45 + 51 True - 8, 313 + 9, 272 166, 23 @@ -1387,7 +1546,7 @@ $this - 46 + 52 CenterScreen @@ -1425,28 +1584,28 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 204, 426 + + 273, 76 - + 0, 0, 0, 0 - - 110, 26 + + 120, 20 - - 90 + + 1 - - ucr1stFactorReceiver + + ucrReceiverY - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 9 + + 13 \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index 586d7e24498..db1fd1fcc12 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -53,7 +53,9 @@ Public Class dlgHeatMapPlot clsSizeChoroplethAesFunction, clsHeatmapAesFunction, clsChoroplethAesFunction, clsXlabsFunction, clsYlabFunction, clsXScalecontinuousFunction, clsYScalecontinuousFunction, clsRFacetFunction, clsThemeFunction, clsRoundFunction, clsXRangeFunction, clsYRangeFunction, clsXMeanFunction, clsYMeanFunction, clsGroupByFunction, - clsSummariseFunction, clsDummyFunction, clsGeomJitterFunction As New RFunction + clsSummariseFunction, clsDummyFunction, clsGeomJitterFunction, clsScalefillDistillerFunction, + clsFillBrewerFunction, clsScalefillgradientFunction As New RFunction + Private Sub dlgHeatMapPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -78,6 +80,7 @@ Public Class dlgHeatMapPlot Dim dctLabelSizes As New Dictionary(Of String, String) Dim dctColourPallette As New Dictionary(Of String, String) Dim dctLegendPosition As New Dictionary(Of String, String) + Dim dctPalette As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 476 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False @@ -86,18 +89,25 @@ Public Class dlgHeatMapPlot ucrPnlOptions.AddRadioButton(rdoHeatMap) ucrPnlOptions.AddRadioButton(rdoChoroplethMap) + ucrPnlPalette.AddRadioButton(rdoPalette) + ucrPnlPalette.AddRadioButton(rdoFRomTo) + ucrPnlOptions.AddParameterPresentCondition(rdoHeatMap, "geom_tile") ucrPnlOptions.AddParameterPresentCondition(rdoChoroplethMap, "geom_polygon") + ucrPnlPalette.AddParameterValuesCondition(rdoPalette, "Check", "palette") + ucrPnlPalette.AddParameterValuesCondition(rdoFRomTo, "Check", "gradient") + ucrPnlOptions.AddToLinkedControls({ucrChkAddLabels, ucrChkColourPalette}, {rdoHeatMap, rdoChoroplethMap}) ucrPnlOptions.AddToLinkedControls({ucrChkPoints, ucrReceiverFillChoropleth, ucrReceiverLongitude, ucrReceiverLatitude, ucrReceiverGroup}, {rdoChoroplethMap}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - ucrPnlOptions.AddToLinkedControls({ucrChkColourPalette, ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverPointsHeatMap, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrReceiverY}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrChkColourPalette, ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrReceiverY}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlPalette.AddToLinkedControls(ucrInputPalette, {rdoPalette}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blues") + ucrPnlPalette.AddToLinkedControls({ucrColourFrom, ucrColourTo}, {rdoFRomTo}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="black") ucrReceiverX.SetLinkedDisplayControl(lblXVariable) ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude) ucrReceiverLongitude.SetLinkedDisplayControl(lblLongitude) ucrReceiverFill.SetLinkedDisplayControl(lblFill) ucrReceiverFillChoropleth.SetLinkedDisplayControl(lblFillChoropleth) - ucrReceiverPointsHeatMap.SetLinkedDisplayControl(lblPointsOptional) ucrReceiverGroup.SetLinkedDisplayControl(lblGroup) ucrHeatMapSelector.SetParameter(New RParameter("data", 0)) @@ -142,16 +152,6 @@ Public Class dlgHeatMapPlot ucrReceiverFill.SetParameterIsString() ucrReceiverFill.bWithQuotes = False - ucrReceiverPointsHeatMap.Selector = ucrHeatMapSelector - ucrReceiverPointsHeatMap.SetParameter(New RParameter("size", 0)) - ucrReceiverPointsHeatMap.SetParameterIsString() - ucrReceiverPointsHeatMap.bWithQuotes = False - ucrReceiverPointsHeatMap.AddToLinkedControls(ucrNudShapeHeatMap, {True}, bNewLinkedHideIfParameterMissing:=True) - - ucrNudShapeHeatMap.SetParameter(New RParameter("size", 2)) - ucrNudShapeHeatMap.Visible = False - ucrNudShapeHeatMap.SetLinkedDisplayControl(lblPointsSize) - ucrSaveGraph.SetPrefix("heatmap") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetIsComboBox() @@ -185,6 +185,9 @@ Public Class dlgHeatMapPlot dctColourPallette.Add("Inferno", Chr(34) & "inferno" & Chr(34)) dctColourPallette.Add("Plasma", Chr(34) & "plasma" & Chr(34)) dctColourPallette.Add("Cividis", Chr(34) & "cividis" & Chr(34)) + dctColourPallette.Add("mako", Chr(34) & "mako" & Chr(34)) + dctColourPallette.Add("rocket", Chr(34) & "rocket" & Chr(34)) + dctColourPallette.Add("turbo", Chr(34) & "turbo" & Chr(34)) ucrInputColourPalette.SetItems(dctColourPallette) ucrInputColourPalette.SetDropDownStyleAsNonEditable() @@ -267,6 +270,50 @@ Public Class dlgHeatMapPlot ucrNudWidth.DecimalPlaces = 2 ucrNudWidth.SetLinkedDisplayControl(lblWidth) ucrNudWidth.SetRDefault(0.4) + + ucrInputPalette.SetParameter(New RParameter("palette", 10)) + ucrInputPalette.SetDropDownStyleAsNonEditable() + dctPalette.Add("Blues", Chr(34) & "Blues" & Chr(34)) + dctPalette.Add("Greens", Chr(34) & "Greens" & Chr(34)) + dctPalette.Add("Greys", Chr(34) & "Greys" & Chr(34)) + dctPalette.Add("Oranges", Chr(34) & "Oranges" & Chr(34)) + dctPalette.Add("Purples", Chr(34) & "Purples" & Chr(34)) + dctPalette.Add("Reds", Chr(34) & "Reds" & Chr(34)) + dctPalette.Add("BuGn", Chr(34) & "BuGn" & Chr(34)) + dctPalette.Add("BuPu", Chr(34) & "BuPu" & Chr(34)) + dctPalette.Add("GnBu", Chr(34) & "GnBu" & Chr(34)) + dctPalette.Add("OrRd", Chr(34) & "OrRd" & Chr(34)) + dctPalette.Add("PuBu", Chr(34) & "PuBu" & Chr(34)) + dctPalette.Add("PuBuGn", Chr(34) & "PuBuGn" & Chr(34)) + dctPalette.Add("PuRd", Chr(34) & "PuRd" & Chr(34)) + dctPalette.Add("RdPu", Chr(34) & "RdPu" & Chr(34)) + dctPalette.Add("YlGn", Chr(34) & "YlGn" & Chr(34)) + dctPalette.Add("YlGnBu", Chr(34) & "YlGnBu" & Chr(34)) + dctPalette.Add("YlOrBr", Chr(34) & "YlOrBr" & Chr(34)) + dctPalette.Add("YlOrRd", Chr(34) & "YlOrRd" & Chr(34)) + dctPalette.Add("Spectral", Chr(34) & "Spectral" & Chr(34)) + dctPalette.Add("BrBG", Chr(34) & "BrBG" & Chr(34)) + dctPalette.Add("PiYG", Chr(34) & "PiYG" & Chr(34)) + dctPalette.Add("PRGn", Chr(34) & "PRGn" & Chr(34)) + dctPalette.Add("PuOr", Chr(34) & "PuOr" & Chr(34)) + dctPalette.Add("RdBu", Chr(34) & "RdBu" & Chr(34)) + dctPalette.Add("RdGy", Chr(34) & "RdGy" & Chr(34)) + dctPalette.Add("RdYlBu", Chr(34) & "RdYlBu" & Chr(34)) + dctPalette.Add("RdYlGn", Chr(34) & "RdYlGn" & Chr(34)) + dctPalette.Add("Accent", Chr(34) & "Accent" & Chr(34)) + dctPalette.Add("Dark2", Chr(34) & "Dark2" & Chr(34)) + dctPalette.Add("Pastel1", Chr(34) & "Pastel1" & Chr(34)) + dctPalette.Add("Pastel2", Chr(34) & "Pastel2" & Chr(34)) + dctPalette.Add("Set1", Chr(34) & "Set1" & Chr(34)) + dctPalette.Add("Set2", Chr(34) & "Set2" & Chr(34)) + dctPalette.Add("Set3", Chr(34) & "Set3" & Chr(34)) + ucrInputPalette.SetItems(dctPalette) + + ucrColourFrom.SetParameter(New RParameter("low", 8)) + ucrColourFrom.SetColours() + + ucrColourTo.SetParameter(New RParameter("high", 9)) + ucrColourTo.SetColours() End Sub Private Sub SetDefaults() @@ -304,6 +351,9 @@ Public Class dlgHeatMapPlot clsFacetRowOp = New ROperator clsFacetColOp = New ROperator clsGeomJitterFunction = New RFunction + clsScalefillDistillerFunction = New RFunction + clsFillBrewerFunction = New RFunction + clsScalefillgradientFunction = New RFunction ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True @@ -375,6 +425,15 @@ Public Class dlgHeatMapPlot clsColourPaletteFunction.SetPackageName("viridis") clsColourPaletteFunction.SetRCommand("scale_fill_viridis") + clsScalefillDistillerFunction.SetPackageName("ggplot2") + clsScalefillDistillerFunction.SetRCommand("scale_fill_distiller") + + clsFillBrewerFunction.SetPackageName("ggplot2") + clsFillBrewerFunction.SetRCommand("scale_fill_brewer") + + clsScalefillgradientFunction.SetPackageName("ggplot2") + clsScalefillgradientFunction.SetRCommand("scale_fill_gradient") + clsForecatsReverseFunction.SetPackageName("forcats") clsForecatsReverseFunction.SetRCommand("fct_rev") @@ -399,6 +458,7 @@ Public Class dlgHeatMapPlot clsGroupFunction.SetRCommand("aes") clsDummyFunction.AddParameter("choropleth_geom_point", False, iPosition:=0) + clsDummyFunction.AddParameter("Check", "palette", iPosition:=1) clsPipeOperator.SetOperation("%>%") clsPipeOperator.AddParameter("data", ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) @@ -482,8 +542,6 @@ Public Class dlgHeatMapPlot ucrReceiverFillChoropleth.AddAdditionalCodeParameterPair(clsGroupByFunction, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) ucrReceiverFillChoropleth.AddAdditionalCodeParameterPair(clsLabelAesFunction, New RParameter("label", 0), iAdditionalPairNo:=3) - ucrReceiverPointsHeatMap.AddAdditionalCodeParameterPair(clsShapeHeatMapAesFunction, New RParameter("shape", 0), iAdditionalPairNo:=1) - ucrReceiverX.AddAdditionalCodeParameterPair(clsReorderFunction, New RParameter("x", 0), iAdditionalPairNo:=1) ucrReceiverY.AddAdditionalCodeParameterPair(clsReorderValueFunction, New RParameter("x", 0), iAdditionalPairNo:=1) @@ -492,6 +550,8 @@ Public Class dlgHeatMapPlot ucrReceiverLatitude.AddAdditionalCodeParameterPair(clsYRangeFunction, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrInputPalette.AddAdditionalCodeParameterPair(clsScalefillDistillerFunction, New RParameter("palette", 10)) + ucrSaveGraph.SetRCode(clsBaseOperator, bReset) ucrHeatMapSelector.SetRCode(clsRggplotFunction, bReset) @@ -510,8 +570,6 @@ Public Class dlgHeatMapPlot ucrInputSize.SetRCode(clsGeomTextFunction, bReset) ucrChkColourPalette.SetRCode(clsColourPaletteFunction, bReset) ucrInputColourPalette.SetRCode(clsColourPaletteFunction, bReset) - ucrReceiverPointsHeatMap.SetRCode(clsSizeHeatMapAesFunction, bReset) - ucrNudShapeHeatMap.SetRCode(clsGeomPointShapeHeatMapFunction, bReset) ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) @@ -519,7 +577,11 @@ Public Class dlgHeatMapPlot ucrNudHeigth.SetRCode(clsGeomJitterFunction, bReset) ucrNudWidth.SetRCode(clsGeomJitterFunction, bReset) ucrChkJitter.SetRCode(clsGeomJitterFunction, bReset) + ucrPnlPalette.SetRCode(clsDummyFunction, bReset) End If + ucrColourFrom.SetRCode(clsScalefillgradientFunction, bReset) + ucrColourTo.SetRCode(clsScalefillgradientFunction, bReset) + ucrInputPalette.SetRCode(clsFillBrewerFunction, bReset) bRCodeSet = True End Sub @@ -629,22 +691,6 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrReceiverPoints_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged - If bRCodeSet Then - clsBaseOperator.RemoveParameterByName("heatmap_geom_point") - MakeNudVisible() - If ucrReceiverPointsHeatMap.IsEmpty OrElse Not rdoHeatMap.Checked Then - Exit Sub - ElseIf ucrReceiverPointsHeatMap.strCurrDataType = "numeric" Then - clsBaseOperator.AddParameter("heatmap_geom_point", clsRFunctionParameter:=clsGeomPointSizeHeatMapFunction, iPosition:=7) - ElseIf ucrReceiverPointsHeatMap.strCurrDataType = "factor" Then - clsBaseOperator.AddParameter("heatmap_geom_point", clsRFunctionParameter:=clsGeomPointShapeHeatMapFunction, iPosition:=7) - Else - clsBaseOperator.RemoveParameterByName("heatmap_geom_point") - End If - End If - End Sub - Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrReceiverY.ControlValueChanged clsGeomTextFunction.RemoveParameterByName("data") clsLabelAesFunction.RemoveParameterByName("x") @@ -681,12 +727,6 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub MakeNudVisible() - If rdoHeatMap.Checked Then - ucrNudShapeHeatMap.Visible = If(Not ucrReceiverPointsHeatMap.IsEmpty AndAlso ucrReceiverPointsHeatMap.strCurrDataType = "factor", True, False) - End If - End Sub - Private Sub UpdateParameter() If rdoHeatMap.Checked Then Select Case ucrInputReorderValue.GetText() @@ -721,9 +761,9 @@ Public Class dlgHeatMapPlot Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged, ucrReceiverY.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrChkAddLabels.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged - MakeNudVisible() UpdateParameter() AddRemoveGeomParameter() + ChangePalette() End Sub Private Sub AutoFacetStation() @@ -910,4 +950,37 @@ Public Class dlgHeatMapPlot clsBaseOperator.RemoveParameterByName("geom_jitter") End If End Sub + + Private Sub ChangePalette() + If rdoPalette.Checked Then + If Not ucrReceiverFill.IsEmpty OrElse Not ucrReceiverFillChoropleth.IsEmpty Then + If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor" Then + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=2) + Else + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=2) + End If + Else + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=2) + End If + Else + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsScalefillgradientFunction.AddParameter("low", Chr(34) & ucrColourFrom.GetText() & Chr(34), iPosition:=0) + clsScalefillgradientFunction.AddParameter("high", Chr(34) & ucrColourTo.GetText() & Chr(34), iPosition:=1) + clsBaseOperator.AddParameter("scale_fill_gradient", clsRFunctionParameter:=clsScalefillgradientFunction, iPosition:=2) + End If + End Sub + + Private Sub ucrPnlPalette_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlPalette.ControlValueChanged, ucrInputPalette.ControlValueChanged, ucrColourFrom.ControlValueChanged, ucrColourTo.ControlValueChanged, ucrReceiverFillChoropleth.ControlValueChanged + ChangePalette() + End Sub End Class From dbe7ed33286ccb12d54bce238438594ece3dcf3e Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 4 Mar 2024 11:16:06 +0100 Subject: [PATCH 05/27] Minor change on the design --- instat/dlgHeatMapPlot.resx | 54 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index 3dfbfd47c7c..2beb0b496c7 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -187,7 +187,7 @@ NoControl - 126, 391 + 130, 391 47, 13 @@ -217,7 +217,7 @@ NoControl - 229, 391 + 233, 391 40, 13 @@ -247,7 +247,7 @@ NoControl - 322, 391 + 327, 391 30, 13 @@ -525,6 +525,15 @@ 17, 17 + + 164, 92 + + + contextMenuStripOptions + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 163, 22 @@ -549,15 +558,6 @@ Jitter Options - - 164, 92 - - - contextMenuStripOptions - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - True @@ -625,7 +625,7 @@ NoControl - 223, 360 + 233, 360 41, 13 @@ -655,7 +655,7 @@ NoControl - 120, 360 + 129, 360 38, 13 @@ -706,7 +706,7 @@ True - 264, 358 + 278, 358 45, 20 @@ -730,7 +730,7 @@ True - 168, 358 + 172, 358 45, 20 @@ -766,7 +766,7 @@ GrowAndShrink - 212, 326 + 286, 327 63, 21 @@ -790,7 +790,7 @@ GrowAndShrink - 279, 325 + 353, 327 63, 21 @@ -817,7 +817,7 @@ NoControl - 145, 326 + 216, 328 66, 17 @@ -844,7 +844,7 @@ GrowAndShrink - 71, 326 + 141, 327 63, 21 @@ -868,7 +868,7 @@ True - 8, 330 + 8, 328 58, 17 @@ -1048,7 +1048,7 @@ True - 8, 299 + 8, 301 128, 23 @@ -1072,7 +1072,7 @@ GrowAndShrink - 139, 299 + 141, 299 63, 21 @@ -1354,7 +1354,7 @@ GrowAndShrink - 349, 387 + 357, 387 59, 23 @@ -1378,7 +1378,7 @@ GrowAndShrink - 173, 387 + 177, 387 52, 23 @@ -1402,7 +1402,7 @@ GrowAndShrink - 269, 387 + 279, 387 50, 23 @@ -1480,7 +1480,7 @@ True - 8, 387 + 8, 389 128, 23 From 0b58f809a111c106a24fbd5f36d03ecea2b36860 Mon Sep 17 00:00:00 2001 From: n-thony Date: Mon, 11 Mar 2024 12:14:44 +0300 Subject: [PATCH 06/27] Correcting the error in the GetVariableNamesList in the defining the array --- instat/ucrReceiverMultiple.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 6a208b04135..5206b0554cd 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -322,7 +322,7 @@ Public Class ucrReceiverMultiple End Function Public Overrides Function GetVariableNamesList(Optional bWithQuotes As Boolean = True, Optional strQuotes As String = Chr(34)) As String() - Dim arrItems(lstSelectedVariables.Items.Count) As String + Dim arrItems(lstSelectedVariables.Items.Count - 1) As String Dim strQuoteHolder As String = If(bWithQuotes, strQuotes, "") For i = 0 To lstSelectedVariables.Items.Count - 1 arrItems(i) = strQuoteHolder & lstSelectedVariables.Items(i).Text & strQuoteHolder From e125cb1f3119808ada8639ddb971d84dbf7232f8 Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 14 Mar 2024 14:18:31 +0300 Subject: [PATCH 07/27] changes --- instat/ucrCalculator.vb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index f6c6adf25a2..90805d4f581 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -162,6 +162,13 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdQt, "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66") ttCalculator.SetToolTip(cmdqF, "F quantiles. For example qf(0.95,1,10) = 4.965; qf(0.95, 50,50)= 1.599") + ttCalculator.SetToolTip(cmdDeg, "Change for radians to degrees. For example deg(pi/2) = 90.") + ttCalculator.SetToolTip(cmdExp, "The exponential function. exp(1) = e = 2.71828. exp(0) = 1, exp(-2) = 0.1353 = 1/exp(2). It is the inverse of the log function, so exp(6.238) = 512, while log(512) = 6.238.") + ttCalculator.SetToolTip(cmdAbs, "The absolute (or positive) value. For example abs (-4.4) = abs(4.4) = 4.4.") + ttCalculator.SetToolTip(cmdSign, "The sign of the corresponding values. So sign(4.2)=1, sign(-20)=-1, sign(c(-2,-1,0,1,2,3))= (-1,-1,0,1,1,1)") + ttCalculator.SetToolTip(cmdLogit, "log(p/(1-p)) for p between 0 and 1, or between 0 and 100 if you have percentages. For example logit(c(0.2, 0.5, 0.95)) is (-1.386, 0, 2.944).") + ttCalculator.SetToolTip(cmdLogistic, "Distribution function for the logistic distribution. For example dlogis(c(-2,-1,0,1,2), 0, 5513) = (0.026, 0.14, 0.5, 0.86, 0.974). The scale of 0.5513 gives a standard deviation of 1.") + ttCalculator.SetToolTip(cmdAtan2, "atan2(x,y) gives the angle between the x axis and the vector between to origin and the point (x,y). For example atan2(1,1) = 0.7854 = pi/4 (=45 degrees).") ttCalculator.SetToolTip(cmdSqrt, "square root. For example sqrt(3) = 3 ^ 0.5 = 1.732") ttCalculator.SetToolTip(cmdCos, "cosine of angle in radians. For example cos(pi) = -1, cos(rad(90)) = (almost) 0.") ttCalculator.SetToolTip(cmdAcos, "angle corresponding to a given cosine (in the range 0 to pi). For example acos(0) = 1.57 = pi/2; deg(acos(-1))=180.") @@ -519,6 +526,7 @@ Public Class ucrCalculator Private Sub CalculationsOptions() Select Case ucrInputCalOptions.GetText Case "Maths" + ' strPackageName = "base" strPackageName = "stats" grpSummary.Visible = False grpMaths.Visible = True @@ -1800,7 +1808,7 @@ Public Class ucrCalculator Private Sub cmdMc_Click(sender As Object, e As EventArgs) Handles cmdMc.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("robustbase::mc(x = , na.rm = TRUE, doReflect = (length(x = ) <= 100),doScale = TRUE, maxit = 100, trace.lev = 0, full.result = FALSE)", 113) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("robustbase::mc(x = , na.rm = TRUE, doReflect = (length(x = ) <= 100),doScale = TRUE, maxit= 100, trace.lev= 0, full.result= FALSE)", 113) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("robustbase::mc( , na.rm = TRUE)", 16) End If @@ -4790,9 +4798,16 @@ Public Class ucrCalculator Private Sub cmdMathsHelp_Click(sender As Object, e As EventArgs) Handles cmdMathsHelp.Click, MathsStatsStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Maths" Then + strPackageName = "base" + OpenHelpPage() strPackageName = "stats" + OpenHelpPage() + 'strPackageName = "car" + 'OpenHelpPage() + 'strPackageName = "circular" + 'OpenHelpPage() End If - OpenHelpPage() + ' OpenHelpPage() End Sub Private Sub cmdTransformHelp_Click(sender As Object, e As EventArgs) Handles cmdTransformHelp.Click, FactorForcatsToolStripMenuItem.Click From 918c036d83b4593a8056e507667e61715fe273e1 Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 14 Mar 2024 16:01:28 +0300 Subject: [PATCH 08/27] changes --- instat/ucrCalculator.Designer.vb | 126 ++++++++++++++++++------------- instat/ucrCalculator.resx | 2 +- instat/ucrCalculator.vb | 32 +++++--- 3 files changed, 99 insertions(+), 61 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 49155781003..172ec0561d4 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -612,42 +612,45 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.grpBasic.SuspendLayout - Me.grpDates.SuspendLayout - Me.ContextMenuStripDate.SuspendLayout - Me.ContextMenuStripComplex.SuspendLayout - Me.grpInteger.SuspendLayout - Me.ContextMenuStripInteger.SuspendLayout - Me.grpFactor.SuspendLayout - Me.ContextMenuStripFactor.SuspendLayout - Me.grpHydroGOF.SuspendLayout - Me.ContextMenuStripHydroGOF.SuspendLayout - Me.grpWakefield.SuspendLayout - Me.grpMaths.SuspendLayout - Me.ContextMenuStripMaths.SuspendLayout - Me.grpSummary.SuspendLayout - Me.ContextMenuStripSummary.SuspendLayout - Me.grpFrequencies.SuspendLayout - Me.grpProbabilty.SuspendLayout - Me.ContextMenuStripProbability.SuspendLayout - Me.grpRandom.SuspendLayout - Me.grpTransform.SuspendLayout - Me.ContextMenuStripTransform.SuspendLayout - Me.grpLogical.SuspendLayout - Me.ContextMenuStripLogical.SuspendLayout - Me.grpTestString.SuspendLayout - Me.grpCircular.SuspendLayout - Me.ContextMenuStripCircular.SuspendLayout - Me.grpModifier.SuspendLayout - Me.grpSymbols.SuspendLayout - Me.grpComplex.SuspendLayout - Me.ContextMenuStripTxtString.SuspendLayout - Me.ContextMenuStripWakefield.SuspendLayout - Me.ContextMenuStripList.SuspendLayout - Me.grpList.SuspendLayout - Me.GroupBox1.SuspendLayout - Me.grpMathBloc.SuspendLayout - Me.SuspendLayout + Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MathsCarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MathsCirucarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.grpBasic.SuspendLayout() + Me.grpDates.SuspendLayout() + Me.ContextMenuStripDate.SuspendLayout() + Me.ContextMenuStripComplex.SuspendLayout() + Me.grpInteger.SuspendLayout() + Me.ContextMenuStripInteger.SuspendLayout() + Me.grpFactor.SuspendLayout() + Me.ContextMenuStripFactor.SuspendLayout() + Me.grpHydroGOF.SuspendLayout() + Me.ContextMenuStripHydroGOF.SuspendLayout() + Me.grpWakefield.SuspendLayout() + Me.grpMaths.SuspendLayout() + Me.ContextMenuStripMaths.SuspendLayout() + Me.grpSummary.SuspendLayout() + Me.ContextMenuStripSummary.SuspendLayout() + Me.grpFrequencies.SuspendLayout() + Me.grpProbabilty.SuspendLayout() + Me.ContextMenuStripProbability.SuspendLayout() + Me.grpRandom.SuspendLayout() + Me.grpTransform.SuspendLayout() + Me.ContextMenuStripTransform.SuspendLayout() + Me.grpLogical.SuspendLayout() + Me.ContextMenuStripLogical.SuspendLayout() + Me.grpTestString.SuspendLayout() + Me.grpCircular.SuspendLayout() + Me.ContextMenuStripCircular.SuspendLayout() + Me.grpModifier.SuspendLayout() + Me.grpSymbols.SuspendLayout() + Me.grpComplex.SuspendLayout() + Me.ContextMenuStripTxtString.SuspendLayout() + Me.ContextMenuStripWakefield.SuspendLayout() + Me.ContextMenuStripList.SuspendLayout() + Me.grpList.SuspendLayout() + Me.GroupBox1.SuspendLayout() + Me.grpMathBloc.SuspendLayout() + Me.SuspendLayout() ' 'lblExpression ' @@ -3027,14 +3030,14 @@ Partial Class ucrCalculator 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsStatsStripMenuItem}) + Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCirucarToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(109, 28) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(211, 128) ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(108, 24) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(210, 24) Me.MathsStatsStripMenuItem.Text = "stats" ' 'cmdAtan2 @@ -7308,6 +7311,24 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + 'MathsBaseStripMenuItem + ' + Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsBaseStripMenuItem.Text = "base" + ' + 'MathsCarToolStripMenuItem + ' + Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsCarToolStripMenuItem.Text = "car" + ' + 'MathsCirucarToolStripMenuItem + ' + Me.MathsCirucarToolStripMenuItem.Name = "MathsCirucarToolStripMenuItem" + Me.MathsCirucarToolStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsCirucarToolStripMenuItem.Text = "cirucar" + ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) @@ -7344,44 +7365,44 @@ Partial Class 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) @@ -7389,7 +7410,7 @@ Partial Class ucrCalculator Me.GroupBox1.ResumeLayout(False) Me.grpMathBloc.ResumeLayout(False) Me.ResumeLayout(False) - Me.PerformLayout + Me.PerformLayout() End Sub @@ -7973,4 +7994,7 @@ Partial Class ucrCalculator Friend WithEvents cmdwhichmax As Button Friend WithEvents cmdwheremax As Button Friend WithEvents cmdwhichmin As Button + Friend WithEvents MathsBaseStripMenuItem As ToolStripMenuItem + Friend WithEvents MathsCarToolStripMenuItem As ToolStripMenuItem + Friend WithEvents MathsCirucarToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index 4338810a0ad..876f47d358d 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -163,6 +163,6 @@ 759, 103 - 36 + 299 \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 90805d4f581..e89d5ab77c5 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -526,7 +526,6 @@ Public Class ucrCalculator Private Sub CalculationsOptions() Select Case ucrInputCalOptions.GetText Case "Maths" - ' strPackageName = "base" strPackageName = "stats" grpSummary.Visible = False grpMaths.Visible = True @@ -4795,19 +4794,34 @@ Public Class ucrCalculator OpenHelpPage() End Sub - Private Sub cmdMathsHelp_Click(sender As Object, e As EventArgs) Handles cmdMathsHelp.Click, MathsStatsStripMenuItem.Click + Private Sub cmdMathsHelp_Click(sender As Object, e As EventArgs) Handles cmdMathsHelp.Click, MathsBaseStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Maths" Then strPackageName = "base" - OpenHelpPage() + End If + OpenHelpPage() + End Sub + + + Private Sub MathsStatsStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsStatsStripMenuItem.Click + If ucrInputCalOptions.GetText = "Maths" Then strPackageName = "stats" - OpenHelpPage() - 'strPackageName = "car" - 'OpenHelpPage() - 'strPackageName = "circular" - 'OpenHelpPage() End If - ' OpenHelpPage() + OpenHelpPage() + End Sub + + Private Sub MathsCarToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsCarToolStripMenuItem.Click + If ucrInputCalOptions.GetText = "Maths" Then + strPackageName = "car" + End If + OpenHelpPage() + End Sub + + Private Sub MathsCirucarToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsCirucarToolStripMenuItem.Click + If ucrInputCalOptions.GetText = "Maths" Then + strPackageName = "circular" + End If + OpenHelpPage() End Sub Private Sub cmdTransformHelp_Click(sender As Object, e As EventArgs) Handles cmdTransformHelp.Click, FactorForcatsToolStripMenuItem.Click From b00a5e97b853b666e1f03c4083e23f43564330dd Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 14 Mar 2024 18:59:47 +0300 Subject: [PATCH 09/27] changes --- instat/dlgMergeAdditionalData.vb | 1 + instat/dlgTwoWayFrequencies.vb | 2 +- instat/dlgVisualizeData.vb | 20 +++++++++++++++++++- instat/frmMain.vb | 4 ++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb index cf5d43ecef7..3248859496b 100644 --- a/instat/dlgMergeAdditionalData.vb +++ b/instat/dlgMergeAdditionalData.vb @@ -45,6 +45,7 @@ Public Class dlgMergeAdditionalData End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 186 ucrToDataFrame.SetParameter(New RParameter("x", 0)) ucrToDataFrame.SetParameterIsRFunction() ucrToDataFrame.SetLabelText("To Data Frame:") diff --git a/instat/dlgTwoWayFrequencies.vb b/instat/dlgTwoWayFrequencies.vb index 1596adc64c1..9d07336cc92 100644 --- a/instat/dlgTwoWayFrequencies.vb +++ b/instat/dlgTwoWayFrequencies.vb @@ -48,7 +48,7 @@ Public Class dlgTwoWayFrequencies End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 415 + ucrBase.iHelpTopicID = 289 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrReceiverColumnFactor.Selector = ucrSelectorTwoWayFrequencies diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index edeeacaa4c1..0e1a6850d2e 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -17,6 +17,12 @@ Imports instat.Translations Public Class dlgVisualizeData + Public enumVisualizeMode As String = VisualizeMode.Prepare + Public Enum VisualizeMode + Prepare + Describe + Climatic + End Enum Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsVisDatFunction As New RFunction @@ -41,6 +47,7 @@ Public Class dlgVisualizeData SetDefaults() End If SetRCodeForControls(bReset) + SetHelpOptions() bReset = False autoTranslate(Me) TestOkEnabled() @@ -328,6 +335,17 @@ Public Class dlgVisualizeData End If End Sub + Private Sub SetHelpOptions() + Select Case enumVisualizeMode + Case VisualizeMode.Prepare + ucrBase.iHelpTopicID = 54 + Case VisualizeMode.Describe + ucrBase.iHelpTopicID = 600 + Case VisualizeMode.Climatic + ucrBase.iHelpTopicID = 524 + End Select + End Sub + Private Sub ucrNudMaximumSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudMaximumSize.ControlValueChanged MaximumDataPoint() End Sub @@ -407,7 +425,7 @@ Public Class dlgVisualizeData End If Dim lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList Dim strFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False) - If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not Lstvariable.Contains(StrFacetvariable) Then + If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not lstvariable.Contains(strFacetvariable) Then lstvariable.Add(strFacetvariable) End If clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 0396b97df68..1104e78f4bc 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2281,7 +2281,9 @@ Public Class frmMain End Sub Private Sub mnuPrepareCheckDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataVisualiseData.Click + dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Prepare dlgVisualizeData.ShowDialog() + ' ucrBase.iHelpTopicID = 54 End Sub Private Sub mnuClimaticCompareCalculation_Click(sender As Object, e As EventArgs) Handles mnuClimaticCompareCalculation.Click @@ -2485,6 +2487,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeOneVariableVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableVisualiseData.Click + dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Describe dlgVisualizeData.ShowDialog() End Sub @@ -2672,6 +2675,7 @@ Public Class frmMain End Sub Private Sub mnuClimaticExamineEditDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamineEditDataVisualiseData.Click + dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Climatic dlgVisualizeData.ShowDialog() End Sub From 0046de8c9279e7028b7c528309bd21c247d4e598 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 15 Mar 2024 15:58:16 +0100 Subject: [PATCH 10/27] Change made --- instat/dlgHeatMapPlot.Designer.vb | 157 ++++++--- instat/dlgHeatMapPlot.resx | 545 +++++++++++++++++++----------- instat/dlgHeatMapPlot.vb | 118 +++++-- 3 files changed, 532 insertions(+), 288 deletions(-) diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb index 6f41d8a598f..1d91d650e19 100644 --- a/instat/dlgHeatMapPlot.Designer.vb +++ b/instat/dlgHeatMapPlot.Designer.vb @@ -71,8 +71,6 @@ Partial Class dlgHeatMapPlot Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() Me.cmdOptions = New instat.ucrSplitButton() - Me.ucrChkColourPalette = New instat.ucrCheck() - Me.ucrInputColourPalette = New instat.ucrInputComboBox() Me.ucrReceiverFill = New instat.ucrReceiverSingle() Me.ucrSaveGraph = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() @@ -91,13 +89,21 @@ Partial Class dlgHeatMapPlot Me.ucrChkAddLabels = New instat.ucrCheck() Me.ucrChkPoints = New instat.ucrCheck() Me.ucrChkFlipCoordinates = New instat.ucrCheck() - Me.ucrPnlPalette = New instat.UcrPanel() - Me.rdoPalette = New System.Windows.Forms.RadioButton() - Me.ucrInputPalette = New instat.ucrInputComboBox() - Me.rdoFRomTo = New System.Windows.Forms.RadioButton() + Me.grpColour = New System.Windows.Forms.GroupBox() + Me.lblValue = New System.Windows.Forms.Label() + Me.ucrInputValue = New instat.ucrInputTextBox() + Me.lblTo = New System.Windows.Forms.Label() + Me.lblFrom = New System.Windows.Forms.Label() + Me.rdoViridis = New System.Windows.Forms.RadioButton() Me.ucrColourTo = New instat.ucrColors() Me.ucrColourFrom = New instat.ucrColors() + Me.ucrInputPalette = New instat.ucrInputComboBox() + Me.rdoPalette = New System.Windows.Forms.RadioButton() + Me.rdoGradient = New System.Windows.Forms.RadioButton() + Me.ucrPnlColour = New instat.UcrPanel() + Me.ucrInputColourPalette = New instat.ucrInputComboBox() Me.contextMenuStripOptions.SuspendLayout() + Me.grpColour.SuspendLayout() Me.SuspendLayout() ' 'lblXVariable @@ -304,20 +310,6 @@ Partial Class dlgHeatMapPlot Me.cmdOptions.Tag = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' - 'ucrChkColourPalette - ' - resources.ApplyResources(Me.ucrChkColourPalette, "ucrChkColourPalette") - Me.ucrChkColourPalette.Checked = False - Me.ucrChkColourPalette.Name = "ucrChkColourPalette" - ' - 'ucrInputColourPalette - ' - Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputColourPalette, "ucrInputColourPalette") - Me.ucrInputColourPalette.GetSetSelectedIndex = -1 - Me.ucrInputColourPalette.IsReadOnly = False - Me.ucrInputColourPalette.Name = "ucrInputColourPalette" - ' 'ucrReceiverFill ' resources.ApplyResources(Me.ucrReceiverFill, "ucrReceiverFill") @@ -453,32 +445,56 @@ Partial Class dlgHeatMapPlot Me.ucrChkFlipCoordinates.Checked = False Me.ucrChkFlipCoordinates.Name = "ucrChkFlipCoordinates" ' - 'ucrPnlPalette + 'grpColour ' - resources.ApplyResources(Me.ucrPnlPalette, "ucrPnlPalette") - Me.ucrPnlPalette.Name = "ucrPnlPalette" + Me.grpColour.Controls.Add(Me.lblValue) + Me.grpColour.Controls.Add(Me.lblTo) + Me.grpColour.Controls.Add(Me.ucrInputValue) + Me.grpColour.Controls.Add(Me.lblFrom) + Me.grpColour.Controls.Add(Me.rdoViridis) + Me.grpColour.Controls.Add(Me.ucrColourTo) + Me.grpColour.Controls.Add(Me.ucrColourFrom) + Me.grpColour.Controls.Add(Me.ucrInputPalette) + Me.grpColour.Controls.Add(Me.rdoPalette) + Me.grpColour.Controls.Add(Me.rdoGradient) + Me.grpColour.Controls.Add(Me.ucrPnlColour) + Me.grpColour.Controls.Add(Me.ucrInputColourPalette) + resources.ApplyResources(Me.grpColour, "grpColour") + Me.grpColour.Name = "grpColour" + Me.grpColour.TabStop = False ' - 'rdoPalette + 'lblValue ' - resources.ApplyResources(Me.rdoPalette, "rdoPalette") - Me.rdoPalette.Name = "rdoPalette" - Me.rdoPalette.TabStop = True - Me.rdoPalette.UseVisualStyleBackColor = True + resources.ApplyResources(Me.lblValue, "lblValue") + Me.lblValue.Name = "lblValue" + Me.lblValue.Tag = "" ' - 'ucrInputPalette + 'ucrInputValue ' - Me.ucrInputPalette.AddQuotesIfUnrecognised = True - resources.ApplyResources(Me.ucrInputPalette, "ucrInputPalette") - Me.ucrInputPalette.GetSetSelectedIndex = -1 - Me.ucrInputPalette.IsReadOnly = False - Me.ucrInputPalette.Name = "ucrInputPalette" + Me.ucrInputValue.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputValue, "ucrInputValue") + Me.ucrInputValue.IsMultiline = False + Me.ucrInputValue.IsReadOnly = False + Me.ucrInputValue.Name = "ucrInputValue" + ' + 'lblTo ' - 'rdoFRomTo + resources.ApplyResources(Me.lblTo, "lblTo") + Me.lblTo.Name = "lblTo" + Me.lblTo.Tag = "fill" ' - resources.ApplyResources(Me.rdoFRomTo, "rdoFRomTo") - Me.rdoFRomTo.Name = "rdoFRomTo" - Me.rdoFRomTo.TabStop = True - Me.rdoFRomTo.UseVisualStyleBackColor = True + 'lblFrom + ' + resources.ApplyResources(Me.lblFrom, "lblFrom") + Me.lblFrom.Name = "lblFrom" + Me.lblFrom.Tag = "" + ' + 'rdoViridis + ' + resources.ApplyResources(Me.rdoViridis, "rdoViridis") + Me.rdoViridis.Name = "rdoViridis" + Me.rdoViridis.TabStop = True + Me.rdoViridis.UseVisualStyleBackColor = True ' 'ucrColourTo ' @@ -496,16 +512,46 @@ Partial Class dlgHeatMapPlot Me.ucrColourFrom.IsReadOnly = False Me.ucrColourFrom.Name = "ucrColourFrom" ' + 'ucrInputPalette + ' + Me.ucrInputPalette.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputPalette, "ucrInputPalette") + Me.ucrInputPalette.GetSetSelectedIndex = -1 + Me.ucrInputPalette.IsReadOnly = False + Me.ucrInputPalette.Name = "ucrInputPalette" + ' + 'rdoPalette + ' + resources.ApplyResources(Me.rdoPalette, "rdoPalette") + Me.rdoPalette.Name = "rdoPalette" + Me.rdoPalette.TabStop = True + Me.rdoPalette.UseVisualStyleBackColor = True + ' + 'rdoGradient + ' + resources.ApplyResources(Me.rdoGradient, "rdoGradient") + Me.rdoGradient.Name = "rdoGradient" + Me.rdoGradient.TabStop = True + Me.rdoGradient.UseVisualStyleBackColor = True + ' + 'ucrPnlColour + ' + resources.ApplyResources(Me.ucrPnlColour, "ucrPnlColour") + Me.ucrPnlColour.Name = "ucrPnlColour" + ' + 'ucrInputColourPalette + ' + Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputColourPalette, "ucrInputColourPalette") + Me.ucrInputColourPalette.GetSetSelectedIndex = -1 + Me.ucrInputColourPalette.IsReadOnly = False + Me.ucrInputColourPalette.Name = "ucrInputColourPalette" + ' 'dlgHeatMapPlot ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrColourFrom) - Me.Controls.Add(Me.ucrColourTo) - Me.Controls.Add(Me.rdoFRomTo) - Me.Controls.Add(Me.ucrInputPalette) - Me.Controls.Add(Me.rdoPalette) - Me.Controls.Add(Me.ucrPnlPalette) + Me.Controls.Add(Me.grpColour) Me.Controls.Add(Me.ucrChkJitter) Me.Controls.Add(Me.lblHeith) Me.Controls.Add(Me.ucrNudHeigth) @@ -523,8 +569,6 @@ Partial Class dlgHeatMapPlot Me.Controls.Add(Me.lblFillChoropleth) Me.Controls.Add(Me.rdoChoroplethMap) Me.Controls.Add(Me.rdoHeatMap) - Me.Controls.Add(Me.ucrChkColourPalette) - Me.Controls.Add(Me.ucrInputColourPalette) Me.Controls.Add(Me.lblFill) Me.Controls.Add(Me.ucrReceiverFill) Me.Controls.Add(Me.ucrSaveGraph) @@ -557,6 +601,8 @@ Partial Class dlgHeatMapPlot Me.MinimizeBox = False Me.Name = "dlgHeatMapPlot" Me.contextMenuStripOptions.ResumeLayout(False) + Me.grpColour.ResumeLayout(False) + Me.grpColour.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -575,8 +621,6 @@ Partial Class dlgHeatMapPlot Friend WithEvents ucrInputColour As ucrInputComboBox Friend WithEvents ucrInputSize As ucrInputComboBox Friend WithEvents lblLabelSize As Label - Friend WithEvents ucrInputColourPalette As ucrInputComboBox - Friend WithEvents ucrChkColourPalette As ucrCheck Friend WithEvents lblReorderVariableX As Label Friend WithEvents ucrInputReorderVariableX As ucrInputComboBox Friend WithEvents ucrInputReorderValue As ucrInputComboBox @@ -612,10 +656,17 @@ Partial Class dlgHeatMapPlot Friend WithEvents ucrNudWidth As ucrNud Friend WithEvents ucrChkJitter As ucrCheck Friend WithEvents toolStripMenuItemJitterOptions As ToolStripMenuItem - Friend WithEvents rdoPalette As RadioButton - Friend WithEvents ucrPnlPalette As UcrPanel - Friend WithEvents rdoFRomTo As RadioButton - Friend WithEvents ucrInputPalette As ucrInputComboBox Friend WithEvents ucrColourFrom As ucrColors Friend WithEvents ucrColourTo As ucrColors + Friend WithEvents rdoGradient As RadioButton + Friend WithEvents grpColour As GroupBox + Friend WithEvents rdoViridis As RadioButton + Friend WithEvents ucrInputPalette As ucrInputComboBox + Friend WithEvents rdoPalette As RadioButton + Friend WithEvents ucrPnlColour As UcrPanel + Friend WithEvents ucrInputColourPalette As ucrInputComboBox + Friend WithEvents lblTo As Label + Friend WithEvents lblFrom As Label + Friend WithEvents lblValue As Label + Friend WithEvents ucrInputValue As ucrInputTextBox End Class \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx index 2beb0b496c7..c37e692f683 100644 --- a/instat/dlgHeatMapPlot.resx +++ b/instat/dlgHeatMapPlot.resx @@ -127,7 +127,7 @@ - 273, 177 + 273, 164 58, 13 @@ -148,7 +148,7 @@ $this - 35 + 28 True @@ -157,7 +157,7 @@ NoControl - 273, 255 + 273, 242 22, 13 @@ -178,7 +178,7 @@ $this - 26 + 19 True @@ -187,7 +187,7 @@ NoControl - 130, 391 + 130, 415 47, 13 @@ -208,7 +208,7 @@ $this - 42 + 35 True @@ -217,7 +217,7 @@ NoControl - 233, 391 + 233, 415 40, 13 @@ -238,7 +238,7 @@ $this - 44 + 37 True @@ -247,7 +247,7 @@ NoControl - 327, 391 + 327, 415 30, 13 @@ -268,7 +268,7 @@ $this - 46 + 39 True @@ -277,7 +277,7 @@ NoControl - 273, 216 + 273, 203 48, 13 @@ -298,7 +298,7 @@ $this - 48 + 41 True @@ -307,7 +307,7 @@ NoControl - 273, 100 + 273, 87 48, 13 @@ -328,7 +328,7 @@ $this - 38 + 31 Button @@ -340,7 +340,7 @@ NoControl - 206, 12 + 206, 8 110, 28 @@ -364,7 +364,7 @@ $this - 22 + 17 Button @@ -376,7 +376,7 @@ NoControl - 99, 12 + 99, 8 110, 28 @@ -400,7 +400,7 @@ $this - 23 + 18 True @@ -409,7 +409,7 @@ NoControl - 273, 57 + 273, 44 57, 13 @@ -430,7 +430,7 @@ $this - 33 + 26 True @@ -439,7 +439,7 @@ NoControl - 273, 100 + 273, 87 48, 13 @@ -460,7 +460,7 @@ $this - 37 + 30 True @@ -469,7 +469,7 @@ NoControl - 273, 139 + 273, 126 22, 13 @@ -490,7 +490,7 @@ $this - 21 + 16 True @@ -499,7 +499,7 @@ NoControl - 274, 177 + 274, 164 55, 13 @@ -520,7 +520,7 @@ $this - 20 + 15 17, 17 @@ -565,7 +565,7 @@ NoControl - 207, 410 + 207, 434 52, 13 @@ -586,7 +586,7 @@ $this - 16 + 11 True @@ -595,7 +595,7 @@ NoControl - 273, 58 + 273, 45 58, 13 @@ -616,7 +616,7 @@ $this - 12 + 7 True @@ -625,7 +625,7 @@ NoControl - 233, 360 + 233, 384 41, 13 @@ -646,7 +646,7 @@ $this - 8 + 3 True @@ -655,7 +655,7 @@ NoControl - 129, 360 + 129, 384 38, 13 @@ -676,13 +676,13 @@ $this - 10 + 5 True - 8, 358 + 8, 382 113, 23 @@ -700,13 +700,13 @@ $this - 7 + 2 True - 278, 358 + 278, 382 45, 20 @@ -724,13 +724,13 @@ $this - 9 + 4 True - 172, 358 + 172, 382 45, 20 @@ -748,7 +748,7 @@ $this - 11 + 6 True @@ -760,43 +760,163 @@ 6, 13 - 426, 538 + 426, 568 - - GrowAndShrink + + True - - 286, 327 + + NoControl - - 63, 21 + + 70, 71 - - 107 + + 42, 13 - - ucrColourFrom + + 121 - - instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + Values: - - $this + + lblValue - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 0 + + + True + + + NoControl + + + 174, 71 + + + 23, 13 + + + 120 + + + To: + + + lblTo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + 1 + + True + + + 116, 68 + + + 135, 21 + + + 104 + + + ucrInputValue + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpColour + + + 2 + + + True + + + NoControl + + + 72, 71 + + + 33, 13 + + + 119 + + + From: + + + lblFrom + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 3 + + + True + + + NoControl + + + 7, 16 + + + 52, 17 + + + 118 + + + Viridis + + + rdoViridis + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour + + + 4 + GrowAndShrink - 353, 327 + 200, 67 63, 21 - 106 + 113 ucrColourTo @@ -805,52 +925,46 @@ instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - $this + grpColour - 2 - - - True - - - NoControl + 5 - - 216, 328 + + GrowAndShrink - - 66, 17 + + 106, 67 - - 105 + + 63, 21 - - From/To + + 114 - - rdoFRomTo + + ucrColourFrom - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrColors, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - $this + + grpColour - - 3 + + 6 GrowAndShrink - 141, 327 + 129, 41 63, 21 - 104 + 117 ucrInputPalette @@ -859,22 +973,25 @@ instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - $this + grpColour - 4 + 7 True + + NoControl + - 8, 328 + 6, 42 58, 17 - 103 + 116 Palette @@ -886,40 +1003,118 @@ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this + grpColour - 5 + 8 + + + True + + + NoControl + + + 6, 69 + + + 65, 17 + + + 112 + + + Gradient + + + rdoGradient + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpColour - + + 9 + + GrowAndShrink - - 0, 322 + + 4, 13 - - 373, 30 + + 92, 77 - - 102 + + 115 - - ucrPnlPalette + + ucrPnlColour - + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + + grpColour + + + 10 + + + GrowAndShrink + + + 129, 14 + + + 63, 21 + + + 109 + + + ucrInputColourPalette + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpColour + + + 11 + + + 8, 280 + + + 266, 96 + + + 103 + + + Colour + + + grpColour + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 6 + + 1 GrowAndShrink - 316, 425 + 316, 449 101, 21 @@ -937,13 +1132,13 @@ $this - 14 + 9 True - 204, 426 + 204, 450 0, 0, 0, 0 @@ -964,13 +1159,13 @@ $this - 15 + 10 GrowAndShrink - 86, 425 + 86, 449 112, 21 @@ -988,13 +1183,13 @@ $this - 17 + 12 True - 8, 426 + 8, 450 98, 24 @@ -1012,7 +1207,7 @@ $this - 18 + 13 True @@ -1021,7 +1216,7 @@ NoControl - 8, 242 + 8, 229 149, 23 @@ -1042,61 +1237,13 @@ $this - 19 - - - True - - - 8, 301 - - - 128, 23 - - - 35 - - - ucrChkColourPalette - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 24 - - - GrowAndShrink - - - 141, 299 - - - 63, 21 - - - 36 - - - ucrInputColourPalette - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 25 + 14 True - 273, 271 + 273, 258 0, 0, 0, 0 @@ -1117,13 +1264,13 @@ $this - 27 + 20 GrowAndShrink - 8, 453 + 8, 477 4, 5, 4, 5 @@ -1144,13 +1291,13 @@ $this - 28 + 21 GrowAndShrink - 8, 487 + 8, 511 410, 58 @@ -1168,13 +1315,13 @@ $this - 29 + 22 GrowAndShrink - 99, 5 + 99, 3 217, 43 @@ -1192,13 +1339,13 @@ $this - 30 + 23 GrowAndShrink - 273, 116 + 273, 103 93, 21 @@ -1216,13 +1363,13 @@ $this - 31 + 24 True - 8, 55 + 8, 42 0, 0, 0, 0 @@ -1243,13 +1390,13 @@ $this - 32 + 25 True - 273, 76 + 273, 63 0, 0, 0, 0 @@ -1270,13 +1417,13 @@ $this - 34 + 27 True - 273, 116 + 273, 103 0, 0, 0, 0 @@ -1297,13 +1444,13 @@ $this - 36 + 29 True - 273, 155 + 273, 142 0, 0, 0, 0 @@ -1324,13 +1471,13 @@ $this - 39 + 32 GrowAndShrink - 273, 232 + 273, 219 93, 21 @@ -1348,13 +1495,13 @@ $this - 40 + 33 GrowAndShrink - 357, 387 + 357, 411 59, 23 @@ -1372,13 +1519,13 @@ $this - 41 + 34 GrowAndShrink - 177, 387 + 177, 411 52, 23 @@ -1396,13 +1543,13 @@ $this - 43 + 36 GrowAndShrink - 279, 387 + 279, 411 50, 23 @@ -1420,13 +1567,13 @@ $this - 45 + 38 True - 273, 193 + 273, 180 0, 0, 0, 0 @@ -1447,13 +1594,13 @@ $this - 47 + 40 True - 273, 193 + 273, 180 0, 0, 0, 0 @@ -1474,13 +1621,13 @@ $this - 49 + 42 True - 8, 389 + 8, 413 128, 23 @@ -1498,13 +1645,13 @@ $this - 50 + 43 True - 8, 274 + 9, 257 166, 23 @@ -1522,13 +1669,13 @@ $this - 51 + 44 True - 9, 272 + 9, 257 166, 23 @@ -1546,7 +1693,7 @@ $this - 52 + 45 CenterScreen @@ -1585,7 +1732,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 273, 76 + 273, 63 0, 0, 0, 0 @@ -1606,6 +1753,6 @@ $this - 13 + 8 \ No newline at end of file diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index e5d915c38db..924be4c1748 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -54,8 +54,11 @@ Public Class dlgHeatMapPlot clsXScalecontinuousFunction, clsYScalecontinuousFunction, clsRFacetFunction, clsThemeFunction, clsRoundFunction, clsXRangeFunction, clsYRangeFunction, clsXMeanFunction, clsYMeanFunction, clsGroupByFunction, clsSummariseFunction, clsDummyFunction, clsGeomJitterFunction, clsScalefillDistillerFunction, - clsFillBrewerFunction, clsScalefillgradientFunction As New RFunction + clsFillBrewerFunction, clsScalefillmanualFunction, clsScalefillgradientFunction As New RFunction + Private Sub AllControlsContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveGraph.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrInputColour.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged + + End Sub Private Sub dlgHeatMapPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -89,20 +92,25 @@ Public Class dlgHeatMapPlot ucrPnlOptions.AddRadioButton(rdoHeatMap) ucrPnlOptions.AddRadioButton(rdoChoroplethMap) - ucrPnlPalette.AddRadioButton(rdoPalette) - ucrPnlPalette.AddRadioButton(rdoFRomTo) + ucrPnlColour.AddRadioButton(rdoViridis) + ucrPnlColour.AddRadioButton(rdoPalette) + ucrPnlColour.AddRadioButton(rdoGradient) ucrPnlOptions.AddParameterPresentCondition(rdoHeatMap, "geom_tile") ucrPnlOptions.AddParameterPresentCondition(rdoChoroplethMap, "geom_polygon") - ucrPnlPalette.AddParameterValuesCondition(rdoPalette, "Check", "palette") - ucrPnlPalette.AddParameterValuesCondition(rdoFRomTo, "Check", "gradient") + ucrPnlColour.AddParameterValuesCondition(rdoPalette, "Check", "palette") + ucrPnlColour.AddParameterValuesCondition(rdoViridis, "Check", "viridis") + ucrPnlColour.AddParameterValuesCondition(rdoGradient, "Check", "gradient") - ucrPnlOptions.AddToLinkedControls({ucrChkAddLabels, ucrChkColourPalette}, {rdoHeatMap, rdoChoroplethMap}) + ucrPnlOptions.AddToLinkedControls(ucrChkAddLabels, {rdoHeatMap, rdoChoroplethMap}) ucrPnlOptions.AddToLinkedControls({ucrChkPoints, ucrReceiverFillChoropleth, ucrReceiverLongitude, ucrReceiverLatitude, ucrReceiverGroup}, {rdoChoroplethMap}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - ucrPnlOptions.AddToLinkedControls({ucrChkColourPalette, ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrReceiverY}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlPalette.AddToLinkedControls(ucrInputPalette, {rdoPalette}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blues") - ucrPnlPalette.AddToLinkedControls({ucrColourFrom, ucrColourTo}, {rdoFRomTo}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="black") + ucrPnlOptions.AddToLinkedControls({ucrChkFlipCoordinates, ucrInputReorderValue, ucrReceiverFill, ucrInputReorderVariableX, ucrReceiverX, ucrReceiverY}, {rdoHeatMap}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls(ucrPnlColour, {rdoHeatMap, rdoChoroplethMap}) + ucrPnlColour.AddToLinkedControls(ucrInputPalette, {rdoPalette}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blues") + ucrPnlColour.AddToLinkedControls(ucrInputColourPalette, {rdoViridis}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") + ucrPnlColour.AddToLinkedControls({ucrColourFrom, ucrColourTo}, {rdoGradient}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Black") + ucrPnlColour.AddToLinkedControls(ucrInputValue, {rdoGradient}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="") ucrReceiverX.SetLinkedDisplayControl(lblXVariable) ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude) ucrReceiverLongitude.SetLinkedDisplayControl(lblLongitude) @@ -195,16 +203,11 @@ Public Class dlgHeatMapPlot ucrChkPoints.AddParameterValuesCondition(True, "choropleth_geom_point", "True") ucrChkPoints.AddParameterValuesCondition(False, "choropleth_geom_point", "False") - ucrChkColourPalette.SetText("Colour Palette") - ucrChkColourPalette.AddParameterPresentCondition(True, "option") - ucrChkColourPalette.AddParameterPresentCondition(False, "option", False) - ucrChkAddLabels.SetText("Add Labels") ucrChkAddLabels.AddParameterPresentCondition(True, "geom_text") ucrChkAddLabels.AddParameterPresentCondition(False, "geom_text", False) ucrChkAddLabels.AddToLinkedControls({ucrInputPosition, ucrInputSize, ucrInputColour}, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourPalette.AddToLinkedControls({ucrInputColourPalette}, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") ucrInputColour.SetLinkedDisplayControl(lblLabelColour) ucrInputPosition.SetLinkedDisplayControl(lblLabelPosition) ucrInputSize.SetLinkedDisplayControl(lblLabelSize) @@ -311,9 +314,15 @@ Public Class dlgHeatMapPlot ucrColourFrom.SetParameter(New RParameter("low", 8)) ucrColourFrom.SetColours() + ucrColourFrom.SetLinkedDisplayControl(lblFrom) ucrColourTo.SetParameter(New RParameter("high", 9)) ucrColourTo.SetColours() + ucrColourTo.SetLinkedDisplayControl(lblTo) + + ucrInputValue.SetParameter(New RParameter("values", )) + ucrInputValue.SetValidationTypeAsList() + ucrInputValue.SetLinkedDisplayControl(lblValue) End Sub Private Sub SetDefaults() @@ -458,7 +467,7 @@ Public Class dlgHeatMapPlot clsGroupFunction.SetRCommand("aes") clsDummyFunction.AddParameter("choropleth_geom_point", False, iPosition:=0) - clsDummyFunction.AddParameter("Check", "palette", iPosition:=1) + clsDummyFunction.AddParameter("Check", "viridis", iPosition:=1) clsPipeOperator.SetOperation("%>%") clsPipeOperator.AddParameter("data", ucrHeatMapSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) @@ -484,6 +493,10 @@ Public Class dlgHeatMapPlot clsYRangeFunction.SetRCommand("range") + clsScalefillmanualFunction = New RFunction + clsScalefillmanualFunction.SetRCommand("scale_fill_manual") + clsScalefillmanualFunction.AddParameter("aesthetics", Chr(34) & "fill" & Chr(34), iPosition:=1) + clsGeomPointSizeChoroplethFunction.SetPackageName("ggplot2") clsGeomPointSizeChoroplethFunction.SetRCommand("geom_point") clsGeomPointSizeChoroplethFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0) @@ -568,7 +581,6 @@ Public Class dlgHeatMapPlot ucrInputColour.SetRCode(clsGeomTextFunction, bReset) ucrInputPosition.SetRCode(clsGeomTextFunction, bReset) ucrInputSize.SetRCode(clsGeomTextFunction, bReset) - ucrChkColourPalette.SetRCode(clsColourPaletteFunction, bReset) ucrInputColourPalette.SetRCode(clsColourPaletteFunction, bReset) ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) @@ -577,11 +589,12 @@ Public Class dlgHeatMapPlot ucrNudHeigth.SetRCode(clsGeomJitterFunction, bReset) ucrNudWidth.SetRCode(clsGeomJitterFunction, bReset) ucrChkJitter.SetRCode(clsGeomJitterFunction, bReset) - ucrPnlPalette.SetRCode(clsDummyFunction, bReset) + ucrPnlColour.SetRCode(clsDummyFunction, bReset) End If ucrColourFrom.SetRCode(clsScalefillgradientFunction, bReset) ucrColourTo.SetRCode(clsScalefillgradientFunction, bReset) ucrInputPalette.SetRCode(clsFillBrewerFunction, bReset) + ucrInputValue.SetRCode(clsScalefillmanualFunction, bReset, bCloneIfNeeded:=True) bRCodeSet = True End Sub @@ -683,14 +696,6 @@ Public Class dlgHeatMapPlot End If End Sub - Private Sub ucrChkColourPalette_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColourPalette.ControlValueChanged - If ucrChkColourPalette.Checked Then - clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) - Else - clsBaseOperator.RemoveParameterByName("palette") - End If - End Sub - Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrReceiverX.ControlValueChanged, ucrReceiverFill.ControlValueChanged, ucrInputReorderVariableX.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrReceiverY.ControlValueChanged clsGeomTextFunction.RemoveParameterByName("data") clsLabelAesFunction.RemoveParameterByName("x") @@ -764,6 +769,7 @@ Public Class dlgHeatMapPlot UpdateParameter() AddRemoveGeomParameter() ChangePalette() + Visibility() End Sub Private Sub AutoFacetStation() @@ -951,36 +957,76 @@ Public Class dlgHeatMapPlot End If End Sub + Private Sub Visibility() + If rdoGradient.Checked Then + ucrInputValue.Visible = (ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor") + ucrColourFrom.Visible = Not (ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor") + ucrColourTo.Visible = Not (ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor") + Else + ucrColourFrom.Visible = False + ucrColourTo.Visible = False + ucrInputValue.Visible = False + End If + End Sub + Private Sub ChangePalette() - If rdoPalette.Checked Then + If rdoViridis.Checked Then + clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + ElseIf rdoPalette.Checked Then + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") If Not ucrReceiverFill.IsEmpty OrElse Not ucrReceiverFillChoropleth.IsEmpty Then If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor" Then - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") clsBaseOperator.RemoveParameterByName("scale_fill_distiller") clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=2) Else clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=2) End If Else clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") - clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) - clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=2) + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") End If - Else + ElseIf rdoGradient.Checked Then + clsBaseOperator.RemoveParameterByName("palette") clsBaseOperator.RemoveParameterByName("scale_fill_brewer") clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - clsScalefillgradientFunction.AddParameter("low", Chr(34) & ucrColourFrom.GetText() & Chr(34), iPosition:=0) - clsScalefillgradientFunction.AddParameter("high", Chr(34) & ucrColourTo.GetText() & Chr(34), iPosition:=1) - clsBaseOperator.AddParameter("scale_fill_gradient", clsRFunctionParameter:=clsScalefillgradientFunction, iPosition:=2) + If Not ucrReceiverFill.IsEmpty OrElse Not ucrReceiverFillChoropleth.IsEmpty Then + If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor" Then + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + If Not ucrInputValue.IsEmpty() Then + clsScalefillmanualFunction.AddParameter("values", ucrInputValue.clsRList.ToScript(), iPosition:=0) + clsBaseOperator.AddParameter("scale_fill_manual", clsRFunctionParameter:=clsScalefillmanualFunction, iPosition:=2) + Else + clsScalefillmanualFunction.RemoveParameterByName("values") + End If + Else + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + If Not ucrColourTo.IsEmpty AndAlso Not ucrColourFrom.IsEmpty Then + clsScalefillgradientFunction.AddParameter("low", Chr(34) & ucrColourFrom.GetText() & Chr(34), iPosition:=0) + clsScalefillgradientFunction.AddParameter("high", Chr(34) & ucrColourTo.GetText() & Chr(34), iPosition:=1) + clsBaseOperator.AddParameter("scale_fill_gradient", clsRFunctionParameter:=clsScalefillgradientFunction, iPosition:=2) + Else + clsScalefillgradientFunction.RemoveParameterByName("low") + clsScalefillgradientFunction.RemoveParameterByName("high") + End If + End If + Else + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + End If End If End Sub - Private Sub ucrPnlPalette_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlPalette.ControlValueChanged, ucrInputPalette.ControlValueChanged, ucrColourFrom.ControlValueChanged, ucrColourTo.ControlValueChanged, ucrReceiverFillChoropleth.ControlValueChanged + Private Sub ucrPnlColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColour.ControlValueChanged, ucrInputPalette.ControlValueChanged, ucrInputColourPalette.ControlValueChanged, ucrInputValue.ControlValueChanged, ucrColourFrom.ControlValueChanged, ucrColourTo.ControlValueChanged ChangePalette() + Visibility() End Sub End Class From 5688d49b5f4569fc77ac2ea2c3726149f1e91b32 Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 15 Mar 2024 18:17:44 +0300 Subject: [PATCH 11/27] Updated R Packages --- .../static/InstatObject/R/InstallPackages.R | 147 +++++----- instat/static/InstatObject/R/Rsetup.R | 251 +++++++++--------- 2 files changed, 201 insertions(+), 197 deletions(-) diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 711d1442ee2..c1e29a3c110 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -23,75 +23,76 @@ packs <- c("abind", "agricolae", "agridat", "blob", "boot", "brew", "brio", "broom", "bslib", "ca", "cachem", "callr", "candisc", "car", "carData", "caret", "cellranger", - "changepoint", "checkmate", "chillR", "chron", - "circlize", "CircStats", "circular", "class", - "classInt", "cli", "clifro", "climdex.pcic", - "clipr", "clock", "clue", "cluster", - "cmsaf", "cmsafops", "cmsafvis", "coda", - "codetools", "coin", "collapse", "colorRamps", - "colorspace", "colourpicker", "combinat", "commonmark", - "conf.design", "confintr", "contfrac", "corrplot", - "corrr", "countrycode", "cowplot", "cpp11", - "crayon", "credentials", "crosstalk", "cubature", - "curl", "DAAG", "dae", "data.table", - "datasauRus", "datawizard", "date", "DBI", - "deldir", "dendextend", "DEoptimR", "desc", - "DescTools", "deSolve", "desplot", "devtools", - "diagram", "diffobj", "digest", "distillery", - "distributional", "dotCall64", "downlit", "dplyr", - "dslabs", "DT", "dtw", "dygraphs", "e1071", - "ecmwfr", "effectsize", "ellipse", "ellipsis", - "elliptic", "emmeans", "EnvStats", "estimability", - "evaluate", "Evapotranspiration", "Exact", - "exactRankTests", "expm", "extraDistr", "extrafont", - "extrafontdb", "extRemes", "factoextra", "FactoMineR", - "fansi", "faraway", "farver", "fastDummies", - "fastmap", "fields", "filelock", "fitdistrplus", - "fivethirtyeight", "flashClust", "FNN", "fontawesome", - "forcats", "foreach", "forecast", "foreign", - "formattable", "formula.tools", "Formula", - "fracdiff", "fs", "future.apply", "future", - "gapminder", "gclus", "gcookbook", "generics", - "GenSA", "geomtextpath", "geosphere", "gert", - "getPass", "GGally", "ggalt", "ggeffects", - "ggfittext", "ggforce", "ggformula", "ggfortify", - "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", - "ggpp", "ggpubr", "ggrepel", "ggridges", - "ggsci", "ggsignif", "ggstance", "ggtext", - "ggthemes", "ggwordcloud", "gh", "gitcreds", - "gld", "GlobalOptions", "globals", "glue", - "gmp", "gnm", "goftest", "gower", "gridExtra", - "gridGraphics", "gridtext", "gstat", "gt", - "gtable", "gtExtras", "gtools", "hardhat", - "haven", "heplots", "here", "hexbin", - "HH", "highr", "HistData", "Hmisc", "hms", - "htmlTable", "htmltools", "htmlwidgets", "httpuv", - "httr", "httr2", "hydroGOF", "hydroTSM", - "hypergeo", "igraph", "imputeTS", "infer", - "ini", "inline", "insight", "interp", - "intervals", "ipred", "ISLR", "isoband", - "iterators", "janeaustenr", "janitor", "jpeg", - "jquerylib", "jsonlite", "juicyjuice", "Kendall", - "KernSmooth", "keyring", "klaR", "knitr", - "labeling", "labelled", "Lahman", "later", - "lattice", "latticeExtra", "lava", "lazyeval", - "leaps", "lemon", "libcoin", "lifecycle", - "listenv", "lme4", "lmerTest", "lmodel2", - "lmom", "lmomco", "Lmoments", "lmtest", - "loo", "lubridate", "lwgeom", "magick", - "magrittr", "mapdata", "mapproj", "maps", - "maptools", "markdown", "MASS", "Matrix", - "MatrixModels", "matrixStats", "mc2d", "memoise", - "metR", "mgcv", "mice", "miceadds", "mime", - "miniUI", "minqa", "mitools", "MKdescr", - "MKinfer", "mlbench", "modeldata", "ModelMetrics", - "modelr", "modeltools", "moderndive", "mosaic", - "mosaicCore", "mosaicData", "multcomp", "multcompView", - "munsell", "mvtnorm", "ncdf4.helpers", "ncdf4", - "nlme", "nloptr", "nnet", "nortest", - "numDeriv", "nycflights13", "openair", "openssl", - "openxlsx", "operator.tools", "paletteer", - "parallelly", "parameters", "patchwork", "pbapply", + "CGPfunctions", "changepoint", "checkmate", + "chillR", "chron", "circlize", "CircStats", + "circular", "class", "classInt", "cli", + "clifro", "climdex.pcic", "clipr", "clock", + "clue", "cluster", "cmsaf", "cmsafops", + "cmsafvis", "coda", "codetools", "coin", + "collapse", "colorRamps", "colorspace", "colourpicker", + "combinat", "commonmark", "conf.design", "confintr", + "contfrac", "corrplot", "corrr", "countrycode", + "cowplot", "cpp11", "crayon", "credentials", + "crosstalk", "cubature", "curl", "DAAG", + "dae", "data.table", "datasauRus", "datawizard", + "date", "DBI", "deldir", "dendextend", + "DEoptimR", "desc", "DescTools", "deSolve", + "desplot", "devtools", "diagram", "diffobj", + "digest", "distillery", "distributional", "dotCall64", + "downlit", "dplyr", "dslabs", "DT", "dtw", + "dygraphs", "e1071", "ecmwfr", "effectsize", + "ellipse", "ellipsis", "elliptic", "emmeans", + "EnvStats", "estimability", "evaluate", "Evapotranspiration", + "Exact", "exactRankTests", "expm", "extraDistr", + "extrafont", "extrafontdb", "extRemes", "factoextra", + "FactoMineR", "fansi", "faraway", "farver", + "fastDummies", "fastmap", "fields", "filelock", + "fitdistrplus", "fivethirtyeight", "flashClust", + "FNN", "fontawesome", "forcats", "foreach", + "forecast", "foreign", "formattable", "formula.tools", + "Formula", "fracdiff", "fs", "future.apply", + "future", "gapminder", "gclus", "gcookbook", + "generics", "GenSA", "geomtextpath", "geosphere", + "gert", "getPass", "GGally", "ggalt", + "ggeffects", "ggfittext", "ggforce", "ggformula", + "ggfortify", "ggmosaic", "ggplot2", "ggplotify", + "ggpmisc", "ggpp", "ggpubr", "ggrepel", + "ggridges", "ggsci", "ggside", "ggsignif", + "ggstance", "ggtext", "ggthemes", "ggwordcloud", + "gh", "gitcreds", "gld", "GlobalOptions", + "globals", "glue", "gmp", "gnm", "goftest", + "gower", "gridExtra", "gridGraphics", "gridtext", + "gstat", "gt", "gtable", "gtExtras", + "gtools", "hardhat", "haven", "heplots", + "here", "hexbin", "HH", "highr", "HistData", + "Hmisc", "hms", "htmlTable", "htmltools", + "htmlwidgets", "httpuv", "httr", "httr2", + "hydroGOF", "hydroTSM", "hypergeo", "igraph", + "imputeTS", "infer", "ini", "inline", + "insight", "interp", "intervals", "inum", + "ipred", "ISLR", "isoband", "iterators", + "janeaustenr", "janitor", "jpeg", "jquerylib", + "jsonlite", "juicyjuice", "Kendall", "KernSmooth", + "keyring", "klaR", "knitr", "labeling", + "labelled", "Lahman", "later", "lattice", + "latticeExtra", "lava", "lazyeval", "leaps", + "lemon", "libcoin", "lifecycle", "listenv", + "lme4", "lmerTest", "lmodel2", "lmom", + "lmomco", "Lmoments", "lmtest", "loo", + "lubridate", "lwgeom", "magick", "magrittr", + "mapdata", "mapproj", "maps", "maptools", + "markdown", "MASS", "Matrix", "MatrixModels", + "matrixStats", "mc2d", "memoise", "metR", + "mgcv", "mice", "miceadds", "mime", "miniUI", + "minqa", "mitools", "MKdescr", "MKinfer", + "mlbench", "modeldata", "ModelMetrics", "modelr", + "modeltools", "moderndive", "mosaic", "mosaicCore", + "mosaicData", "multcomp", "multcompView", "munsell", + "mvtnorm", "ncdf4.helpers", "ncdf4", "nlme", + "nloptr", "nnet", "nortest", "numDeriv", + "nycflights13", "openair", "openssl", "openxlsx", + "operator.tools", "paletteer", "parallelly", + "parameters", "partykit", "patchwork", "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", "plotly", @@ -112,7 +113,7 @@ packs <- c("abind", "agricolae", "agridat", "rematch2", "remotes", "repr", "reshape", "reshape2", "rio", "rje", "rlang", "rmarkdown", "RMAWGEN", "Rmpfr", - #"RMySQL", + #"RMySQL", "robustbase", "rootSolve", "roxygen2", "rpart", "rpivotTable", "rprojroot", "rrefine", "RSQLite", "rstan", @@ -130,12 +131,12 @@ packs <- c("abind", "agricolae", "agridat", "splus2R", "SQUAREM", "StanHeaders", "stars", "statip", "statquotes", "statsr", "stinepack", "stringdist", - #"stringi", - #"stringr", + #"stringi", + #"stringr", "strucchange", "styler", "survival", "svglite", "sys", "systemfonts", "tensorA", - #"terra", + #"terra", "testthat", "texmex", "textshaping", "TH.data", "threejs", "tibble", "tidyr", "tidyselect", "tidytext", diff --git a/instat/static/InstatObject/R/Rsetup.R b/instat/static/InstatObject/R/Rsetup.R index 02c5c196961..3d93cfdecf2 100644 --- a/instat/static/InstatObject/R/Rsetup.R +++ b/instat/static/InstatObject/R/Rsetup.R @@ -9,75 +9,76 @@ packs <- c("abind", "agricolae", "agridat", "blob", "boot", "brew", "brio", "broom", "bslib", "ca", "cachem", "callr", "candisc", "car", "carData", "caret", "cellranger", - "changepoint", "checkmate", "chillR", "chron", - "circlize", "CircStats", "circular", "class", - "classInt", "cli", "clifro", "climdex.pcic", - "clipr", "clock", "clue", "cluster", - "cmsaf", "cmsafops", "cmsafvis", "coda", - "codetools", "coin", "collapse", "colorRamps", - "colorspace", "colourpicker", "combinat", "commonmark", - "conf.design", "confintr", "contfrac", "corrplot", - "corrr", "countrycode", "cowplot", "cpp11", - "crayon", "credentials", "crosstalk", "cubature", - "curl", "DAAG", "dae", "data.table", - "datasauRus", "datawizard", "date", "DBI", - "deldir", "dendextend", "DEoptimR", "desc", - "DescTools", "deSolve", "desplot", "devtools", - "diagram", "diffobj", "digest", "distillery", - "distributional", "dotCall64", "downlit", "dplyr", - "dslabs", "DT", "dtw", "dygraphs", "e1071", - "ecmwfr", "effectsize", "ellipse", "ellipsis", - "elliptic", "emmeans", "EnvStats", "estimability", - "evaluate", "Evapotranspiration", "Exact", - "exactRankTests", "expm", "extraDistr", "extrafont", - "extrafontdb", "extRemes", "factoextra", "FactoMineR", - "fansi", "faraway", "farver", "fastDummies", - "fastmap", "fields", "filelock", "fitdistrplus", - "fivethirtyeight", "flashClust", "FNN", "fontawesome", - "forcats", "foreach", "forecast", "foreign", - "formattable", "formula.tools", "Formula", - "fracdiff", "fs", "future.apply", "future", - "gapminder", "gclus", "gcookbook", "generics", - "GenSA", "geomtextpath", "geosphere", "gert", - "getPass", "GGally", "ggalt", "ggeffects", - "ggfittext", "ggforce", "ggformula", "ggfortify", - "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", - "ggpp", "ggpubr", "ggrepel", "ggridges", - "ggsci", "ggsignif", "ggstance", "ggtext", - "ggthemes", "ggwordcloud", "gh", "gitcreds", - "gld", "GlobalOptions", "globals", "glue", - "gmp", "gnm", "goftest", "gower", "gridExtra", - "gridGraphics", "gridtext", "gstat", "gt", - "gtable", "gtExtras", "gtools", "hardhat", - "haven", "heplots", "here", "hexbin", - "HH", "highr", "HistData", "Hmisc", "hms", - "htmlTable", "htmltools", "htmlwidgets", "httpuv", - "httr", "httr2", "hydroGOF", "hydroTSM", - "hypergeo", "igraph", "imputeTS", "infer", - "ini", "inline", "insight", "interp", - "intervals", "ipred", "ISLR", "isoband", - "iterators", "janeaustenr", "janitor", "jpeg", - "jquerylib", "jsonlite", "juicyjuice", "Kendall", - "KernSmooth", "keyring", "klaR", "knitr", - "labeling", "labelled", "Lahman", "later", - "lattice", "latticeExtra", "lava", "lazyeval", - "leaps", "lemon", "libcoin", "lifecycle", - "listenv", "lme4", "lmerTest", "lmodel2", - "lmom", "lmomco", "Lmoments", "lmtest", - "loo", "lubridate", "lwgeom", "magick", - "magrittr", "mapdata", "mapproj", "maps", - "maptools", "markdown", "MASS", "Matrix", - "MatrixModels", "matrixStats", "mc2d", "memoise", - "metR", "mgcv", "mice", "miceadds", "mime", - "miniUI", "minqa", "mitools", "MKdescr", - "MKinfer", "mlbench", "modeldata", "ModelMetrics", - "modelr", "modeltools", "moderndive", "mosaic", - "mosaicCore", "mosaicData", "multcomp", "multcompView", - "munsell", "mvtnorm", "ncdf4.helpers", "ncdf4", - "nlme", "nloptr", "nnet", "nortest", - "numDeriv", "nycflights13", "openair", "openssl", - "openxlsx", "operator.tools", "paletteer", - "parallelly", "parameters", "patchwork", "pbapply", + "CGPfunctions", "changepoint", "checkmate", + "chillR", "chron", "circlize", "CircStats", + "circular", "class", "classInt", "cli", + "clifro", "climdex.pcic", "clipr", "clock", + "clue", "cluster", "cmsaf", "cmsafops", + "cmsafvis", "coda", "codetools", "coin", + "collapse", "colorRamps", "colorspace", "colourpicker", + "combinat", "commonmark", "conf.design", "confintr", + "contfrac", "corrplot", "corrr", "countrycode", + "cowplot", "cpp11", "crayon", "credentials", + "crosstalk", "cubature", "curl", "DAAG", + "dae", "data.table", "datasauRus", "datawizard", + "date", "DBI", "deldir", "dendextend", + "DEoptimR", "desc", "DescTools", "deSolve", + "desplot", "devtools", "diagram", "diffobj", + "digest", "distillery", "distributional", "dotCall64", + "downlit", "dplyr", "dslabs", "DT", "dtw", + "dygraphs", "e1071", "ecmwfr", "effectsize", + "ellipse", "ellipsis", "elliptic", "emmeans", + "EnvStats", "estimability", "evaluate", "Evapotranspiration", + "Exact", "exactRankTests", "expm", "extraDistr", + "extrafont", "extrafontdb", "extRemes", "factoextra", + "FactoMineR", "fansi", "faraway", "farver", + "fastDummies", "fastmap", "fields", "filelock", + "fitdistrplus", "fivethirtyeight", "flashClust", + "FNN", "fontawesome", "forcats", "foreach", + "forecast", "foreign", "formattable", "formula.tools", + "Formula", "fracdiff", "fs", "future.apply", + "future", "gapminder", "gclus", "gcookbook", + "generics", "GenSA", "geomtextpath", "geosphere", + "gert", "getPass", "GGally", "ggalt", + "ggeffects", "ggfittext", "ggforce", "ggformula", + "ggfortify", "ggmosaic", "ggplot2", "ggplotify", + "ggpmisc", "ggpp", "ggpubr", "ggrepel", + "ggridges", "ggsci", "ggside", "ggsignif", + "ggstance", "ggtext", "ggthemes", "ggwordcloud", + "gh", "gitcreds", "gld", "GlobalOptions", + "globals", "glue", "gmp", "gnm", "goftest", + "gower", "gridExtra", "gridGraphics", "gridtext", + "gstat", "gt", "gtable", "gtExtras", + "gtools", "hardhat", "haven", "heplots", + "here", "hexbin", "HH", "highr", "HistData", + "Hmisc", "hms", "htmlTable", "htmltools", + "htmlwidgets", "httpuv", "httr", "httr2", + "hydroGOF", "hydroTSM", "hypergeo", "igraph", + "imputeTS", "infer", "ini", "inline", + "insight", "interp", "intervals", "inum", + "ipred", "ISLR", "isoband", "iterators", + "janeaustenr", "janitor", "jpeg", "jquerylib", + "jsonlite", "juicyjuice", "Kendall", "KernSmooth", + "keyring", "klaR", "knitr", "labeling", + "labelled", "Lahman", "later", "lattice", + "latticeExtra", "lava", "lazyeval", "leaps", + "lemon", "libcoin", "lifecycle", "listenv", + "lme4", "lmerTest", "lmodel2", "lmom", + "lmomco", "Lmoments", "lmtest", "loo", + "lubridate", "lwgeom", "magick", "magrittr", + "mapdata", "mapproj", "maps", "maptools", + "markdown", "MASS", "Matrix", "MatrixModels", + "matrixStats", "mc2d", "memoise", "metR", + "mgcv", "mice", "miceadds", "mime", "miniUI", + "minqa", "mitools", "MKdescr", "MKinfer", + "mlbench", "modeldata", "ModelMetrics", "modelr", + "modeltools", "moderndive", "mosaic", "mosaicCore", + "mosaicData", "multcomp", "multcompView", "munsell", + "mvtnorm", "ncdf4.helpers", "ncdf4", "nlme", + "nloptr", "nnet", "nortest", "numDeriv", + "nycflights13", "openair", "openssl", "openxlsx", + "operator.tools", "paletteer", "parallelly", + "parameters", "partykit", "patchwork", "pbapply", "pbkrtest", "pbs", "PCICt", "performance", "pillar", "pingr", "pkgbuild", "pkgconfig", "pkgdown", "pkgload", "plogr", "plotly", @@ -147,14 +148,14 @@ versions <- c("1.4-5", "1.3-5", "1.21", "0.1.5", "4.0.5", "1.0-7", "1.2.4", "1.3-28.1", "1.0-8", "1.1.3", "1.0.4", "0.4.2", "0.71.1", "1.0.7", "3.7.3", "0.8-6", "3.1-2", "3.0-5", - "6.0-94", "1.1.0", "2.2.4", "2.1.0", - "0.72.8", "2.3-60", "0.4.15", "0.2-6", - "0.4-95", "7.3-21", "0.4-9", "3.6.1", - "3.2-5", "1.1-11", "0.8.0", "0.6.1", - "0.3-64", "2.1.4", "3.4.4", "1.2.6", - "1.1.12", "0.19-4", "0.2-19", "1.4-2", - "1.9.5", "2.3.1", "2.1-0", "1.2.0", "0.0-8", - "1.9.0", "2.0.0", "1.0.0", "1.1-12", + "6.0-94", "1.1.0", "0.6.3", "2.2.4", + "2.1.0", "0.72.8", "2.3-60", "0.4.15", + "0.2-6", "0.4-95", "7.3-21", "0.4-9", + "3.6.1", "3.2-5", "1.1-11", "0.8.0", + "0.6.1", "0.3-64", "2.1.4", "3.4.4", + "1.2.6", "1.1.12", "0.19-4", "0.2-19", + "1.4-2", "1.9.5", "2.3.1", "2.1-0", "1.2.0", + "0.0-8", "1.9.0", "2.0.0", "1.0.0", "1.1-12", "0.92", "0.4.4", "1.4.0", "1.1.1", "0.4.3", "1.5.2", "1.3.2", "1.2.0", "2.0.4.6", "5.0.0", "1.25.4", "3.2.15", "1.14.8", @@ -178,59 +179,61 @@ versions <- c("1.4-5", "1.3-5", "1.21", "0.1.5", "2.1.2", "0.4.0", "1.2.1", "0.10.0", "0.4.1", "0.10.4", "0.4.16", "0.3.3", "3.4.2", "0.1.0", "0.5.2", "0.5.2", "0.6.0", - "0.9.3", "0.5.4", "3.0.0", "0.6.4", "0.3.6", - "0.1.2", "4.2.4", "0.5.0", "1.4.0", "0.1.2", - "2.6.6", "0.1.2", "0.16.2", "1.6.2", - "0.7-1", "1.1-2", "1.2-3", "1.0.1", "2.3", - "0.5-1", "0.1.5", "2.1-1", "0.8.0", "0.3.3", - "0.4.5", "3.9.4", "1.3.0", "2.5.2", "1.4-2", - "1.0.1", "1.28.3", "3.1-49", "0.10", - "0.8-7", "5.0-1", "1.1.3", "2.4.1", "0.5.5", - "1.6.2", "1.6.9", "1.4.5", "0.2.2", "0.4-0", - "0.6-0", "1.2-13", "1.4.2", "3.3", "1.0.4", - "0.3.1", "0.3.19", "0.19.1", "1.1-4", - "0.15.3", "0.9-14", "1.4", "0.2.7", "1.0.14", - "1.0.0", "2.2.0", "0.1-10", "0.1.4", - "1.8.4", "0.1.0", "2.2.1", "2.23-20", - "1.3.1", "1.7-2", "1.42", "0.4.2", "2.11.0", - "10.0-1", "1.3.0", "0.21-8", "0.6-30", - "1.7.2.1", "0.2.2", "3.1", "0.4.6", "1.0-9", - "1.0.3", "0.9.0", "1.1-32", "3.1-3", - "1.7-3", "2.9", "2.4.7", "1.3-1", "0.9-40", - "2.6.0", "1.9.2", "0.2-11", "2.7.4", - "2.0.3", "2.3.1", "1.2.11", "3.4.1", - "1.1-6", "1.6", "7.3-58.3", "1.5-4", - "0.5-1", "0.63.0", "0.1-22", "2.0.1", - "0.14.0", "1.8-42", "3.15.0", "3.16-18", - "0.12", "0.1.1.1", "1.2.5", "2.4", "0.8", - "1.1", "2.1-3", "1.1.0", "1.2.2.2", "0.1.11", + "0.9.3", "0.5.4", "3.0.0", "0.2.2", "0.6.4", + "0.3.6", "0.1.2", "4.2.4", "0.5.0", "1.4.0", + "0.1.2", "2.6.6", "0.1.2", "0.16.2", + "1.6.2", "0.7-1", "1.1-2", "1.2-3", "1.0.1", + "2.3", "0.5-1", "0.1.5", "2.1-1", "0.8.0", + "0.3.3", "0.4.5", "3.9.4", "1.3.0", "2.5.2", + "1.4-2", "1.0.1", "1.28.3", "3.1-49", + "0.10", "0.8-7", "5.0-1", "1.1.3", "2.4.1", + "0.5.5", "1.6.2", "1.6.9", "1.4.5", "0.2.2", + "0.4-0", "0.6-0", "1.2-13", "1.4.2", + "3.3", "1.0.4", "0.3.1", "0.3.19", "0.19.1", + "1.1-4", "0.15.3", "1.0-5", "0.9-14", + "1.4", "0.2.7", "1.0.14", "1.0.0", "2.2.0", + "0.1-10", "0.1.4", "1.8.4", "0.1.0", + "2.2.1", "2.23-20", "1.3.1", "1.7-2", + "1.42", "0.4.2", "2.11.0", "10.0-1", + "1.3.0", "0.21-8", "0.6-30", "1.7.2.1", + "0.2.2", "3.1", "0.4.6", "1.0-9", "1.0.3", + "0.9.0", "1.1-32", "3.1-3", "1.7-3", + "2.9", "2.4.7", "1.3-1", "0.9-40", "2.6.0", + "1.9.2", "0.2-11", "2.7.4", "2.0.3", + "2.3.1", "1.2.11", "3.4.1", "1.1-6", + "1.6", "7.3-58.3", "1.5-4", "0.5-1", + "0.63.0", "0.1-22", "2.0.1", "0.14.0", + "1.8-42", "3.15.0", "3.16-18", "0.12", + "0.1.1.1", "1.2.5", "2.4", "0.8", "1.1", + "2.1-3", "1.1.0", "1.2.2.2", "0.1.11", "0.2-23", "0.5.5", "1.8.4.2", "0.9.2.1", "0.20.3", "1.4-23", "0.1-9", "0.5.0", "1.1-3", "0.3-6", "1.21", "3.1-162", "2.0.3", "7.3-18", "1.0-4", "2016.8-1.1", "1.0.2", "2.16-0", "2.0.6", "4.2.5.2", "1.6.3", "1.5.0", "1.35.0", "0.21.0", - "1.1.2", "1.7-0", "0.5.2", "1.1", "0.5-4.4", - "0.10.3", "1.9.0", "2.0.2", "1.4.0", - "2.0.3", "2.0.7", "1.3.2", "0.2.0", "4.10.1", - "3.8-2", "2.8-1", "1.8.8", "0.1-8", "1.10-4", - "1.4-1", "1.4.1", "1.0.0", "0.3.14", - "1.1.1", "1.4.0", "1.1.1", "1.18.0", - "3.8.1", "2023.03.31", "0.1.1", "0.3.7", - "1.2.2", "0.13.0", "1.0-12", "1.2.0.1", - "0.4-27", "1.7.5", "1.0.1", "0.1-2", - "1.5-8", "0.4.22", "5.95", "0.7.8", "1.0.2", - "0.16.0", "1.8.2", "1.25.0", "2.12.2", - "2.5.1", "1.2.5", "0.1", "0.3.3", "3.6-20", - "0.51.5", "2.2.13", "1.4.0", "1.1-3", - "2.0.0", "1.0.10", "0.12.2.0.0", "0.3.3.9.3", - "5.1.7", "0.3.0", "1.98-1.12", "2.4", - "1.7.0", "2.1.4", "1.4.2", "1.0.5", "0.5-1", - "1.0-5", "1.0.1", "2.1.2", "2.4.2", "1.1.6", - "0.8.9", "1.4.4", "0.5.29", "1.12.1", - "1.1.0", "2.21", "1.3.7", "0.9-1", "0.10.25", - "0.95-1", "1.8.2.3", "7.2.3", "4.1.19", - "0.3.0", "2.0.3", "2.1.0", "2.3.1", "2.21.7", + "1.2-20", "1.1.2", "1.7-0", "0.5.2", + "1.1", "0.5-4.4", "0.10.3", "1.9.0", + "2.0.2", "1.4.0", "2.0.3", "2.0.7", "1.3.2", + "0.2.0", "4.10.1", "3.8-2", "2.8-1", + "1.8.8", "0.1-8", "1.10-4", "1.4-1", + "1.4.1", "1.0.0", "0.3.14", "1.1.1", + "1.4.0", "1.1.1", "1.18.0", "3.8.1", + "2023.03.31", "0.1.1", "0.3.7", "1.2.2", + "0.13.0", "1.0-12", "1.2.0.1", "0.4-27", + "1.7.5", "1.0.1", "0.1-2", "1.5-8", "0.4.22", + "5.95", "0.7.8", "1.0.2", "0.16.0", "1.8.2", + "1.25.0", "2.12.2", "2.5.1", "1.2.5", + "0.1", "0.3.3", "3.6-20", "0.51.5", "2.2.13", + "1.4.0", "1.1-3", "2.0.0", "1.0.10", + "0.12.2.0.0", "0.3.3.9.3", "5.1.7", "0.3.0", + "1.98-1.12", "2.4", "1.7.0", "2.1.4", + "1.4.2", "1.0.5", "0.5-1", "1.0-5", "1.0.1", + "2.1.2", "2.4.2", "1.1.6", "0.8.9", "1.4.4", + "0.5.29", "1.12.1", "1.1.0", "2.21", + "1.3.7", "0.9-1", "0.10.25", "0.95-1", + "1.8.2.3", "7.2.3", "4.1.19", "0.3.0", + "2.0.3", "2.1.0", "2.3.1", "2.21.7", "2.21.4", "2.3.1", "0.7.2", "0.14", "0.4-14.1", "1.3.12", "2.1.2", "1.0.3", "1.3-6", "1.01", "1.1.2", "3.0-2", "0.4.5", "1.2.1", From f39ae93d6ee606d34a7a1815cee5687a666ebf8d Mon Sep 17 00:00:00 2001 From: n-thony Date: Fri, 15 Mar 2024 18:22:39 +0300 Subject: [PATCH 12/27] Added back version number --- instat/frmMain.Designer.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index a9d42933604..6895c34d0eb 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5112,7 +5112,9 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat .." + Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + + My.Application.Info.Version.Minor.ToString + "." + + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() From c0d65696db3963d45533e3c6f14aac6bb7eb17c6 Mon Sep 17 00:00:00 2001 From: JUMA Date: Mon, 18 Mar 2024 13:57:40 +0300 Subject: [PATCH 13/27] design_changes --- instat/ucrCalculator.Designer.vb | 518 ++++++++++++++++--------------- instat/ucrCalculator.vb | 20 +- 2 files changed, 290 insertions(+), 248 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 172ec0561d4..27a58c4d64d 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -62,7 +62,6 @@ 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() @@ -119,7 +118,6 @@ 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() @@ -142,7 +140,6 @@ 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() @@ -166,7 +163,6 @@ 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() @@ -247,9 +243,11 @@ 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() + Me.MathsCarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MathsCirucarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdAtan2 = New System.Windows.Forms.Button() Me.cmdLogistic = New System.Windows.Forms.Button() Me.cmdLogit = New System.Windows.Forms.Button() @@ -278,7 +276,6 @@ 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() @@ -332,7 +329,6 @@ 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() @@ -381,7 +377,6 @@ 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() @@ -416,7 +411,6 @@ 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() @@ -480,7 +474,6 @@ 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() @@ -521,7 +514,6 @@ Partial Class ucrCalculator Me.cmdbegin = New System.Windows.Forms.Button() Me.cmdAny1 = New System.Windows.Forms.Button() Me.grpComplex = New System.Windows.Forms.GroupBox() - 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() @@ -541,7 +533,7 @@ Partial Class ucrCalculator Me.cmdMod = New System.Windows.Forms.Button() Me.cmdImaginary = New System.Windows.Forms.Button() Me.cmdReal = New System.Windows.Forms.Button() - Me.cmdAsComplex = New System.Windows.Forms.Button() + Me.cmdComplex = New System.Windows.Forms.Button() Me.ContextMenuStripTxtString = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.TxTStringrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TxTBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -604,6 +596,8 @@ Partial Class ucrCalculator Me.cmdListSum = New System.Windows.Forms.Button() Me.cmdListSumd = New System.Windows.Forms.Button() Me.cmdListMissing = New System.Windows.Forms.Button() + Me.cmdComplexi = New System.Windows.Forms.Button() + Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -612,45 +606,53 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.MathsCarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.MathsCirucarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.grpBasic.SuspendLayout() - Me.grpDates.SuspendLayout() - Me.ContextMenuStripDate.SuspendLayout() - Me.ContextMenuStripComplex.SuspendLayout() - Me.grpInteger.SuspendLayout() - Me.ContextMenuStripInteger.SuspendLayout() - Me.grpFactor.SuspendLayout() - Me.ContextMenuStripFactor.SuspendLayout() - Me.grpHydroGOF.SuspendLayout() - Me.ContextMenuStripHydroGOF.SuspendLayout() - Me.grpWakefield.SuspendLayout() - Me.grpMaths.SuspendLayout() - Me.ContextMenuStripMaths.SuspendLayout() - Me.grpSummary.SuspendLayout() - Me.ContextMenuStripSummary.SuspendLayout() - Me.grpFrequencies.SuspendLayout() - Me.grpProbabilty.SuspendLayout() - Me.ContextMenuStripProbability.SuspendLayout() - Me.grpRandom.SuspendLayout() - Me.grpTransform.SuspendLayout() - Me.ContextMenuStripTransform.SuspendLayout() - Me.grpLogical.SuspendLayout() - Me.ContextMenuStripLogical.SuspendLayout() - Me.grpTestString.SuspendLayout() - Me.grpCircular.SuspendLayout() - Me.ContextMenuStripCircular.SuspendLayout() - Me.grpModifier.SuspendLayout() - Me.grpSymbols.SuspendLayout() - Me.grpComplex.SuspendLayout() - Me.ContextMenuStripTxtString.SuspendLayout() - Me.ContextMenuStripWakefield.SuspendLayout() - Me.ContextMenuStripList.SuspendLayout() - Me.grpList.SuspendLayout() - Me.GroupBox1.SuspendLayout() - Me.grpMathBloc.SuspendLayout() - Me.SuspendLayout() + 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 + Me.ContextMenuStripComplex.SuspendLayout + Me.grpInteger.SuspendLayout + Me.ContextMenuStripInteger.SuspendLayout + Me.grpFactor.SuspendLayout + Me.ContextMenuStripFactor.SuspendLayout + Me.grpHydroGOF.SuspendLayout + Me.ContextMenuStripHydroGOF.SuspendLayout + Me.grpWakefield.SuspendLayout + Me.grpMaths.SuspendLayout + Me.ContextMenuStripMaths.SuspendLayout + Me.grpSummary.SuspendLayout + Me.ContextMenuStripSummary.SuspendLayout + Me.grpFrequencies.SuspendLayout + Me.grpProbabilty.SuspendLayout + Me.ContextMenuStripProbability.SuspendLayout + Me.grpRandom.SuspendLayout + Me.grpTransform.SuspendLayout + Me.ContextMenuStripTransform.SuspendLayout + Me.grpLogical.SuspendLayout + Me.ContextMenuStripLogical.SuspendLayout + Me.grpTestString.SuspendLayout + Me.grpCircular.SuspendLayout + Me.ContextMenuStripCircular.SuspendLayout + Me.grpModifier.SuspendLayout + Me.grpSymbols.SuspendLayout + Me.grpComplex.SuspendLayout + Me.ContextMenuStripTxtString.SuspendLayout + Me.ContextMenuStripWakefield.SuspendLayout + Me.ContextMenuStripList.SuspendLayout + Me.grpList.SuspendLayout + Me.GroupBox1.SuspendLayout + Me.grpMathBloc.SuspendLayout + Me.SuspendLayout ' 'lblExpression ' @@ -951,18 +953,6 @@ 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) @@ -1560,18 +1550,6 @@ 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) @@ -1777,18 +1755,6 @@ 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) @@ -2055,18 +2021,6 @@ 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) @@ -3015,31 +2969,37 @@ 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) Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCirucarToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(211, 128) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(123, 100) + ' + 'MathsBaseStripMenuItem + ' + Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(122, 24) Me.MathsStatsStripMenuItem.Text = "stats" ' + 'MathsCarToolStripMenuItem + ' + Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.MathsCarToolStripMenuItem.Text = "car" + ' + 'MathsCirucarToolStripMenuItem + ' + Me.MathsCirucarToolStripMenuItem.Name = "MathsCirucarToolStripMenuItem" + Me.MathsCirucarToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.MathsCirucarToolStripMenuItem.Text = "cirucar" + ' 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -3387,18 +3347,6 @@ 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) @@ -4021,18 +3969,6 @@ 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) @@ -4623,18 +4559,6 @@ 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) @@ -4990,18 +4914,6 @@ 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) @@ -5749,18 +5661,6 @@ 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) @@ -6202,6 +6102,8 @@ Partial Class ucrCalculator ' 'grpComplex ' + Me.grpComplex.Controls.Add(Me.cmdAsComplex) + Me.grpComplex.Controls.Add(Me.cmdComplexi) Me.grpComplex.Controls.Add(Me.cmdComplexRHelp) Me.grpComplex.Controls.Add(Me.cmdComplexTanH) Me.grpComplex.Controls.Add(Me.cmdComplexTan) @@ -6222,7 +6124,7 @@ Partial Class ucrCalculator Me.grpComplex.Controls.Add(Me.cmdMod) Me.grpComplex.Controls.Add(Me.cmdImaginary) Me.grpComplex.Controls.Add(Me.cmdReal) - Me.grpComplex.Controls.Add(Me.cmdAsComplex) + Me.grpComplex.Controls.Add(Me.cmdComplex) Me.grpComplex.Location = New System.Drawing.Point(542, 87) Me.grpComplex.Name = "grpComplex" Me.grpComplex.Size = New System.Drawing.Size(360, 282) @@ -6230,23 +6132,11 @@ Partial Class ucrCalculator Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" ' - '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!) Me.cmdComplexTanH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTanH.Location = New System.Drawing.Point(265, 130) + Me.cmdComplexTanH.Location = New System.Drawing.Point(198, 128) Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTanH.Name = "cmdComplexTanH" Me.cmdComplexTanH.Size = New System.Drawing.Size(72, 38) @@ -6258,7 +6148,7 @@ Partial Class ucrCalculator ' Me.cmdComplexTan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTan.Location = New System.Drawing.Point(265, 93) + Me.cmdComplexTan.Location = New System.Drawing.Point(198, 92) Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTan.Name = "cmdComplexTan" Me.cmdComplexTan.Size = New System.Drawing.Size(72, 38) @@ -6270,10 +6160,10 @@ Partial Class ucrCalculator ' Me.cmdComplexPi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexPi.Location = New System.Drawing.Point(265, 167) + Me.cmdComplexPi.Location = New System.Drawing.Point(31, 202) Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexPi.Name = "cmdComplexPi" - Me.cmdComplexPi.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexPi.Size = New System.Drawing.Size(81, 38) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -6282,10 +6172,10 @@ Partial Class ucrCalculator ' Me.cmdComplexDeg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexDeg.Location = New System.Drawing.Point(265, 58) + Me.cmdComplexDeg.Location = New System.Drawing.Point(269, 92) Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexDeg.Name = "cmdComplexDeg" - Me.cmdComplexDeg.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexDeg.Size = New System.Drawing.Size(79, 38) Me.cmdComplexDeg.TabIndex = 205 Me.cmdComplexDeg.Text = "deg" Me.cmdComplexDeg.UseVisualStyleBackColor = True @@ -6294,10 +6184,10 @@ Partial Class ucrCalculator ' Me.cmdComplexRad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRad.Location = New System.Drawing.Point(265, 22) + Me.cmdComplexRad.Location = New System.Drawing.Point(269, 58) Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRad.Name = "cmdComplexRad" - Me.cmdComplexRad.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexRad.Size = New System.Drawing.Size(79, 38) Me.cmdComplexRad.TabIndex = 204 Me.cmdComplexRad.Text = "rad" Me.cmdComplexRad.UseVisualStyleBackColor = True @@ -6306,10 +6196,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSignif.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSignif.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSignif.Location = New System.Drawing.Point(183, 167) + Me.cmdComplexSignif.Location = New System.Drawing.Point(198, 165) Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSignif.Size = New System.Drawing.Size(72, 38) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6318,10 +6208,10 @@ Partial Class ucrCalculator ' Me.cmdComplexCosH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCosH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCosH.Location = New System.Drawing.Point(183, 130) + Me.cmdComplexCosH.Location = New System.Drawing.Point(111, 128) Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexCosH.Name = "cmdComplexCosH" - Me.cmdComplexCosH.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexCosH.Size = New System.Drawing.Size(88, 38) Me.cmdComplexCosH.TabIndex = 202 Me.cmdComplexCosH.Text = "cosh" Me.cmdComplexCosH.UseVisualStyleBackColor = True @@ -6330,10 +6220,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSinH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSinH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSinH.Location = New System.Drawing.Point(112, 130) + Me.cmdComplexSinH.Location = New System.Drawing.Point(30, 128) Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSinH.Name = "cmdComplexSinH" - Me.cmdComplexSinH.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexSinH.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSinH.TabIndex = 201 Me.cmdComplexSinH.Text = "sinh" Me.cmdComplexSinH.UseVisualStyleBackColor = True @@ -6342,10 +6232,10 @@ Partial Class ucrCalculator ' Me.cmdComplexCos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCos.Location = New System.Drawing.Point(183, 93) + Me.cmdComplexCos.Location = New System.Drawing.Point(111, 92) Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexCos.Name = "cmdComplexCos" - Me.cmdComplexCos.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexCos.Size = New System.Drawing.Size(88, 38) Me.cmdComplexCos.TabIndex = 200 Me.cmdComplexCos.Text = "cos" Me.cmdComplexCos.UseVisualStyleBackColor = True @@ -6354,10 +6244,10 @@ Partial Class ucrCalculator ' Me.cmdComplexSin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSin.Location = New System.Drawing.Point(112, 93) + Me.cmdComplexSin.Location = New System.Drawing.Point(30, 95) Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSin.Name = "cmdComplexSin" - Me.cmdComplexSin.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexSin.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSin.TabIndex = 199 Me.cmdComplexSin.Text = "sin" Me.cmdComplexSin.UseVisualStyleBackColor = True @@ -6366,10 +6256,10 @@ Partial Class ucrCalculator ' Me.cmdComplexExp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexExp.Location = New System.Drawing.Point(30, 93) + Me.cmdComplexExp.Location = New System.Drawing.Point(269, 128) Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexExp.Name = "cmdComplexExp" - Me.cmdComplexExp.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexExp.Size = New System.Drawing.Size(79, 38) Me.cmdComplexExp.TabIndex = 192 Me.cmdComplexExp.Text = "exp" Me.cmdComplexExp.UseVisualStyleBackColor = True @@ -6378,10 +6268,10 @@ Partial Class ucrCalculator ' Me.cmdComplexRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRound.Location = New System.Drawing.Point(112, 167) + Me.cmdComplexRound.Location = New System.Drawing.Point(111, 165) Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRound.Name = "cmdComplexRound" - Me.cmdComplexRound.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexRound.Size = New System.Drawing.Size(88, 38) Me.cmdComplexRound.TabIndex = 191 Me.cmdComplexRound.Text = "round" Me.cmdComplexRound.UseVisualStyleBackColor = True @@ -6390,10 +6280,10 @@ Partial Class ucrCalculator ' Me.cmdComplexLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexLog.Location = New System.Drawing.Point(30, 130) + Me.cmdComplexLog.Location = New System.Drawing.Point(269, 165) Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexLog.Name = "cmdComplexLog" - Me.cmdComplexLog.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexLog.Size = New System.Drawing.Size(79, 38) Me.cmdComplexLog.TabIndex = 190 Me.cmdComplexLog.Text = "log" Me.cmdComplexLog.UseVisualStyleBackColor = True @@ -6402,7 +6292,7 @@ Partial Class ucrCalculator ' Me.cmdComplexSqrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSqrt.Location = New System.Drawing.Point(30, 167) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(30, 165) Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" Me.cmdComplexSqrt.Size = New System.Drawing.Size(82, 38) @@ -6414,10 +6304,10 @@ Partial Class ucrCalculator ' Me.cmdConjugate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdConjugate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdConjugate.Location = New System.Drawing.Point(183, 58) + Me.cmdConjugate.Location = New System.Drawing.Point(198, 58) Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(82, 38) + Me.cmdConjugate.Size = New System.Drawing.Size(72, 38) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6426,10 +6316,10 @@ Partial Class ucrCalculator ' Me.cmdArg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdArg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdArg.Location = New System.Drawing.Point(112, 58) + Me.cmdArg.Location = New System.Drawing.Point(111, 58) Me.cmdArg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdArg.Name = "cmdArg" - Me.cmdArg.Size = New System.Drawing.Size(72, 38) + Me.cmdArg.Size = New System.Drawing.Size(88, 38) Me.cmdArg.TabIndex = 187 Me.cmdArg.Text = "arg" Me.cmdArg.UseVisualStyleBackColor = True @@ -6450,10 +6340,10 @@ Partial Class ucrCalculator ' Me.cmdImaginary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdImaginary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdImaginary.Location = New System.Drawing.Point(183, 22) + Me.cmdImaginary.Location = New System.Drawing.Point(269, 22) Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdImaginary.Name = "cmdImaginary" - Me.cmdImaginary.Size = New System.Drawing.Size(82, 38) + Me.cmdImaginary.Size = New System.Drawing.Size(79, 38) Me.cmdImaginary.TabIndex = 185 Me.cmdImaginary.Text = "imaginary" Me.cmdImaginary.UseVisualStyleBackColor = True @@ -6462,7 +6352,7 @@ Partial Class ucrCalculator ' Me.cmdReal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReal.Location = New System.Drawing.Point(112, 22) + Me.cmdReal.Location = New System.Drawing.Point(198, 22) Me.cmdReal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReal.Name = "cmdReal" Me.cmdReal.Size = New System.Drawing.Size(72, 38) @@ -6470,17 +6360,17 @@ Partial Class ucrCalculator Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True ' - 'cmdAsComplex + 'cmdComplex ' - Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsComplex.Location = New System.Drawing.Point(30, 22) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(82, 38) - Me.cmdAsComplex.TabIndex = 176 - Me.cmdAsComplex.Text = "complex" - Me.cmdAsComplex.UseVisualStyleBackColor = True + Me.cmdComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdComplex.Location = New System.Drawing.Point(30, 22) + Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplex.Name = "cmdComplex" + Me.cmdComplex.Size = New System.Drawing.Size(82, 38) + Me.cmdComplex.TabIndex = 176 + Me.cmdComplex.Text = "complex" + Me.cmdComplex.UseVisualStyleBackColor = True ' 'ContextMenuStripTxtString ' @@ -7219,6 +7109,30 @@ Partial Class ucrCalculator Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True ' + 'cmdComplexi + ' + Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdComplexi.Location = New System.Drawing.Point(111, 202) + Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexi.Name = "cmdComplexi" + Me.cmdComplexi.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexi.TabIndex = 210 + Me.cmdComplexi.Text = "i" + Me.cmdComplexi.UseVisualStyleBackColor = True + ' + 'cmdAsComplex + ' + Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAsComplex.Location = New System.Drawing.Point(111, 22) + Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsComplex.Name = "cmdAsComplex" + Me.cmdAsComplex.Size = New System.Drawing.Size(88, 38) + Me.cmdAsComplex.TabIndex = 211 + Me.cmdAsComplex.Text = "as.complex" + Me.cmdAsComplex.UseVisualStyleBackColor = True + ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True @@ -7311,23 +7225,137 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' - 'MathsBaseStripMenuItem + 'cmdComplexRHelp ' - Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" - Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(210, 24) - Me.MathsBaseStripMenuItem.Text = "base" + 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 ' - 'MathsCarToolStripMenuItem + 'cmdSummaryRHelp ' - Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" - Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(210, 24) - Me.MathsCarToolStripMenuItem.Text = "car" + 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 ' - 'MathsCirucarToolStripMenuItem + 'cmdTransformRHelp ' - Me.MathsCirucarToolStripMenuItem.Name = "MathsCirucarToolStripMenuItem" - Me.MathsCirucarToolStripMenuItem.Size = New System.Drawing.Size(210, 24) - Me.MathsCirucarToolStripMenuItem.Text = "cirucar" + 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 ' @@ -7346,10 +7374,10 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpWakefield) - Me.Controls.Add(Me.grpModifier) - Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) @@ -7360,7 +7388,7 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpComplex) + Me.Controls.Add(Me.grpModifier) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(1123, 572) Me.grpBasic.ResumeLayout(False) @@ -7867,7 +7895,7 @@ Partial Class ucrCalculator Friend WithEvents cmduniform As Button Friend WithEvents grpComplex As GroupBox Friend WithEvents cmdReal As Button - Friend WithEvents cmdAsComplex As Button + Friend WithEvents cmdComplex As Button Friend WithEvents cmdComplexExp As Button Friend WithEvents cmdComplexRound As Button Friend WithEvents cmdComplexLog As Button @@ -7997,4 +8025,6 @@ Partial Class ucrCalculator Friend WithEvents MathsBaseStripMenuItem As ToolStripMenuItem Friend WithEvents MathsCarToolStripMenuItem As ToolStripMenuItem Friend WithEvents MathsCirucarToolStripMenuItem As ToolStripMenuItem + Friend WithEvents cmdComplexi As Button + Friend WithEvents cmdAsComplex As Button End Class diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index e89d5ab77c5..9d5cb1d7506 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -5035,11 +5035,11 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsSampleFunction.ToScript, 36) End Sub - Private Sub cmdAsComplex_Click(sender As Object, e As EventArgs) Handles cmdAsComplex.Click + Private Sub cmdAsComplex_Click(sender As Object, e As EventArgs) Handles cmdComplex.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex(x = )", 1) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex( )", 1) End If End Sub @@ -5180,7 +5180,7 @@ Public Class ucrCalculator End Sub Private Sub cmdComplexPi_Click(sender As Object, e As EventArgs) Handles cmdComplexPi.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pi()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pi", -1) End Sub Private Sub cmdPascal_Click(sender As Object, e As EventArgs) Handles cmdPascal.Click @@ -5438,4 +5438,16 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.max( )]", 15) End If End Sub + + Private Sub cmdComplexi_Click(sender As Object, e As EventArgs) Handles cmdComplexi.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("i", 1) + End Sub + + Private Sub cmdAsComplex_Click_1(sender As Object, e As EventArgs) Handles cmdAsComplex.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x = )", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 1) + End If + End Sub End Class From 60ca332964a0d38c982745caac84b6c9ddfbc611 Mon Sep 17 00:00:00 2001 From: JUMA Date: Mon, 18 Mar 2024 14:48:07 +0300 Subject: [PATCH 14/27] changes --- instat/ucrCalculator.Designer.vb | 124 +++++++++++++++---------------- instat/ucrCalculator.vb | 40 +++++++++- 2 files changed, 101 insertions(+), 63 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 27a58c4d64d..103de4be792 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -514,6 +514,8 @@ Partial Class ucrCalculator Me.cmdbegin = New System.Windows.Forms.Button() Me.cmdAny1 = New System.Windows.Forms.Button() Me.grpComplex = New System.Windows.Forms.GroupBox() + Me.cmdAsComplex = New System.Windows.Forms.Button() + Me.cmdComplexi = New System.Windows.Forms.Button() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -596,8 +598,6 @@ Partial Class ucrCalculator Me.cmdListSum = New System.Windows.Forms.Button() Me.cmdListSumd = New System.Windows.Forms.Button() Me.cmdListMissing = New System.Windows.Forms.Button() - Me.cmdComplexi = New System.Windows.Forms.Button() - Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -617,42 +617,42 @@ Partial Class ucrCalculator Me.cmdMathsHelp = New instat.ucrSplitButton() Me.cmdProbRHelp = New instat.ucrSplitButton() Me.cmdIntegerRHelp = New instat.ucrSplitButton() - Me.grpBasic.SuspendLayout - Me.grpDates.SuspendLayout - Me.ContextMenuStripDate.SuspendLayout - Me.ContextMenuStripComplex.SuspendLayout - Me.grpInteger.SuspendLayout - Me.ContextMenuStripInteger.SuspendLayout - Me.grpFactor.SuspendLayout - Me.ContextMenuStripFactor.SuspendLayout - Me.grpHydroGOF.SuspendLayout - Me.ContextMenuStripHydroGOF.SuspendLayout - Me.grpWakefield.SuspendLayout - Me.grpMaths.SuspendLayout - Me.ContextMenuStripMaths.SuspendLayout - Me.grpSummary.SuspendLayout - Me.ContextMenuStripSummary.SuspendLayout - Me.grpFrequencies.SuspendLayout - Me.grpProbabilty.SuspendLayout - Me.ContextMenuStripProbability.SuspendLayout - Me.grpRandom.SuspendLayout - Me.grpTransform.SuspendLayout - Me.ContextMenuStripTransform.SuspendLayout - Me.grpLogical.SuspendLayout - Me.ContextMenuStripLogical.SuspendLayout - Me.grpTestString.SuspendLayout - Me.grpCircular.SuspendLayout - Me.ContextMenuStripCircular.SuspendLayout - Me.grpModifier.SuspendLayout - Me.grpSymbols.SuspendLayout - Me.grpComplex.SuspendLayout - Me.ContextMenuStripTxtString.SuspendLayout - Me.ContextMenuStripWakefield.SuspendLayout - Me.ContextMenuStripList.SuspendLayout - Me.grpList.SuspendLayout - Me.GroupBox1.SuspendLayout - Me.grpMathBloc.SuspendLayout - Me.SuspendLayout + Me.grpBasic.SuspendLayout() + Me.grpDates.SuspendLayout() + Me.ContextMenuStripDate.SuspendLayout() + Me.ContextMenuStripComplex.SuspendLayout() + Me.grpInteger.SuspendLayout() + Me.ContextMenuStripInteger.SuspendLayout() + Me.grpFactor.SuspendLayout() + Me.ContextMenuStripFactor.SuspendLayout() + Me.grpHydroGOF.SuspendLayout() + Me.ContextMenuStripHydroGOF.SuspendLayout() + Me.grpWakefield.SuspendLayout() + Me.grpMaths.SuspendLayout() + Me.ContextMenuStripMaths.SuspendLayout() + Me.grpSummary.SuspendLayout() + Me.ContextMenuStripSummary.SuspendLayout() + Me.grpFrequencies.SuspendLayout() + Me.grpProbabilty.SuspendLayout() + Me.ContextMenuStripProbability.SuspendLayout() + Me.grpRandom.SuspendLayout() + Me.grpTransform.SuspendLayout() + Me.ContextMenuStripTransform.SuspendLayout() + Me.grpLogical.SuspendLayout() + Me.ContextMenuStripLogical.SuspendLayout() + Me.grpTestString.SuspendLayout() + Me.grpCircular.SuspendLayout() + Me.ContextMenuStripCircular.SuspendLayout() + Me.grpModifier.SuspendLayout() + Me.grpSymbols.SuspendLayout() + Me.grpComplex.SuspendLayout() + Me.ContextMenuStripTxtString.SuspendLayout() + Me.ContextMenuStripWakefield.SuspendLayout() + Me.ContextMenuStripList.SuspendLayout() + Me.grpList.SuspendLayout() + Me.GroupBox1.SuspendLayout() + Me.grpMathBloc.SuspendLayout() + Me.SuspendLayout() ' 'lblExpression ' @@ -6132,6 +6132,30 @@ Partial Class ucrCalculator Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" ' + 'cmdAsComplex + ' + Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAsComplex.Location = New System.Drawing.Point(111, 22) + Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsComplex.Name = "cmdAsComplex" + Me.cmdAsComplex.Size = New System.Drawing.Size(88, 38) + Me.cmdAsComplex.TabIndex = 211 + Me.cmdAsComplex.Text = "as.complex" + Me.cmdAsComplex.UseVisualStyleBackColor = True + ' + 'cmdComplexi + ' + Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdComplexi.Location = New System.Drawing.Point(111, 202) + Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexi.Name = "cmdComplexi" + Me.cmdComplexi.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexi.TabIndex = 210 + Me.cmdComplexi.Text = "i" + Me.cmdComplexi.UseVisualStyleBackColor = True + ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7109,30 +7133,6 @@ Partial Class ucrCalculator Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True ' - 'cmdComplexi - ' - Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexi.Location = New System.Drawing.Point(111, 202) - Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdComplexi.Name = "cmdComplexi" - Me.cmdComplexi.Size = New System.Drawing.Size(88, 38) - Me.cmdComplexi.TabIndex = 210 - Me.cmdComplexi.Text = "i" - Me.cmdComplexi.UseVisualStyleBackColor = True - ' - 'cmdAsComplex - ' - Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsComplex.Location = New System.Drawing.Point(111, 22) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(88, 38) - Me.cmdAsComplex.TabIndex = 211 - Me.cmdAsComplex.Text = "as.complex" - Me.cmdAsComplex.UseVisualStyleBackColor = True - ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 9d5cb1d7506..d4caaa495ee 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -275,6 +275,44 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdLucas, "generates Lucas numbers to the length of the dataframe. For example the 10th Lucas number is 76") ttCalculator.SetToolTip(cmdPrimorial, "gives the primorial (like the factorial, but just the primes up to the number) for a variable. For example primorial(c(7,8,9)) = 235*7 = (210, 210, 210)") + ' Complex keyboard tooltips + ttCalculator.SetToolTip(cmdComplex, "Construct a complex number. For example complex(3, 2) gives 3 + 2i.") + ttCalculator.SetToolTip(cmdAsComplex, "Define a variable as complex. For example as.complex(-1) gives 1 + 0i") + ttCalculator.SetToolTip(cmdReal, "The real part of a complex number. For example Re(3 + 2i) gives 3.") + ttCalculator.SetToolTip(cmdImaginary, "The imaginary part of a complex number or variable. For example Im(3 + 2i) gives 2.") + ttCalculator.SetToolTip(cmdMod, "The modulus (polar coordinate) of a complex number or variable. For example Mod(3 + 2i) gives 3.606, which is sqrt(33 + 22). Also abs(3 + 2i) is the same as Mod(3 + 2i).") + ttCalculator.SetToolTip(cmdArg, " The argument (polar coordinate) of a complex number or variable. For example Arg(3 + 2i) gives 0.588 where 3 = 3.606cos(0.588) and 2 = 3.606sin(0.588).") + ttCalculator.SetToolTip(cmdConjugate, "Conjugate of a complex number or variable: For example Conj(3 + 2i) gives 3 - 2i.") + ttCalculator.SetToolTip(cmdComplexRad, "Change from degrees to radians. For example rad(90 + 180i) gives (1.571 + 3.142i)") + ttCalculator.SetToolTip(cmdComplexDeg, " Change from radians to degrees. For example deg(pi/2 + 3.142i) gives (90 + 180i)") + ttCalculator.SetToolTip(cmdComplexSqrt, "Square root. For example sqrt(-9 + 0i) gives (0 + 3i) or just 3i. sqrt(-9 + 2i) gives 0.331 + 3.018i)") + ttCalculator.SetToolTip(cmdComplexExp, "The exponential function. For example exp(3 + 2i) gives") + ttCalculator.SetToolTip(cmdComplexRound, "round(pi/2 + 3.14259i) gives 2 + 3i) so rounds to whole numbers. round(pi/2 + 3.14259i, 2) gives 1.57 + 3.14i, so rounds to 2 decimals.") + ttCalculator.SetToolTip(cmdComplexSignif, "Rounds to give the specified number off digits in the larger of the components. For example signif(0.424 + 511.38i, 3) gives (0 + 511i)") + + 'Hydro GOF keyboard tooltips + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + ttCalculator.SetToolTip() + Const strTooltipCmdLength = "number of observations: For example length(c(1,2,3,4,NA)) = 5 " ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength) ttCalculator.SetToolTip(cmdListLength, strTooltipCmdLength) @@ -5440,7 +5478,7 @@ Public Class ucrCalculator End Sub Private Sub cmdComplexi_Click(sender As Object, e As EventArgs) Handles cmdComplexi.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("i", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("i", -1) End Sub Private Sub cmdAsComplex_Click_1(sender As Object, e As EventArgs) Handles cmdAsComplex.Click From 3343d8c247b233c3f6da55c500866a386a82ae24 Mon Sep 17 00:00:00 2001 From: JUMA Date: Mon, 18 Mar 2024 15:03:13 +0300 Subject: [PATCH 15/27] change --- instat/ucrCalculator.vb | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index d4caaa495ee..dd3399b016c 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -291,27 +291,27 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdComplexSignif, "Rounds to give the specified number off digits in the larger of the components. For example signif(0.424 + 511.38i, 3) gives (0 + 511i)") 'Hydro GOF keyboard tooltips - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() - ttCalculator.SetToolTip() + ttCalculator.SetToolTip(cmdBr2, "r-squared times the slope of the regression line between sim and obs") + 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(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)") Const strTooltipCmdLength = "number of observations: For example length(c(1,2,3,4,NA)) = 5 " ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength) From 3544582f6692332e180f5a4be17201c7b08c64d9 Mon Sep 17 00:00:00 2001 From: JUMA Date: Mon, 18 Mar 2024 15:26:07 +0300 Subject: [PATCH 16/27] chng --- instat/ucrCalculator.Designer.vb | 382 +++++++++++++++---------------- instat/ucrCalculator.vb | 2 +- 2 files changed, 192 insertions(+), 192 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 103de4be792..d02624f665e 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() @@ -173,7 +177,7 @@ Partial Class ucrCalculator Me.cmdRNSE = New System.Windows.Forms.Button() Me.cmdRmse = New System.Windows.Forms.Button() Me.cmdRd = New System.Windows.Forms.Button() - Me.cmdPbiasfde = New System.Windows.Forms.Button() + Me.cmdPbiasfdc = New System.Windows.Forms.Button() Me.cmdPbias = New System.Windows.Forms.Button() Me.cmdNSE = New System.Windows.Forms.Button() Me.cmdNrmse = 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,6 +483,7 @@ 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() @@ -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,53 +617,42 @@ 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() - Me.ContextMenuStripComplex.SuspendLayout() - Me.grpInteger.SuspendLayout() - Me.ContextMenuStripInteger.SuspendLayout() - Me.grpFactor.SuspendLayout() - Me.ContextMenuStripFactor.SuspendLayout() - Me.grpHydroGOF.SuspendLayout() - Me.ContextMenuStripHydroGOF.SuspendLayout() - Me.grpWakefield.SuspendLayout() - Me.grpMaths.SuspendLayout() - Me.ContextMenuStripMaths.SuspendLayout() - Me.grpSummary.SuspendLayout() - Me.ContextMenuStripSummary.SuspendLayout() - Me.grpFrequencies.SuspendLayout() - Me.grpProbabilty.SuspendLayout() - Me.ContextMenuStripProbability.SuspendLayout() - Me.grpRandom.SuspendLayout() - Me.grpTransform.SuspendLayout() - Me.ContextMenuStripTransform.SuspendLayout() - Me.grpLogical.SuspendLayout() - Me.ContextMenuStripLogical.SuspendLayout() - Me.grpTestString.SuspendLayout() - Me.grpCircular.SuspendLayout() - Me.ContextMenuStripCircular.SuspendLayout() - Me.grpModifier.SuspendLayout() - Me.grpSymbols.SuspendLayout() - Me.grpComplex.SuspendLayout() - Me.ContextMenuStripTxtString.SuspendLayout() - Me.ContextMenuStripWakefield.SuspendLayout() - Me.ContextMenuStripList.SuspendLayout() - Me.grpList.SuspendLayout() - Me.GroupBox1.SuspendLayout() - Me.grpMathBloc.SuspendLayout() - Me.SuspendLayout() + Me.grpBasic.SuspendLayout + Me.grpDates.SuspendLayout + Me.ContextMenuStripDate.SuspendLayout + Me.ContextMenuStripComplex.SuspendLayout + Me.grpInteger.SuspendLayout + Me.ContextMenuStripInteger.SuspendLayout + Me.grpFactor.SuspendLayout + Me.ContextMenuStripFactor.SuspendLayout + Me.grpHydroGOF.SuspendLayout + Me.ContextMenuStripHydroGOF.SuspendLayout + Me.grpWakefield.SuspendLayout + Me.grpMaths.SuspendLayout + Me.ContextMenuStripMaths.SuspendLayout + Me.grpSummary.SuspendLayout + Me.ContextMenuStripSummary.SuspendLayout + Me.grpFrequencies.SuspendLayout + Me.grpProbabilty.SuspendLayout + Me.ContextMenuStripProbability.SuspendLayout + Me.grpRandom.SuspendLayout + Me.grpTransform.SuspendLayout + Me.ContextMenuStripTransform.SuspendLayout + Me.grpLogical.SuspendLayout + Me.ContextMenuStripLogical.SuspendLayout + Me.grpTestString.SuspendLayout + Me.grpCircular.SuspendLayout + Me.ContextMenuStripCircular.SuspendLayout + Me.grpModifier.SuspendLayout + Me.grpSymbols.SuspendLayout + Me.grpComplex.SuspendLayout + Me.ContextMenuStripTxtString.SuspendLayout + Me.ContextMenuStripWakefield.SuspendLayout + Me.ContextMenuStripList.SuspendLayout + Me.grpList.SuspendLayout + Me.GroupBox1.SuspendLayout + Me.grpMathBloc.SuspendLayout + Me.SuspendLayout ' 'lblExpression ' @@ -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) @@ -1999,7 +2035,7 @@ Partial Class ucrCalculator Me.grpHydroGOF.Controls.Add(Me.cmdRNSE) Me.grpHydroGOF.Controls.Add(Me.cmdRmse) Me.grpHydroGOF.Controls.Add(Me.cmdRd) - Me.grpHydroGOF.Controls.Add(Me.cmdPbiasfde) + Me.grpHydroGOF.Controls.Add(Me.cmdPbiasfdc) Me.grpHydroGOF.Controls.Add(Me.cmdPbias) Me.grpHydroGOF.Controls.Add(Me.cmdNSE) Me.grpHydroGOF.Controls.Add(Me.cmdNrmse) @@ -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) @@ -2122,16 +2170,16 @@ Partial Class ucrCalculator Me.cmdRd.Text = "rd" Me.cmdRd.UseVisualStyleBackColor = True ' - 'cmdPbiasfde + 'cmdPbiasfdc ' - Me.cmdPbiasfde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfde.Location = New System.Drawing.Point(2, 178) - Me.cmdPbiasfde.Margin = New System.Windows.Forms.Padding(2) - Me.cmdPbiasfde.Name = "cmdPbiasfde" - Me.cmdPbiasfde.Size = New System.Drawing.Size(75, 40) - Me.cmdPbiasfde.TabIndex = 12 - Me.cmdPbiasfde.Text = "pbiasfdc" - Me.cmdPbiasfde.UseVisualStyleBackColor = True + Me.cmdPbiasfdc.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 178) + Me.cmdPbiasfdc.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbiasfdc.Name = "cmdPbiasfdc" + Me.cmdPbiasfdc.Size = New System.Drawing.Size(75, 40) + Me.cmdPbiasfdc.TabIndex = 12 + Me.cmdPbiasfdc.Text = "pbiasfdc" + Me.cmdPbiasfdc.UseVisualStyleBackColor = True ' 'cmdPbias ' @@ -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) @@ -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) @@ -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,138 +7357,6 @@ 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!) @@ -7782,7 +7782,7 @@ Partial Class ucrCalculator Friend WithEvents cmdNrmse As Button Friend WithEvents cmdRmse As Button Friend WithEvents cmdRd As Button - Friend WithEvents cmdPbiasfde As Button + Friend WithEvents cmdPbiasfdc As Button Friend WithEvents cmdRSD As Button Friend WithEvents cmdRPearson As Button Friend WithEvents cmdRNSE As Button diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index dd3399b016c..7ee6490d450 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -3962,7 +3962,7 @@ Public Class ucrCalculator End If End Sub - Private Sub cmdPbiasfde_Click(sender As Object, e As EventArgs) Handles cmdPbiasfde.Click + Private Sub cmdPbiasfdc_Click(sender As Object, e As EventArgs) Handles cmdPbiasfdc.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hydroGOF::pbiasfdc(sim = , obs = , plot = FALSE)", 24) Else From 9d6cd14655380d327ef704c44ff0dbbaa7ab88a0 Mon Sep 17 00:00:00 2001 From: JUMA Date: Tue, 19 Mar 2024 11:23:33 +0300 Subject: [PATCH 17/27] changes --- instat/ucrCalculator.Designer.vb | 22 +++++++++++----------- instat/ucrCalculator.vb | 10 +++++++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index d02624f665e..709a918ed4a 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -252,7 +252,7 @@ Partial Class ucrCalculator Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsCarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.MathsCirucarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MathsCircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdAtan2 = New System.Windows.Forms.Button() Me.cmdLogistic = New System.Windows.Forms.Button() Me.cmdLogit = New System.Windows.Forms.Button() @@ -3032,33 +3032,33 @@ Partial Class ucrCalculator 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCirucarToolStripMenuItem}) + Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCircularToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(123, 100) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(211, 128) ' 'MathsBaseStripMenuItem ' Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" - Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(210, 24) Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(210, 24) Me.MathsStatsStripMenuItem.Text = "stats" ' 'MathsCarToolStripMenuItem ' Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" - Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(210, 24) Me.MathsCarToolStripMenuItem.Text = "car" ' - 'MathsCirucarToolStripMenuItem + 'MathsCircularToolStripMenuItem ' - Me.MathsCirucarToolStripMenuItem.Name = "MathsCirucarToolStripMenuItem" - Me.MathsCirucarToolStripMenuItem.Size = New System.Drawing.Size(122, 24) - Me.MathsCirucarToolStripMenuItem.Text = "cirucar" + Me.MathsCircularToolStripMenuItem.Name = "MathsCircularToolStripMenuItem" + Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsCircularToolStripMenuItem.Text = "circular" ' 'cmdAtan2 ' @@ -8024,7 +8024,7 @@ Partial Class ucrCalculator Friend WithEvents cmdwhichmin As Button Friend WithEvents MathsBaseStripMenuItem As ToolStripMenuItem Friend WithEvents MathsCarToolStripMenuItem As ToolStripMenuItem - Friend WithEvents MathsCirucarToolStripMenuItem As ToolStripMenuItem + Friend WithEvents MathsCircularToolStripMenuItem As ToolStripMenuItem Friend WithEvents cmdComplexi As Button Friend WithEvents cmdAsComplex As Button End Class diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 7ee6490d450..935b8365d0c 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -162,6 +162,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdQt, "t quantiles. For example qt(0.05, 5) = -2.015; qt(0.05, 100) = -1.66") ttCalculator.SetToolTip(cmdqF, "F quantiles. For example qf(0.95,1,10) = 4.965; qf(0.95, 50,50)= 1.599") + 'maths keyboard tooltips ttCalculator.SetToolTip(cmdDeg, "Change for radians to degrees. For example deg(pi/2) = 90.") ttCalculator.SetToolTip(cmdExp, "The exponential function. exp(1) = e = 2.71828. exp(0) = 1, exp(-2) = 0.1353 = 1/exp(2). It is the inverse of the log function, so exp(6.238) = 512, while log(512) = 6.238.") ttCalculator.SetToolTip(cmdAbs, "The absolute (or positive) value. For example abs (-4.4) = abs(4.4) = 4.4.") @@ -181,7 +182,8 @@ Public Class ucrCalculator 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.") + 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.") + ttCalculator.SetToolTip(cmdTrunc, "truncates the values towards 0. So trunc(3.5) = 3, trunc(-3.5)= -3") ttCalculator.SetToolTip(cmdUpper, "Change to upper case. For example str_to_upper(""Dr. Foster"") gives ""DR. FOSTER""") ttCalculator.SetToolTip(cmdLower, "Change to lower case. For example str_to_lower(""Dr. Foster"") gives ""dr. foster""") @@ -276,6 +278,8 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdPrimorial, "gives the primorial (like the factorial, but just the primes up to the number) for a variable. For example primorial(c(7,8,9)) = 235*7 = (210, 210, 210)") ' Complex keyboard tooltips + ttCalculator.SetToolTip(cmdComplexPi, "pi = 3.14159") + ttCalculator.SetToolTip(cmdComplexi, "i is defined as the square root of -1. So sqrt(as.complex(-1)) = 0 + 1i") ttCalculator.SetToolTip(cmdComplex, "Construct a complex number. For example complex(3, 2) gives 3 + 2i.") ttCalculator.SetToolTip(cmdAsComplex, "Define a variable as complex. For example as.complex(-1) gives 1 + 0i") ttCalculator.SetToolTip(cmdReal, "The real part of a complex number. For example Re(3 + 2i) gives 3.") @@ -299,7 +303,7 @@ Public Class ucrCalculator 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(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") @@ -4855,7 +4859,7 @@ Public Class ucrCalculator OpenHelpPage() End Sub - Private Sub MathsCirucarToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsCirucarToolStripMenuItem.Click + Private Sub MathsCircularToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsCircularToolStripMenuItem.Click If ucrInputCalOptions.GetText = "Maths" Then strPackageName = "circular" End If From 1ada7b1bc73af09659c20e62d1690a8c942255e5 Mon Sep 17 00:00:00 2001 From: JUMA Date: Tue, 19 Mar 2024 12:05:04 +0300 Subject: [PATCH 18/27] chnages --- instat/frmMain.vb | 1 - instat/ucrCalculator.Designer.vb | 30 +++++++++++++++--------------- instat/ucrCalculator.vb | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 1104e78f4bc..23b648dabf7 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2283,7 +2283,6 @@ Public Class frmMain Private Sub mnuPrepareCheckDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataVisualiseData.Click dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Prepare dlgVisualizeData.ShowDialog() - ' ucrBase.iHelpTopicID = 54 End Sub Private Sub mnuClimaticCompareCalculation_Click(sender As Object, e As EventArgs) Handles mnuClimaticCompareCalculation.Click diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 709a918ed4a..f57d54d06d2 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -3034,30 +3034,30 @@ Partial Class ucrCalculator Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCircularToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(211, 128) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(127, 100) ' 'MathsBaseStripMenuItem ' Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" - Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.MathsStatsStripMenuItem.Text = "stats" ' 'MathsCarToolStripMenuItem ' Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" - Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.MathsCarToolStripMenuItem.Text = "car" ' 'MathsCircularToolStripMenuItem ' Me.MathsCircularToolStripMenuItem.Name = "MathsCircularToolStripMenuItem" - Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(210, 24) + Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.MathsCircularToolStripMenuItem.Text = "circular" ' 'cmdAtan2 @@ -6295,7 +6295,7 @@ Partial Class ucrCalculator Me.cmdComplexTanH.Location = New System.Drawing.Point(198, 128) Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTanH.Name = "cmdComplexTanH" - Me.cmdComplexTanH.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexTanH.Size = New System.Drawing.Size(82, 38) Me.cmdComplexTanH.TabIndex = 208 Me.cmdComplexTanH.Text = "tanh" Me.cmdComplexTanH.UseVisualStyleBackColor = True @@ -6307,7 +6307,7 @@ Partial Class ucrCalculator Me.cmdComplexTan.Location = New System.Drawing.Point(198, 92) Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTan.Name = "cmdComplexTan" - Me.cmdComplexTan.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexTan.Size = New System.Drawing.Size(82, 38) Me.cmdComplexTan.TabIndex = 207 Me.cmdComplexTan.Text = "tan" Me.cmdComplexTan.UseVisualStyleBackColor = True @@ -6328,7 +6328,7 @@ Partial Class ucrCalculator ' Me.cmdComplexDeg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexDeg.Location = New System.Drawing.Point(269, 92) + Me.cmdComplexDeg.Location = New System.Drawing.Point(279, 92) Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexDeg.Name = "cmdComplexDeg" Me.cmdComplexDeg.Size = New System.Drawing.Size(79, 38) @@ -6340,7 +6340,7 @@ Partial Class ucrCalculator ' Me.cmdComplexRad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRad.Location = New System.Drawing.Point(269, 58) + Me.cmdComplexRad.Location = New System.Drawing.Point(279, 58) Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRad.Name = "cmdComplexRad" Me.cmdComplexRad.Size = New System.Drawing.Size(79, 38) @@ -6355,7 +6355,7 @@ Partial Class ucrCalculator Me.cmdComplexSignif.Location = New System.Drawing.Point(198, 165) Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(72, 38) + Me.cmdComplexSignif.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6412,7 +6412,7 @@ Partial Class ucrCalculator ' Me.cmdComplexExp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexExp.Location = New System.Drawing.Point(269, 128) + Me.cmdComplexExp.Location = New System.Drawing.Point(279, 128) Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexExp.Name = "cmdComplexExp" Me.cmdComplexExp.Size = New System.Drawing.Size(79, 38) @@ -6436,7 +6436,7 @@ Partial Class ucrCalculator ' Me.cmdComplexLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexLog.Location = New System.Drawing.Point(269, 165) + Me.cmdComplexLog.Location = New System.Drawing.Point(279, 165) Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexLog.Name = "cmdComplexLog" Me.cmdComplexLog.Size = New System.Drawing.Size(79, 38) @@ -6463,7 +6463,7 @@ Partial Class ucrCalculator Me.cmdConjugate.Location = New System.Drawing.Point(198, 58) Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(72, 38) + Me.cmdConjugate.Size = New System.Drawing.Size(82, 38) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6496,7 +6496,7 @@ Partial Class ucrCalculator ' Me.cmdImaginary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdImaginary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdImaginary.Location = New System.Drawing.Point(269, 22) + Me.cmdImaginary.Location = New System.Drawing.Point(279, 22) Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdImaginary.Name = "cmdImaginary" Me.cmdImaginary.Size = New System.Drawing.Size(79, 38) @@ -6511,7 +6511,7 @@ Partial Class ucrCalculator Me.cmdReal.Location = New System.Drawing.Point(198, 22) Me.cmdReal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReal.Name = "cmdReal" - Me.cmdReal.Size = New System.Drawing.Size(72, 38) + Me.cmdReal.Size = New System.Drawing.Size(82, 38) Me.cmdReal.TabIndex = 177 Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 935b8365d0c..20037807dfb 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -290,7 +290,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdComplexRad, "Change from degrees to radians. For example rad(90 + 180i) gives (1.571 + 3.142i)") ttCalculator.SetToolTip(cmdComplexDeg, " Change from radians to degrees. For example deg(pi/2 + 3.142i) gives (90 + 180i)") ttCalculator.SetToolTip(cmdComplexSqrt, "Square root. For example sqrt(-9 + 0i) gives (0 + 3i) or just 3i. sqrt(-9 + 2i) gives 0.331 + 3.018i)") - ttCalculator.SetToolTip(cmdComplexExp, "The exponential function. For example exp(3 + 2i) gives") + 'to add ttCalculator.SetToolTip(cmdComplexExp, "The exponential function. For example exp(3 + 2i) gives") ttCalculator.SetToolTip(cmdComplexRound, "round(pi/2 + 3.14259i) gives 2 + 3i) so rounds to whole numbers. round(pi/2 + 3.14259i, 2) gives 1.57 + 3.14i, so rounds to 2 decimals.") ttCalculator.SetToolTip(cmdComplexSignif, "Rounds to give the specified number off digits in the larger of the components. For example signif(0.424 + 511.38i, 3) gives (0 + 511i)") From ea74aacf55b5e2d5330ebcdca232b84b100ed4c6 Mon Sep 17 00:00:00 2001 From: JUMA Date: Tue, 19 Mar 2024 12:31:20 +0300 Subject: [PATCH 19/27] chng --- instat/ucrCalculator.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 20037807dfb..381519109b4 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -163,7 +163,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdqF, "F quantiles. For example qf(0.95,1,10) = 4.965; qf(0.95, 50,50)= 1.599") 'maths keyboard tooltips - ttCalculator.SetToolTip(cmdDeg, "Change for radians to degrees. For example deg(pi/2) = 90.") + ttCalculator.SetToolTip(cmdDeg, "Change from radians to degrees. For example deg(pi/2) = 90.") ttCalculator.SetToolTip(cmdExp, "The exponential function. exp(1) = e = 2.71828. exp(0) = 1, exp(-2) = 0.1353 = 1/exp(2). It is the inverse of the log function, so exp(6.238) = 512, while log(512) = 6.238.") ttCalculator.SetToolTip(cmdAbs, "The absolute (or positive) value. For example abs (-4.4) = abs(4.4) = 4.4.") ttCalculator.SetToolTip(cmdSign, "The sign of the corresponding values. So sign(4.2)=1, sign(-20)=-1, sign(c(-2,-1,0,1,2,3))= (-1,-1,0,1,1,1)") @@ -284,7 +284,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdAsComplex, "Define a variable as complex. For example as.complex(-1) gives 1 + 0i") ttCalculator.SetToolTip(cmdReal, "The real part of a complex number. For example Re(3 + 2i) gives 3.") ttCalculator.SetToolTip(cmdImaginary, "The imaginary part of a complex number or variable. For example Im(3 + 2i) gives 2.") - ttCalculator.SetToolTip(cmdMod, "The modulus (polar coordinate) of a complex number or variable. For example Mod(3 + 2i) gives 3.606, which is sqrt(33 + 22). Also abs(3 + 2i) is the same as Mod(3 + 2i).") + ttCalculator.SetToolTip(cmdMod, "The modulus (polar coordinate) of a complex number or variable. For example Mod(3 + 2i) gives 3.606, which is sqrt(33 + 22 ). Also abs(3 + 2i) is the same as Mod(3 + 2i).") ttCalculator.SetToolTip(cmdArg, " The argument (polar coordinate) of a complex number or variable. For example Arg(3 + 2i) gives 0.588 where 3 = 3.606cos(0.588) and 2 = 3.606sin(0.588).") ttCalculator.SetToolTip(cmdConjugate, "Conjugate of a complex number or variable: For example Conj(3 + 2i) gives 3 - 2i.") ttCalculator.SetToolTip(cmdComplexRad, "Change from degrees to radians. For example rad(90 + 180i) gives (1.571 + 3.142i)") From 4204678443076c8b56fa16c8dd81b3b1ea010bde Mon Sep 17 00:00:00 2001 From: JUMA Date: Tue, 19 Mar 2024 12:36:28 +0300 Subject: [PATCH 20/27] design --- instat/ucrCalculator.Designer.vb | 314 +++++++++++++++---------------- 1 file changed, 157 insertions(+), 157 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index f57d54d06d2..39d67feea25 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -62,7 +62,6 @@ 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() @@ -119,7 +118,6 @@ 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() @@ -142,7 +140,6 @@ 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() @@ -166,7 +163,6 @@ 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() @@ -247,7 +243,6 @@ 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() @@ -281,7 +276,6 @@ 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() @@ -335,7 +329,6 @@ 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() @@ -384,7 +377,6 @@ 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() @@ -419,7 +411,6 @@ 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() @@ -483,7 +474,6 @@ 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() @@ -526,7 +516,6 @@ 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() @@ -617,6 +606,17 @@ 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,18 +953,6 @@ 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) @@ -1562,18 +1550,6 @@ 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) @@ -1779,18 +1755,6 @@ 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) @@ -2057,18 +2021,6 @@ 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) @@ -3017,18 +2969,6 @@ 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) @@ -3407,18 +3347,6 @@ 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) @@ -4041,18 +3969,6 @@ 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) @@ -4643,18 +4559,6 @@ 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) @@ -5010,18 +4914,6 @@ 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) @@ -5769,18 +5661,6 @@ 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) @@ -6276,18 +6156,6 @@ 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!) @@ -6400,7 +6268,7 @@ Partial Class ucrCalculator ' Me.cmdComplexSin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSin.Location = New System.Drawing.Point(30, 95) + Me.cmdComplexSin.Location = New System.Drawing.Point(30, 92) Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSin.Name = "cmdComplexSin" Me.cmdComplexSin.Size = New System.Drawing.Size(82, 38) @@ -7357,12 +7225,145 @@ 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) @@ -7375,7 +7376,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) Me.Controls.Add(Me.grpSymbols) - Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpWakefield) Me.Controls.Add(Me.grpTransform) @@ -7393,44 +7393,44 @@ Partial Class 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 From e425f1c14ebc6f2bf18cf68998be50435e264bc8 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 19 Mar 2024 13:02:47 +0100 Subject: [PATCH 21/27] minor change --- instat/dlgHeatMapPlot.vb | 41 +++++++++------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index 924be4c1748..aef1a4223e8 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -56,10 +56,6 @@ Public Class dlgHeatMapPlot clsSummariseFunction, clsDummyFunction, clsGeomJitterFunction, clsScalefillDistillerFunction, clsFillBrewerFunction, clsScalefillmanualFunction, clsScalefillgradientFunction As New RFunction - Private Sub AllControlsContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveGraph.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrReceiverLatitude.ControlContentsChanged, ucrInputColour.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged - - End Sub - Private Sub dlgHeatMapPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -970,57 +966,38 @@ Public Class dlgHeatMapPlot End Sub Private Sub ChangePalette() + ' Remove all existing palette-related parameters + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("scale_fill_manual") + clsBaseOperator.RemoveParameterByName("scale_fill_gradient") If rdoViridis.Checked Then clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_manual") ElseIf rdoPalette.Checked Then - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") - clsBaseOperator.RemoveParameterByName("scale_fill_manual") If Not ucrReceiverFill.IsEmpty OrElse Not ucrReceiverFillChoropleth.IsEmpty Then - If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor" Then - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" Then clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=2) Else - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=2) End If - Else - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") End If ElseIf rdoGradient.Checked Then - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - If Not ucrReceiverFill.IsEmpty OrElse Not ucrReceiverFillChoropleth.IsEmpty Then - If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFill.strCurrDataType = "ordered,factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "ordered,factor" Then - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") + If Not ucrReceiverFill.IsEmpty Or Not ucrReceiverFillChoropleth.IsEmpty Then + If ucrReceiverFill.strCurrDataType = "factor" OrElse ucrReceiverFillChoropleth.strCurrDataType = "factor" Then If Not ucrInputValue.IsEmpty() Then clsScalefillmanualFunction.AddParameter("values", ucrInputValue.clsRList.ToScript(), iPosition:=0) clsBaseOperator.AddParameter("scale_fill_manual", clsRFunctionParameter:=clsScalefillmanualFunction, iPosition:=2) - Else - clsScalefillmanualFunction.RemoveParameterByName("values") End If Else - clsBaseOperator.RemoveParameterByName("scale_fill_manual") If Not ucrColourTo.IsEmpty AndAlso Not ucrColourFrom.IsEmpty Then clsScalefillgradientFunction.AddParameter("low", Chr(34) & ucrColourFrom.GetText() & Chr(34), iPosition:=0) clsScalefillgradientFunction.AddParameter("high", Chr(34) & ucrColourTo.GetText() & Chr(34), iPosition:=1) clsBaseOperator.AddParameter("scale_fill_gradient", clsRFunctionParameter:=clsScalefillgradientFunction, iPosition:=2) - Else - clsScalefillgradientFunction.RemoveParameterByName("low") - clsScalefillgradientFunction.RemoveParameterByName("high") End If End If - Else - clsBaseOperator.RemoveParameterByName("scale_fill_manual") - clsBaseOperator.RemoveParameterByName("scale_fill_gradient") End If End If End Sub From 365c6f213ec62750f9a1263c8529ff874d1a8b7a Mon Sep 17 00:00:00 2001 From: JUMA Date: Wed, 20 Mar 2024 09:21:15 +0300 Subject: [PATCH 22/27] changes --- instat/ucrCalculator.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 381519109b4..80934c61369 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -284,7 +284,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdAsComplex, "Define a variable as complex. For example as.complex(-1) gives 1 + 0i") ttCalculator.SetToolTip(cmdReal, "The real part of a complex number. For example Re(3 + 2i) gives 3.") ttCalculator.SetToolTip(cmdImaginary, "The imaginary part of a complex number or variable. For example Im(3 + 2i) gives 2.") - ttCalculator.SetToolTip(cmdMod, "The modulus (polar coordinate) of a complex number or variable. For example Mod(3 + 2i) gives 3.606, which is sqrt(33 + 22 ). Also abs(3 + 2i) is the same as Mod(3 + 2i).") + ttCalculator.SetToolTip(cmdMod, "The modulus (polar coordinate) of a complex number or variable. For example Mod(3 + 2i) gives 3.606, which is sqrt(3*3 + 2*2). Also abs(3 + 2i) is the same as Mod(3 + 2i).") ttCalculator.SetToolTip(cmdArg, " The argument (polar coordinate) of a complex number or variable. For example Arg(3 + 2i) gives 0.588 where 3 = 3.606cos(0.588) and 2 = 3.606sin(0.588).") ttCalculator.SetToolTip(cmdConjugate, "Conjugate of a complex number or variable: For example Conj(3 + 2i) gives 3 - 2i.") ttCalculator.SetToolTip(cmdComplexRad, "Change from degrees to radians. For example rad(90 + 180i) gives (1.571 + 3.142i)") @@ -4844,7 +4844,6 @@ Public Class ucrCalculator OpenHelpPage() End Sub - Private Sub MathsStatsStripMenuItem_Click(sender As Object, e As EventArgs) Handles MathsStatsStripMenuItem.Click If ucrInputCalOptions.GetText = "Maths" Then strPackageName = "stats" From 8f8b2082a3811605e552005e15d00bd686c80414 Mon Sep 17 00:00:00 2001 From: JUMA Date: Wed, 20 Mar 2024 13:15:41 +0300 Subject: [PATCH 23/27] changes --- instat/frmConvertToNumeric.vb | 4 +- instat/ucrCalculator.Designer.vb | 118 +++++++++++++++---------------- instat/ucrCalculator.resx | 2 +- instat/ucrCalculator.vb | 50 ++++++++----- 4 files changed, 95 insertions(+), 79 deletions(-) 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..fb675e98fd2 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -606,6 +606,10 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() + Me.cmdCircularHelp = New instat.ucrSplitButton() + Me.cmdMathsHelp = New instat.ucrSplitButton() + Me.cmdProbRHelp = New instat.ucrSplitButton() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.cmdTransformRHelp = New instat.ucrSplitButton() @@ -613,10 +617,6 @@ Partial Class ucrCalculator 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 @@ -7225,6 +7225,54 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + '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 + ' 'cmdComplexRHelp ' Me.cmdComplexRHelp.AutoSize = True @@ -7309,61 +7357,12 @@ Partial Class ucrCalculator 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,12 +7389,6 @@ 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) 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..9f33ac191b7 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -105,7 +105,6 @@ Public Class ucrCalculator 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") @@ -317,6 +316,25 @@ Public Class ucrCalculator 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, so from 0 and 6.28.") + 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(cmdCircQuantile, "Defined quantile 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) ttCalculator.SetToolTip(cmdListLength, 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())", 44) 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)", 17) 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)", 55) 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(), )", 76) 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)", 18) 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)", 18) 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)", 17) 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)", 17) 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)", 55) 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)", 52) 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)", 52) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 1)", 13) End If @@ -3341,7 +3359,7 @@ 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)", 55) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = 0.75)", 16) End If @@ -3349,7 +3367,7 @@ Public Class ucrCalculator Private Sub cmdCircQuantile_Click_1(sender As Object, e As EventArgs) Handles cmdCircQuantile.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)", 66) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 28) End If @@ -3357,7 +3375,7 @@ Public Class ucrCalculator 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)", 17) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular()", 1) End If From ad7f43b61e377538920319f8284cce6fac89d667 Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 21 Mar 2024 10:29:04 +0300 Subject: [PATCH 24/27] caps --- instat/ucrCalculator.vb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 9f33ac191b7..e667ebe54fb 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -317,22 +317,22 @@ Public Class ucrCalculator 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(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, so from 0 and 6.28.") - 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(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(cmdCircQuantile, "Defined quantile 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(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).") + 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 " From 0ccbc19888ffbdd47485dd16f29b7fd9089a5867 Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 21 Mar 2024 10:43:05 +0300 Subject: [PATCH 25/27] chng --- instat/ucrCalculator.Designer.vb | 334 +++++++++++++++---------------- instat/ucrCalculator.vb | 8 +- 2 files changed, 171 insertions(+), 171 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index fb675e98fd2..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.cmdCircularHelp = New instat.ucrSplitButton() - Me.cmdMathsHelp = New instat.ucrSplitButton() - Me.cmdProbRHelp = New instat.ucrSplitButton() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() - 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.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,138 +7357,6 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' - '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 - ' - '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 - ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) @@ -7393,44 +7393,44 @@ Partial Class 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.vb b/instat/ucrCalculator.vb index e667ebe54fb..2c68614e0d5 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -319,11 +319,11 @@ Public Class ucrCalculator ' 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, so from 0 and 6.28.") + 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(cmdCircQuantile, "Defined quantile round the circle. With 0.5 it is the (circular) median, so is 1.5 for 1,2,3,6.") + 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") @@ -3279,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 = TRUE, method = c(HL1,HL2,HL3), prop = NULL)", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x = , na.rm = TRUE, method = c(""HL1"",""HL2"",""HL3""), prop = NULL)", 55) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular()", 1) End If @@ -3365,7 +3365,7 @@ Public Class ucrCalculator 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 = TRUE, names = TRUE, type = 7)", 66) Else From 3eb1dd3f862adef30352feb39f1bb327ba2959c1 Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 21 Mar 2024 12:15:15 +0300 Subject: [PATCH 26/27] chng --- instat/ucrCalculator.vb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 2c68614e0d5..65a4216ccc3 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -3263,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 = TRUE, 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 @@ -3271,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 = TRUE)", 17) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x = , na.rm = TRUE)", 16) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular()", 1) End If @@ -3279,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 = TRUE, 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 @@ -3287,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 = TRUE, 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 @@ -3295,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 = TRUE)", 18) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular(x = , na.rm = TRUE)", 17) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular()", 1) End If @@ -3303,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 = TRUE)", 18) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular(x = , na.rm = TRUE)", 17) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular()", 1) End If @@ -3319,7 +3319,7 @@ Public Class ucrCalculator 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 = TRUE)", 17) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance(x = , na.rm = TRUE)", 16) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance()", 1) End If @@ -3327,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 = TRUE)", 17) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation(x = , na.rm = TRUE)", 16) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation()", 1) End If @@ -3335,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 = TRUE, 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 @@ -3343,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 = TRUE, 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 @@ -3351,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 = TRUE, 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 @@ -3359,7 +3359,7 @@ 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 = TRUE, 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 @@ -3367,15 +3367,15 @@ Public Class ucrCalculator 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 = TRUE, 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 = TRUE)", 17) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular(x = , na.rm = TRUE)", 16) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular()", 1) End If From 799de89c2d575ac8180d1aaae6af5cc343bd3d4a Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 21 Mar 2024 12:20:43 +0300 Subject: [PATCH 27/27] caps --- instat/ucrCalculator.vb | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 65a4216ccc3..ff43b949970 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -73,35 +73,35 @@ 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)") @@ -135,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") @@ -178,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.") @@ -298,23 +298,23 @@ 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.")