MeSophie · MeSophie · Jul 22, 2024 · Dec 7, 2023 · Dec 13, 2023 · Dec 13, 2023
diff --git a/instat/DlgDefineClimaticData.vb b/instat/DlgDefineClimaticData.vb
@@ -54,8 +54,8 @@ Public Class DlgDefineClimaticData
         Dim kvpLongitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lon", {"lon", "lont", "longitude"}.ToList())
         Dim kvpLatitude As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("lat", {"lat", "latitude"}.ToList())
         Dim kvpCloudCover As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("cloud_cover", {"cloud"}.ToList())
-        Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max"}.ToList())
-        Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min"}.ToList())
+        Dim kvpTempMax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"tmax", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList())
+        Dim kvpTempMin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"tmin", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList())
         Dim kvpRadiation As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("radiation", {"radiation", "rad"}.ToList())
         Dim kvpSunshineHours As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("sunshine_hours", {"sunshine", "sunh", "sunhrs"}.ToList())
         Dim kvpWindDirection As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("wind_direction", {"winddirection"}.ToList())

diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb
@@ -224,7 +224,7 @@ Public Class dlgBarAndPieChart
         ucrReceiverWordcloudAngle.Selector = ucrBarChartSelector
 
         ucrSaveBar.SetIsComboBox()
-        ucrSaveBar.SetCheckBoxText("Save Graph")
+        ucrSaveBar.SetCheckBoxText("Store Graph")
         ucrSaveBar.SetDataFrameSelector(ucrBarChartSelector.ucrAvailableDataFrames)
         ucrSaveBar.SetSaveTypeAsGraph()
         ucrSaveBar.SetPrefix("bar_plot")

diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -85,6 +85,8 @@ Public Class dlgCalculator
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 14
+
         ucrCalc.ucrReceiverForCalculation.SetMeAsReceiver()
         ucrCalc.ucrTryCalculator.SetIsCommand()
         ucrCalc.ucrTryCalculator.SetReceiver(ucrCalc.ucrReceiverForCalculation)
@@ -262,7 +264,6 @@ Public Class dlgCalculator
     Private Sub SetHelpOptions()
         Select Case enumCalculatorMode
             Case CalculatorMode.Prepare
-                ucrCalc.ucrInputCalOptions.SetName("Basic")
                 ucrBase.iHelpTopicID = 14
             Case CalculatorMode.Structured
                 ucrCalc.ucrInputCalOptions.SetName("Circular")
@@ -336,6 +337,7 @@ Public Class dlgCalculator
                 ucrBase.iHelpTopicID = 439
             Case Else
                 Me.Width = iBasicWidth
+                ucrBase.iHelpTopicID = 14
         End Select
     End Sub
 End Class

diff --git a/instat/dlgCanonicalCorrelationAnalysis.vb b/instat/dlgCanonicalCorrelationAnalysis.vb
@@ -66,7 +66,7 @@ Public Class dlgCanonicalCorrelationAnalysis
         ucrSaveResult.SetSaveType(RObjectTypeLabel.Model, strRObjectFormat:=RObjectFormat.Text)
         ucrSaveResult.SetDataFrameSelector(ucrSelectorCCA.ucrAvailableDataFrames)
         ucrSaveResult.SetIsComboBox()
-        ucrSaveResult.SetCheckBoxText("Save Model")
+        ucrSaveResult.SetCheckBoxText("Store Model")
         ucrSaveResult.SetAssignToIfUncheckedValue("last_model")
 
     End Sub

diff --git a/instat/dlgCircularDensityPlot.vb b/instat/dlgCircularDensityPlot.vb
@@ -103,7 +103,7 @@ Public Class dlgCircularDensityPlot
         ucrSaveDensity.SetPrefix("circular_density")
         ucrSaveDensity.SetDataFrameSelector(ucrSelectorDataFrame.ucrAvailableDataFrames)
         ucrSaveDensity.SetIsComboBox()
-        ucrSaveDensity.SetCheckBoxText("Save Graph")
+        ucrSaveDensity.SetCheckBoxText("Store Graph")
         ucrSaveDensity.SetSaveTypeAsGraph()
         ucrSaveDensity.SetAssignToIfUncheckedValue("last_graph")
 

diff --git a/instat/dlgClimaticBoxPlot.vb b/instat/dlgClimaticBoxPlot.vb
@@ -200,7 +200,7 @@ Public Class dlgClimaticBoxPlot
 
         ucrSavePlot.SetPrefix("box_plot")
         ucrSavePlot.SetIsComboBox()
-        ucrSavePlot.SetCheckBoxText("Save Graph")
+        ucrSavePlot.SetCheckBoxText("Store Graph")
         ucrSavePlot.SetSaveTypeAsGraph()
         ucrSavePlot.SetDataFrameSelector(ucrSelectorClimaticBoxPlot.ucrAvailableDataFrames)
         ucrSavePlot.SetAssignToIfUncheckedValue("last_graph")

diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb
@@ -120,7 +120,7 @@ Public Class dlgClimaticStationMaps
         ucrSaveMap.SetPrefix("map")
         ucrSaveMap.SetSaveTypeAsGraph()
         ucrSaveMap.SetIsComboBox()
-        ucrSaveMap.SetCheckBoxText("Save Map")
+        ucrSaveMap.SetCheckBoxText("Store Map")
         ucrSaveMap.SetAssignToIfUncheckedValue("last_map")
         ucrSaveMap.SetDataFrameSelector(ucrSelectorOutline.ucrAvailableDataFrames)
 

diff --git a/instat/dlgClimdexIndices.vb b/instat/dlgClimdexIndices.vb
@@ -101,7 +101,7 @@ Public Class dlgClimdexIndices
         ucrPnlAnnualMonthly.SetRDefault(Chr(34) & "annual" & Chr(34))
         ucrPnlAnnualMonthly.AddToLinkedControls({ucrReceiverMonth}, {rdoMonthly}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
 
-        ucrChkSave.SetText("Save Indices")
+        ucrChkSave.SetText("Store Indices")
         ucrChkSave.bChangeParameterValue = False
     End Sub
 

diff --git a/instat/dlgClusterAnalysis.vb b/instat/dlgClusterAnalysis.vb
@@ -119,7 +119,7 @@ Public Class dlgClusterAnalysis
         ucrSaveGraph.SetPrefix("Cluster_plot")
         ucrSaveGraph.SetSaveTypeAsGraph()
         ucrSaveGraph.SetDataFrameSelector(ucrSelectorClusterData.ucrAvailableDataFrames)
-        ucrSaveGraph.SetCheckBoxText("Save Graph")
+        ucrSaveGraph.SetCheckBoxText("Store Graph")
         ucrSaveGraph.SetIsComboBox()
         ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph")
 

diff --git a/instat/dlgCombineforGraphics.vb b/instat/dlgCombineforGraphics.vb
@@ -48,7 +48,7 @@ Public Class dlgCombineforGraphics
         ucrSave.SetPrefix("combined_graph")
         ucrSave.SetDataFrameSelector(ucrCombineGraphSelector.ucrAvailableDataFrames)
         ucrSave.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image)
-        ucrSave.SetCheckBoxText("Save Graph")
+        ucrSave.SetCheckBoxText("Store Graph")
         ucrSave.SetIsComboBox()
         ucrSave.SetAssignToIfUncheckedValue("last_graph")
     End Sub

diff --git a/instat/dlgCompareTreatmentLines.vb b/instat/dlgCompareTreatmentLines.vb
@@ -156,7 +156,7 @@ Public Class dlgCompareTreatmentLines
 
         ucrSavePlot.SetPrefix("two_options")
         ucrSavePlot.SetIsComboBox()
-        ucrSavePlot.SetCheckBoxText("Save Graph")
+        ucrSavePlot.SetCheckBoxText("Store Graph")
         ucrSavePlot.SetSaveTypeAsGraph()
         ucrSavePlot.SetDataFrameSelector(ucrSelectorPlot.ucrAvailableDataFrames)
         ucrSavePlot.SetAssignToIfUncheckedValue("last_graph")

diff --git a/instat/dlgConditionalQuantilePlot.vb b/instat/dlgConditionalQuantilePlot.vb
@@ -131,7 +131,7 @@ Public Class dlgConditionalQuantilePlot
         ucrReceiverType.SetLinkedDisplayControl(lblType)
 
         ucrSavePlot.SetPrefix("cond_quantile_plot")
-        ucrSavePlot.SetCheckBoxText("Save Graph")
+        ucrSavePlot.SetCheckBoxText("Store Graph")
         ucrSavePlot.SetIsComboBox()
         ucrSavePlot.SetSaveTypeAsGraph()
         ucrSavePlot.SetDataFrameSelector(ucrConditionalQuantilePlotSelector.ucrAvailableDataFrames)

diff --git a/instat/dlgCorrelation.vb b/instat/dlgCorrelation.vb
@@ -592,7 +592,7 @@ Public Class dlgCorrelation
                 If rdoAsText.Checked Then
                     clsDummyFunction.AddParameter("output", "as.table", iPosition:=2)
                     ucrSaveCorrelation.SetSaveType(strRObjectType:=RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
-                    ucrSaveCorrelation.SetCheckBoxText("Save Table")
+                    ucrSaveCorrelation.SetCheckBoxText("Store Table")
                     ucrSaveCorrelation.SetPrefix("summary_table")
                     ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_table")
                     clsPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table",
@@ -604,14 +604,14 @@ Public Class dlgCorrelation
                     clsDummyFunction.AddParameter("output", "as.dataframe", iPosition:=2)
                     clsPipeOperator.RemoveAssignTo()
                     ucrSaveCorrelation.SetSaveTypeAsDataFrame()
-                    ucrSaveCorrelation.SetCheckBoxText("Save Data Frame")
+                    ucrSaveCorrelation.SetCheckBoxText("Store Data Frame")
                     ucrSaveCorrelation.SetPrefix("data_frame")
                     ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_dataframe")
                 End If
             Else
 
                 ucrSaveCorrelation.SetSaveType(strRObjectType:=RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
-                ucrSaveCorrelation.SetCheckBoxText("Save Table")
+                ucrSaveCorrelation.SetCheckBoxText("Store Table")
                 ucrSaveCorrelation.SetPrefix("summary_table")
                 ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_table")
                 clsCorrelationFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_table",
@@ -623,7 +623,7 @@ Public Class dlgCorrelation
         Else
 
             ucrSaveCorrelation.SetSaveType(strRObjectType:=RObjectTypeLabel.Model, strRObjectFormat:=RObjectFormat.Text)
-            ucrSaveCorrelation.SetCheckBoxText("Save Model")
+            ucrSaveCorrelation.SetCheckBoxText("Store Model")
             ucrSaveCorrelation.SetPrefix("summary_model")
             ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_model")
             clsCorrelationTestFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_model",

diff --git a/instat/dlgCountryColouredMap.vb b/instat/dlgCountryColouredMap.vb
@@ -92,7 +92,7 @@ Public Class dlgCountryColouredMap
         ucrSaveMap.SetPrefix("Map")
         ucrSaveMap.SetSaveTypeAsGraph()
         ucrSaveMap.SetIsComboBox()
-        ucrSaveMap.SetCheckBoxText("Save Graph")
+        ucrSaveMap.SetCheckBoxText("Store Graph")
         ucrSaveMap.SetAssignToIfUncheckedValue("last_graph")
         ucrSaveMap.SetDataFrameSelector(ucrSelectorCountryColouredMap.ucrAvailableDataFrames)
     End Sub

diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb
@@ -164,7 +164,7 @@ Public Class dlgCumulativeDistribution
 
         ucrSaveCumDist.SetSaveTypeAsGraph()
         ucrSaveCumDist.SetDataFrameSelector(ucrCumDistSelector.ucrAvailableDataFrames)
-        ucrSaveCumDist.SetCheckBoxText("Save Graph")
+        ucrSaveCumDist.SetCheckBoxText("Store Graph")
         ucrSaveCumDist.SetIsComboBox()
         ucrSaveCumDist.SetPrefix("cumulative_dist")
         ucrSaveCumDist.SetAssignToIfUncheckedValue("last_graph")

diff --git a/instat/dlgDescribeTwoVarGraph.vb b/instat/dlgDescribeTwoVarGraph.vb
@@ -274,7 +274,7 @@ Public Class dlgDescribeTwoVarGraph
         ucrSaveGraph.SetPrefix("two_var")
         ucrSaveGraph.SetSaveTypeAsGraph()
         ucrSaveGraph.SetDataFrameSelector(ucrSelectorTwoVarGraph.ucrAvailableDataFrames)
-        ucrSaveGraph.SetCheckBoxText("Save Graph")
+        ucrSaveGraph.SetCheckBoxText("Store Graph")
         ucrSaveGraph.SetIsComboBox()
         ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph")
     End Sub