Merge pull request #41 from africanmathsinitiative/master

updating branch

instat/clsRLink.vb

@@ -752,6 +752,15 @@ Public Class RLink
         Return strOut
     End Function
 
+    Public Function IsValidText(strText As String) As String
+        Dim bValid As Boolean
+        Dim strValidText As String
+        Dim clsMakeNames As New RFunction
+
+        strValidText = MakeValidText(strText)
+        Return (strText = strValidText)
+    End Function
+
     'Corruption analysis functions
     Public Function GetCorruptionContractDataFrameNames() As List(Of String)
         Dim clsGetDataNames As New RFunction

instat/dlgColumnStats.vb

@@ -1,5 +1,4 @@
-
-' Instat-R
+' Instat-R
 ' Copyright (C) 2015
 '
 ' This program is free software: you can redistribute it and/or modify
@@ -20,6 +19,8 @@ Public Class dlgColumnStats
     Private bReset As Boolean = True
     Private clsSummariesList As New RFunction
     Private bResetSubdialog As Boolean = False
+    Private clsDefaultFunction As New RFunction
+
     Private Sub dlgColumnStats_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstLoad Then
             InitialiseDialog()
@@ -34,7 +35,6 @@ Public Class dlgColumnStats
         TestOKEnabled()
     End Sub
 
-
     Public Sub SetRCodeForControls(bReset As Boolean)
         SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset)
     End Sub
@@ -48,18 +48,17 @@ Public Class dlgColumnStats
     End Sub
 
     Private Sub SetDefaults()
-        Dim clsDefaultFunction As New RFunction
-
+        clsDefaultFunction = New RFunction
         clsSummariesList = New RFunction
 
+        ucrSelectorForColumnStatistics.Reset()
+        ucrReceiverSelectedVariables.SetMeAsReceiver()
+
         clsSummariesList.SetRCommand("c")
         clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False)
         clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False)
         clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False)
 
-        ucrSelectorForColumnStatistics.Reset()
-        ucrReceiverSelectedVariables.SetMeAsReceiver()
-
         clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
         clsDefaultFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesList)
         ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction)

instat/dlgExportToOpenRefine.vb

@@ -33,7 +33,7 @@ Public Class dlgExportToOpenRefine
 
     Private Sub SetDefaults()
         Dim clsDefaultRefine, clsDefaultWrite As New RFunction
-
+        ucrBase.OKEnabled(False)
         ucrOpenRefineDataFrame.Reset()
         ucrInputDatasetName.Reset()
 

instat/dlgReoderDescriptives.vb

@@ -30,6 +30,7 @@ Public Class dlgReoderDescriptives
         SetRCodeforControls(bReset)
         bReset = False
         autoTranslate(Me)
+        TestOKEnabled()
     End Sub