Merge pull request #153 from africanmathsinitiative/master

merge from main
deaspo · May 6, 2016 · ca309f0 · ca309f0
2 parents 9e5661a + a92df97
commit ca309f0
Show file tree

Hide file tree

Showing 17 changed files with 345 additions and 139 deletions.
diff --git a/instat/UcrGeomListWithAes.designer.vb b/instat/UcrGeomListWithAes.designer.vb
diff --git a/instat/UcrGeomListWithAes.vb b/instat/UcrGeomListWithAes.vb
@@ -198,6 +198,21 @@ Public Class UcrGeomListWithParameters
             clsRaesFunction.RemoveParameterByName(lstCurrArguments(6))
         End If
     End Sub
+    Private Sub ucrReceiverParam8_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverParam8.SelectionChanged, ucrReceiverParam9.SelectionChanged, ucrReceiverParam8.SelectionChanged
+        If Not ucrReceiverParam8.IsEmpty Then
+            clsRaesFunction.AddParameter(lstCurrArguments(7), ucrReceiverParam8.GetVariableNames(False))
+        Else
+            clsRaesFunction.RemoveParameterByName(lstCurrArguments(7))
+        End If
+    End Sub
+
+    Private Sub ucrReceiverParam9_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverParam9.SelectionChanged, ucrReceiverParam9.SelectionChanged, ucrReceiverParam8.SelectionChanged
+        If Not ucrReceiverParam9.IsEmpty Then
+            clsRaesFunction.AddParameter(lstCurrArguments(8), ucrReceiverParam9.GetVariableNames(False))
+        Else
+            clsRaesFunction.RemoveParameterByName(lstCurrArguments(8))
+        End If
+    End Sub
 
     Private Sub UcrSelector_DataFrameChanged() Handles UcrSelector.DataFrameChanged
         clsGeomFunction.AddParameter("data", clsRFunctionParameter:=UcrSelector.ucrAvailableDataFrames.clsCurrDataFrame)

diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb
@@ -317,33 +317,34 @@ Public Class RLink
         bInstatObjectExists = True
     End Sub
 
-    Public Sub FillListView(lstView As ListView, Optional lstIncludedDataTypes As List(Of String) = Nothing, Optional lstExcludedDataTypes As List(Of String) = Nothing, Optional strDataFrameName As String = "", Optional strHeading As String = "Variables")
+    Public Sub FillListView(lstView As ListView, Optional lstIncludedDataTypes As List(Of String) = Nothing, Optional lstExcludedDataTypes As List(Of String) = Nothing, Optional strDataFrameName As String = "", Optional strHeading As String = "Variables", Optional bIncludeHiddenColumns As Boolean = False)
         Dim vecColumns As GenericVector
         Dim chrCurrColumns As CharacterVector
         Dim i As Integer
         Dim grps As New ListViewGroup
+        Dim clsGetColumns As New RFunction
+
         If bInstatObjectExists Then
+            clsGetColumns.SetRCommand(strInstatDataObject & "$get_column_names")
+            clsGetColumns.AddParameter("as_list", "TRUE")
+            If bIncludeHiddenColumns Then
+                clsGetColumns.AddParameter("include_hidden", "TRUE")
+            Else
+                clsGetColumns.AddParameter("include_hidden", "FALSE")
+            End If
             lstView.Clear()
             lstView.Groups.Clear()
             lstView.Columns.Add(strHeading)
-            If strDataFrameName = "" Then
-                If lstIncludedDataTypes IsNot Nothing Then
-                    vecColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(include_type = " & GetListAsRString(lstIncludedDataTypes) & ", as_list = TRUE)").AsList
-                ElseIf lstExcludedDataTypes IsNot Nothing Then
-                    vecColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(exclude_type = " & GetListAsRString(lstExcludedDataTypes) & ", as_list = TRUE)").AsList
-                Else
-                    vecColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(as_list = TRUE)").AsList
-                End If
-            Else
-                If lstIncludedDataTypes IsNot Nothing Then
-                    vecColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(data_name = " & Chr(34) & strDataFrameName & Chr(34) & ", include_type = " & GetListAsRString(lstIncludedDataTypes) & ", as_list = TRUE)").AsList
-                ElseIf lstExcludedDataTypes IsNot Nothing Then
-                    vecColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(data_name = " & Chr(34) & strDataFrameName & Chr(34) & ", exclude_type = " & GetListAsRString(lstExcludedDataTypes) & ", as_list = TRUE)").AsList
-                Else
-                    vecColumns = clsEngine.Evaluate(strInstatDataObject & "$get_column_names(data_name = " & Chr(34) & strDataFrameName & Chr(34) & ", as_list = TRUE)").AsList
-                End If
 
+            If lstIncludedDataTypes.Count > 0 Then
+                clsGetColumns.AddParameter("include_type", GetListAsRString(lstIncludedDataTypes))
+            ElseIf lstExcludedDataTypes.Count > 0 Then
+                clsGetColumns.AddParameter("exclude_type", GetListAsRString(lstExcludedDataTypes))
+            End If
+            If strDataFrameName <> "" Then
+                clsGetColumns.AddParameter("data_name", Chr(34) & strDataFrameName & Chr(34))
             End If
+            vecColumns = RunInternalScriptGetValue(clsGetColumns.ToScript()).AsList
 
             For i = 0 To vecColumns.Count - 1
                 If vecColumns.Count > 1 Then

diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb
diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb
@@ -36,29 +36,27 @@ Public Class dlgGeneralForGraphics
         'setting the base ggplot functions
         ucrBase.clsRsyntax.SetOperation("+")
         clsRggplotFunction.SetRCommand("ggplot")
-        'this sets the geoms andthe command to be used
-        ucrGeomListWithParameters1.SetGeoms()
         ucrBase.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsRggplotFunction)
-        ucrBase.clsRsyntax.SetOperatorParameter(False, clsRFunc:=ucrGeomListWithParameters1.clsGeomFunction)
-    End Sub
 
+    End Sub
     Private Sub SetDefaults()
-        ucrGeomListWithParameters1.UcrSelector.Reset()
+        cmdDelete.Enabled = False
+        cmdEdit.Enabled = False
         TestOkEnabled()
     End Sub
 
     Private Sub ReopenDialog()
 
     End Sub
-    Public Sub TestOkEnabled()
-        If Not ucrGeomListWithParameters1.ucrReceiverParam1.IsEmpty Then
-            ucrBase.OKEnabled(True)
-        Else
-            ucrBase.OKEnabled(False)
-        End If
+    Public Sub TestOkEnabled()
+
     End Sub
 
     Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
         SetDefaults()
     End Sub
+
+    Private Sub cmdAdd_Click(sender As Object, e As EventArgs) Handles cmdAdd.Click
+        sdgLayers.ShowDialog()
+    End Sub
 End Class