Merge pull request #48 from africanmathsinitiative/master

Merge from Master Copy

instat/dlgClimdex.vb

@@ -68,6 +68,7 @@ Public Class dlgClimdex
         If ucrReceiverTmax.IsEmpty AndAlso ucrReceiverTmin.IsEmpty AndAlso ucrReceiverPrec.IsEmpty Then
             ucrBaseClimdex.OKEnabled(False)
         Else
+            'This should be turned on once the climate object is ready
             ucrBaseClimdex.OKEnabled(True)
         End If
     End Sub
@@ -118,7 +119,7 @@ Public Class dlgClimdex
         TestOkEnabled()
     End Sub
 
-    Private Sub cmdClimdexIndices_Click(sender As Object, e As EventArgs) Handles cmdClimdexOptions.Click
+    Private Sub cmdIndices_Click(sender As Object, e As EventArgs) Handles cmdIndices.Click
         sdgClimdexIndices.ShowDialog()
     End Sub
 
@@ -157,10 +158,6 @@ Public Class dlgClimdex
         End If
     End Sub
 
-    Private Sub ucrInputFreq_Load(sender As Object, e As EventArgs) Handles ucrInputFreq.Load
-
-    End Sub
-
     Private Sub nudMonthlyMaxMissingDays_ValueChanged(sender As Object, e As EventArgs) Handles nudMothlyMissingDays.ValueChanged
         clsRMaxMisingDays.AddParameter("monthly", nudMothlyMissingDays.Value)
         If nudAnnualMissingDays.Value = 15 AndAlso nudMothlyMissingDays.Value = 3 Then
@@ -170,6 +167,10 @@ Public Class dlgClimdex
         End If
     End Sub
 
+    Private Sub ucrInputFreq_Load(sender As Object, e As EventArgs)
+
+    End Sub
+
     Private Sub nudMinBaseData_ValueChanged(sender As Object, e As EventArgs) Handles nudMinBaseData.ValueChanged
         clsRClimdexInput.AddParameter("min.base.data.fraction.present ", nudMinBaseData.Value)
         If nudMinBaseData.Value = 0.1 Then

instat/dlgConvertColumns.vb

@@ -126,8 +126,6 @@ Public Class dlgConvertColumns
         If rdoConvertLevels.Checked = True Then
             If frmMain.clsInstatOptions.bIncludeRDefaultParameters Then
                 ucrBase.clsRsyntax.AddParameter("factor_numeric", Chr(34) & "by_levels" & Chr(34))
-
-
             Else
                 ucrBase.clsRsyntax.RemoveParameter("factor_numeric")
             End If

instat/dlgFromLibrary.vb

@@ -127,15 +127,17 @@ Public Class dlgFromLibrary
         ucrBase.clsRsyntax.SetAssignTo(chkString(lstCollection.SelectedItems(0).SubItems(0).Text), strTempDataframe:=chkString(lstCollection.SelectedItems(0).SubItems(0).Text))
         ucrBase.clsRsyntax.AddParameter("x", chkString(lstCollection.SelectedItems(0).SubItems(0).Text))
         clsDataFunction.AddParameter("X", chkString(lstCollection.SelectedItems(0).SubItems(0).Text))
+
         TestOkEnabled()
     End Sub
 
     Private Sub TestOkEnabled()
-        If rdoDefaultDatasets.Checked AndAlso lstCollection.SelectedItems.Count > 0 OrElse rdoInstatCollection.Checked Then
+        If rdoDefaultDatasets.Checked AndAlso lstCollection.SelectedItems.Count > 0 Then
             ucrBase.OKEnabled(True)
         Else
             ucrBase.OKEnabled(False)
         End If
+
         EnableHelp()
     End Sub
 
@@ -173,4 +175,5 @@ Public Class dlgFromLibrary
             cmdHelp.Enabled = False
         End If
     End Sub
+
 End Class