Merge pull request #63 from africanmathsinitiative/master

Update main branch

instat/clsGridLink.vb

@@ -111,7 +111,7 @@ Public Class clsGridLink
             frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$set_metadata_changed(new_val = FALSE)")
         End If
 
-        frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$data_objects_changed = FALSE")
+        frmMain.clsRLink.clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$data_objects_changed <- FALSE")
 
         If grdData.Worksheets.Count = 0 Then
             grdData.Visible = False

instat/clsRLink.vb

@@ -273,7 +273,7 @@ Public Class RLink
     End Sub
 
     Public Sub CreateNewInstatObject()
-        RunScript(strInstatDataObject & " <- instat_obj$new()")
+        RunScript(strInstatDataObject & " <- instat_object$new()")
         bInstatObjectExists = True
     End Sub
 
@@ -320,7 +320,7 @@ Public Class RLink
     Public Function GetDataFrameLength(strDataFrameName As String) As Integer
         Dim intLength As Integer
         If clsEngine IsNot Nothing Then
-            intLength = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$length_of_data(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsInteger(0)
+            intLength = clsEngine.Evaluate(frmMain.clsRLink.strInstatDataObject & "$get_dataframe_length(" & Chr(34) & strDataFrameName & Chr(34) & ")").AsInteger(0)
         End If
         Return intLength
     End Function

instat/dlgCanonicalCorrelationAnalysis.vb

@@ -15,6 +15,7 @@
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Imports instat.Translations
 Public Class dlgCanonicalCorrelationAnalysis
+    Public strModelName As String = ""
     Public bFirstLoad As Boolean = True
     Private Sub dlgCanonicalCorrelationAnalysis_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstLoad Then
@@ -94,13 +95,15 @@ Public Class dlgCanonicalCorrelationAnalysis
         AssignName()
     End Sub
 
-    Private Sub AssignName()
+    Public Sub AssignName()
         If chkSaveResult.Checked AndAlso ucrResultName.GetText() <> "" Then
             ucrBaseCCA.clsRsyntax.SetAssignTo(ucrResultName.GetText(), strTempModel:=ucrResultName.GetText())
             ucrBaseCCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
+            strModelName = ucrResultName.GetText()
         Else
             ucrBaseCCA.clsRsyntax.SetAssignTo("last_CCA", strTempModel:="last_CCA")
             ucrBaseCCA.clsRsyntax.bExcludeAssignedFunctionOutput = False
+            strModelName = "last_CCA"
         End If
     End Sub
 

instat/dlgCombineText.vb

@@ -18,19 +18,22 @@ Public Class dlgCombineText
     Private bFirstLoad As Boolean = True
     Private Sub dlgCombineText_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
-
-
-
         If bFirstLoad Then
             InitialiseDialog()
             SetDefaults()
-            bFirstLoad = False
+            bFirstLoad = False
+        Else
+            ReopenDialog()
         End If
         TestOKEnabled()
     End Sub
 
+    Private Sub ReopenDialog()
+
+    End Sub
+
     Private Sub TestOKEnabled()
-        If ucrReceiverCombineText.IsEmpty() = False Then
+        If ucrReceiverCombineText.IsEmpty() = False And (Not ucrInputSeparator.IsEmpty) Then
             ucrBase.OKEnabled(True)
         Else
             ucrBase.OKEnabled(False)
@@ -42,30 +45,34 @@ Public Class dlgCombineText
         ucrReceiverCombineText.Selector = ucrSelectorForCombineText
         ucrReceiverCombineText.SetMeAsReceiver()
         ucrBase.clsRsyntax.SetFunction("stringr::str_c")
-        ucrInputColumnInto.SetPrefix("CombineText")
+        ucrInputColumnInto.SetName("CombineText")
         ucrReceiverCombineText.SetDataType("factor")
         ucrInputColumnInto.SetItemsTypeAsColumns()
         ucrInputColumnInto.SetDefaultTypeAsColumn()
         ucrInputColumnInto.SetDataFrameSelector(ucrSelectorForCombineText.ucrAvailableDataFrames)
         ucrBase.clsRsyntax.AddParameter("collapse", "NULL")
-        ucrBase.clsRsyntax.AddParameter("sep", Chr(34) & Chr(34))
-
     End Sub
+
     Private Sub SetDefaults()
         ucrSelectorForCombineText.Reset()
         ucrSelectorForCombineText.Focus()
-        cboSeperator.Text = "Whitespace"
+        ucrInputSeparator.SetName("Whitespace")
         ucrInputColumnInto.cboInput.ResetText()
     End Sub
 
-    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
-        TestOKEnabled()
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
         SetDefaults()
+        TestOKEnabled()
 
     End Sub
 
-    Private Sub cboSeperator_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboSeperator.SelectedIndexChanged
-        Select Case cboSeperator.SelectedItem
+    Private Sub ucrInputSeparator_NameChanged() Handles ucrInputSeparator.NameChanged
+        SeparatorParameter()
+        TestOKEnabled()
+    End Sub
+
+    Private Sub SeparatorParameter()
+        Select Case ucrInputSeparator.cboInput.SelectedItem
             Case "NULL"
                 ucrBase.clsRsyntax.AddParameter("sep", "NULL")
             Case "WhiteSpace"
@@ -85,13 +92,11 @@ Public Class dlgCombineText
 
     Private Sub ucrReceiverCombineText_SelectionChanged() Handles ucrReceiverCombineText.SelectionChanged
         If Not ucrReceiverCombineText.IsEmpty Then
-
             ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverCombineText.GetVariables())
         Else
             ucrBase.clsRsyntax.RemoveParameter("x")
         End If
         TestOKEnabled()
-
     End Sub
 
 End Class

instat/dlgDeleteRowsOrColums.vb

@@ -3,8 +3,6 @@ Public Class dlgDeleteRowsOrColums
     Public bFirstLoad As Boolean = True
     Private Sub dlgDeleteRows_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
-
-
         If bFirstLoad Then
             InitialiseDialog()
             SetDefaults()
@@ -13,7 +11,6 @@ Public Class dlgDeleteRowsOrColums
             ReopenDialog()
         End If
         TestOKEnabled()
-
     End Sub
 
     Private Sub InitialiseDialog()
@@ -30,12 +27,10 @@ Public Class dlgDeleteRowsOrColums
             ucrBase.OKEnabled(True)
         Else
             ucrBase.OKEnabled(False)
-
         End If
-
     End Sub
-    Private Sub SetDefaults()
 
+    Private Sub SetDefaults()
         rdoColumns.Checked = False
         rdoRows.Checked = True
     End Sub
@@ -47,25 +42,22 @@ Public Class dlgDeleteRowsOrColums
 
     Private Sub ucrSelectorForDeleteColumns_DataFrameChanged() Handles ucrSelectorForDeleteColumns.DataFrameChanged
         ucrBase.clsRsyntax.AddParameter("data_name", Chr(34) & ucrSelectorForDeleteColumns.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
-
     End Sub
 
     Private Sub ucrSelectorForDeleteRows_DataFrameChanged() Handles ucrSelectorForDeleteRows.DataFrameChanged
         ucrBase.clsRsyntax.AddParameter("data_name", clsRFunctionParameter:=ucrSelectorForDeleteColumns.ucrAvailableDataFrames.clsCurrDataFrame)
-
-
     End Sub
+
     Private Sub ucrReceiveForColumnsToDelete_SelectionChanged() Handles ucrReceiverForColumnsToDelete.SelectionChanged
         If Not ucrReceiverForColumnsToDelete.IsEmpty Then
             ucrBase.clsRsyntax.AddParameter("cols", ucrReceiverForColumnsToDelete.GetVariableNames)
         Else
             ucrBase.clsRsyntax.RemoveParameter("cols")
         End If
-
         TestOKEnabled()
     End Sub
 
-    Private Sub ucrinputRowsToDelete_Leave(sender As Object, e As EventArgs) Handles ucrInputRowsToDelete.Leave
+    Private Sub ucrinputRowsToDelete_NameChanged() Handles ucrInputRowsToDelete.NameChanged
         If Not ucrInputRowsToDelete IsNot Nothing Then
             ucrBase.clsRsyntax.AddParameter("select", Chr(34) & ucrInputRowsToDelete.GetText & Chr(34))
         Else
@@ -75,6 +67,10 @@ Public Class dlgDeleteRowsOrColums
     End Sub
 
     Private Sub rdoColumnsRows_CheckedChanged(sender As Object, e As EventArgs) Handles rdoColumns.CheckedChanged, rdoRows.CheckedChanged
+        ColumnsRows()
+    End Sub
+
+    Private Sub ColumnsRows()
         If rdoRows.Checked = True Then
             ucrSelectorForDeleteRows.Reset()
             ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$remove_rows_in_data")

instat/dlgFromLibrary.vb

@@ -117,8 +117,8 @@ Public Class dlgFromLibrary
     End Sub
 
     Private Sub lstCollection_Click(sender As Object, e As EventArgs) Handles lstCollection.Click
-        ucrBase.clsRsyntax.SetAssignTo(lstCollection.SelectedItems(0).SubItems(0).Text, strTempDataframe:=lstCollection.SelectedItems(0).SubItems(0).Text)
-        ucrBase.clsRsyntax.AddParameter("x", lstCollection.SelectedItems(0).SubItems(0).Text)
+        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))
         TestOkEnabled()
     End Sub
 
@@ -130,4 +130,13 @@ Public Class dlgFromLibrary
         End If
     End Sub
 
+    Private Function chkString(ByVal strValue As String)
+        Dim strLength As Integer = strValue.IndexOf(" ")
+        If strLength = -1 Then
+            Return strValue
+        Else
+            Return strValue.Substring(0, strLength)
+        End If
+    End Function
+
 End Class