Merge pull request #482 from IDEMSInternational/master

Updated my master

instat/dlgEvapotranspiration.vb

@@ -501,7 +501,7 @@ Public Class dlgEvapotranspiration
             clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5)
             clsListFunction.AddParameter("z", 2, iPosition:=4)
             clsListFunction.AddParameter("G", 0, iPosition:=6)
-            clsListFunction.AddParameter("as", 0.25, iPosition:=7)
+            clsListFunction.AddParameter("as", 0.23, iPosition:=7)
             clsListFunction.AddParameter("bs", 0.5, iPosition:=8)
             clsListFunction.AddParameter("lambda", 2.45, iPosition:=1)
             clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3)
@@ -522,7 +522,7 @@ Public Class dlgEvapotranspiration
             clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3)
             clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5)
             clsListFunction.AddParameter("G", 0, iPosition:=6)
-            clsListFunction.AddParameter("as", 0.25, iPosition:=7)
+            clsListFunction.AddParameter("as", 0.23, iPosition:=7)
             clsListFunction.AddParameter("bs", 0.5, iPosition:=8)
             clsListFunction.AddParameter("alphaPT", 1.26, iPosition:=9)
             clsListFunction.RemoveParameterByName("z")

instat/dlgRandomSplit.vb

@@ -132,8 +132,7 @@ Public Class dlgRandomSplit
         clsTesting.SetPackageName("rsample")
         clsTesting.SetRCommand("testing")
         ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit)
-        ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0)
-        ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1)
+
     End Sub
 
     Private Sub SetRCodeForControls(bReset As Boolean)
@@ -153,7 +152,7 @@ Public Class dlgRandomSplit
         ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset)
 
         If bReset Then
-            ucrChkTest.SetRCode(clsInitialSplit, bReset)
+            ucrChkTest.SetRCode(clsTesting, bReset)
         End If
     End Sub
 
@@ -190,24 +189,35 @@ Public Class dlgRandomSplit
     Private Sub SetBaseFunction()
         ucrBase.clsRsyntax.ClearCodes()
         If rdoSample.Checked Then
-            If ucrSaveTestingData.IsComplete Then
-                clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit)
+            If ucrChkTest.Checked AndAlso ucrSaveTestingData.IsComplete Then
+                clsTesting.AddParameter("x", "rsample")
+                ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0)
+            Else
+                ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTesting)
             End If
             If ucrSaveTrainingData.IsComplete Then
-                clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit)
+                clsTraining.AddParameter("x", "rsample")
+                ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1)
+            Else
+                ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTraining)
             End If
             ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit)
         Else
-            If ucrSaveTestingData.IsComplete Then
-                clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit)
+            If ucrChkTest.Checked AndAlso ucrSaveTestingData.IsComplete Then
+                clsTesting.AddParameter("x", "rsample")
+                ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0)
+            Else
+                ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTesting)
             End If
             If ucrSaveTrainingData.IsComplete Then
-                clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit)
+                clsTraining.AddParameter("x", "rsample")
+                ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1)
+            Else
+                ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTraining)
             End If
             ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit)
         End If
-        ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0)
-        ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1)
+
     End Sub
 
     Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
@@ -233,4 +243,7 @@ Public Class dlgRandomSplit
         SetBaseFunction()
     End Sub
 
+    Private Sub ucrChkTest_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTest.ControlValueChanged
+        SetBaseFunction()
+    End Sub
 End Class

instat/frmMain.vb

@@ -937,10 +937,6 @@ Public Class frmMain
         mnuIncludeComments.Checked = dlgOptions.ucrChkIncludeCommentsbyDefault.chkCheck.Checked
     End Sub
 
-    Private Sub mnuOrganiseDataFrameHideColumns_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameHideColumns.Click
-        dlgHideShowColumns.ShowDialog()
-    End Sub
-
     Private Sub mnuModelProbabilityDistributionsRandomSamplesUseModel_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsRandomSamplesUseModel.Click
         dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Model
         dlgRandomSample.ShowDialog()

instat/sdgLocation.vb

@@ -49,6 +49,7 @@ Public Class sdgLocation
         ucrInputLatitude.SetParameter(New RParameter("lat_rad", 2))
         ucrInputLatitude.AddQuotesIfUnrecognised = False
         ucrInputLatitude.SetLinkedDisplayControl(lblLatitude)
+        ucrInputLatitude.SetValidationTypeAsNumeric()
         ucrInputLatitude.SetRDefault("0")
 
         ucrReceiverLongitude.SetParameter(New RParameter("lon", 3))
@@ -60,7 +61,8 @@ Public Class sdgLocation
         ucrInputLongitude.SetParameter(New RParameter("lon", 3))
         ucrInputLongitude.AddQuotesIfUnrecognised = False
         ucrInputLongitude.SetLinkedDisplayControl(lblLongitude)
-        ucrInputLongitude.SetRDefault(0)
+        ucrInputLongitude.SetValidationTypeAsNumeric()
+        ucrInputLongitude.SetRDefault("0")
 
         ucrReceiverAltitude.SetParameter(New RParameter("Elev", 4))
         ucrReceiverAltitude.SetParameterIsRFunction()
@@ -71,6 +73,7 @@ Public Class sdgLocation
         ucrInputElevation.SetParameter(New RParameter("Elev", 4))
         ucrInputElevation.AddQuotesIfUnrecognised = False
         ucrInputElevation.SetLinkedDisplayControl(lblLatitude)
+        ucrInputElevation.SetValidationTypeAsNumeric()
         ucrInputElevation.SetRDefault("0")
 
         bControlsInitialised = True
@@ -117,6 +120,11 @@ Public Class sdgLocation
 
     Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged
         EnableDesableSelector()
+        If Not ucrInputElevation.IsEmpty Then
+            clsListFunction.AddParameter("Elev", ucrInputElevation.GetText(), iPosition:=4)
+        Else
+            clsListFunction.RemoveParameterByName("Elev")
+        End If
     End Sub
 
     Private Sub ucrSelectorLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLocation.ControlValueChanged
@@ -125,9 +133,14 @@ Public Class sdgLocation
 
     Private Sub ucrInputLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLatitude.ControlValueChanged
         EnableDesableSelector()
+        If Not ucrInputLatitude.IsEmpty Then
+            clsListFunction.AddParameter("lat_rad", ucrInputLatitude.GetText(), iPosition:=1)
+        Else
+            clsListFunction.RemoveParameterByName("lat_rad")
+        End If
     End Sub
 
-    Private Sub ucrInputLongitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLongitude.ControlValueChanged
+    Private Sub ucrReceiverLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLatitude.ControlValueChanged
         EnableDesableSelector()
     End Sub
 End Class