Merge pull request #698 from africanmathsinitiative/master

merge from main

instat/clsRLink.vb

@@ -451,7 +451,9 @@ Public Class RLink
         strCommand = strVariableName & "<-" & strScript
         If clsEngine IsNot Nothing Then
             Evaluate(strCommand, bSilent:=bSilent, bSeparateThread:=bSeparateThread)
-            expTemp = GetSymbol(strVariableName, bSilent:=bSilent)
+            expTemp = GetSymbol(strVariableName, bSilent:=True)
+            'Very important to remove the variable after getting it othewise could be returning wrong variable later if a command gives an error
+            Evaluate("rm(" & strVariableName & ")", bSilent:=bSilent, bSeparateThread:=bSeparateThread)
         End If
         Return expTemp
     End Function

instat/dlgSpells.vb

@@ -73,15 +73,15 @@ Public Class dlgSpells
         ucrReceiverDate.Selector = ucrSelectorForSpells
         ucrReceiverDate.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "date" & Chr(34)})
         ucrReceiverDate.bAutoFill = True
-        ucrReceiverDate.strSelectorHeading = "Date variables"
+        ucrReceiverDate.strSelectorHeading = "Date Variables"
 
         ucrReceiverDOY.SetParameter(New RParameter("day", 0))
         ucrReceiverDOY.SetParameterIsString()
         ucrReceiverDOY.bWithQuotes = False
         ucrReceiverDOY.Selector = ucrSelectorForSpells
         ucrReceiverDOY.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "doy" & Chr(34)})
         ucrReceiverDOY.bAutoFill = True
-        ucrReceiverDOY.strSelectorHeading = "Day variables"
+        ucrReceiverDOY.strSelectorHeading = "Day Variables"
 
         clsSubSpellLength1.SetRCommand("list")
         clsMaxValueList.SetRCommand("list")

instat/dlgStartofRains.vb

@@ -62,28 +62,33 @@ Public Class dlgStartofRains
         ucrReceiverStation.Selector = ucrSelectorForStartofRains
         ucrReceiverStation.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "station" & Chr(34)})
         ucrReceiverStation.bAutoFill = True
+        ucrReceiverStation.strSelectorHeading = "Station Variables"
 
         ucrReceiverDate.SetParameter(New RParameter("date", 0, False))
         ucrReceiverDate.SetParameterIsString()
         ucrReceiverDate.Selector = ucrSelectorForStartofRains
         ucrReceiverDate.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "date" & Chr(34)})
         ucrReceiverDate.bAutoFill = True
+        ucrReceiverDate.strSelectorHeading = "Date Variables"
 
         ucrReceiverDOY.SetParameter(New RParameter("day", 0))
         ucrReceiverDOY.SetParameterIsString()
         ucrReceiverDOY.bWithQuotes = False
         ucrReceiverDOY.Selector = ucrSelectorForStartofRains
         ucrReceiverDOY.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "doy" & Chr(34)})
         ucrReceiverDOY.bAutoFill = True
+        ucrReceiverDOY.strSelectorHeading = "Day Variables"
 
         ucrReceiverRainfall.SetParameter(New RParameter("data", 0))
         ucrReceiverRainfall.SetParameterIsRFunction()
         ucrReceiverRainfall.bWithQuotes = False
-        '        ucrReceiverRainfall.SetParameterIncludeArgumentName(False)
+        ucrReceiverRainfall.strSelectorHeading = "Rain Variables"
         ucrReceiverRainfall.Selector = ucrSelectorForStartofRains
         ucrReceiverRainfall.AddIncludedMetadataProperty("Climatic_Type", {Chr(34) & "rain" & Chr(34)})
         ucrReceiverRainfall.bAutoFill = True
 
+        ucrReceiverYear.strSelectorHeading = "Year Variables"
+
         'Days
         ucrNudFrom.SetParameter(New RParameter("from", 0))
         ucrNudFrom.SetMinMax(1, 365)