Merge pull request #5007 from maxwellfundi/QC_temperaures

Fixing bugs on Qc temperaures and Export to CPT
IDEMSInternational · Oct 4, 2018 · 06c346b · 06c346b
2 parents e8b6c16 + f7393a5
commit 06c346b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/instat/dlgClimaticCheckDataTemperature.vb b/instat/dlgClimaticCheckDataTemperature.vb
@@ -289,7 +289,7 @@ Public Class dlgClimaticCheckDataTemperature
         clsOrOperator.bBrackets = False
         clsOrOperator.bToScriptAsRString = True
 
-        clsRunCalcFunc.SetRCommand("InstatDataObject$run_instat_calculation")
+        clsRunCalcFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation")
         clsRunCalcFunc.AddParameter("calc", clsRFunctionParameter:=clsFilterFunc, iPosition:=0)
         clsRunCalcFunc.AddParameter("display", "FALSE")
         ucrBase.clsRsyntax.SetBaseRFunction(clsRunCalcFunc)

diff --git a/instat/dlgExportToCPT.vb b/instat/dlgExportToCPT.vb
@@ -72,20 +72,20 @@ Public Class dlgExportToCPT
         ucrReceiverLatitude.SetParameter(New RParameter("latitude"))
         ucrReceiverLatitude.SetParameterIsString()
         ucrReceiverLatitude.SetLinkedDisplayControl(lblLatitude)
-        ucrReceiverLatitude.SetClimaticType("latitude")
+        ' ucrReceiverLatitude.SetClimaticType("latitude")
         ucrReceiverLatitude.bAutoFill = True
 
         ucrReceiverLongitude.SetParameter(New RParameter("longitude"))
         ucrReceiverLongitude.SetParameterIsString()
         ucrReceiverLongitude.SetLinkedDisplayControl(lblLongitude)
-        ucrReceiverLongitude.SetClimaticType("longitude")
+        ' ucrReceiverLongitude.SetClimaticType("longitude")
         ucrReceiverLongitude.bAutoFill = True
 
         ucrReceiverStationTwoDF.Selector = ucrSelectorTwoDF
         ucrReceiverStationTwoDF.SetParameter(New RParameter("station_latlondata"))
         ucrReceiverStationTwoDF.SetParameterIsString()
         ucrReceiverStationTwoDF.strSelectorHeading = "Numerics"
-        ucrReceiverStationTwoDF.SetClimaticType("station")
+        'ucrReceiverStationTwoDF.SetClimaticType("station")
         ucrReceiverStationTwoDF.bAutoFill = True
 
         ucrInputFilePath.SetParameter(New RParameter("file", 0))