Merge pull request #31 from africanmathsinitiative/master

updating master

instat/Model/DataFrame/clsDataFrame.vb

@@ -161,15 +161,15 @@ Public Class clsDataFrame
     End Function
 
     ''' <summary>
-    ''' Updates datframe where data has changed 
+    ''' Updates dataframe where data has changed 
     ''' </summary>
     Public Sub RefreshData()
         If HasDataChanged() Then
             If _clsVisiblePage.RefreshData() Then
                 _iTotalRowCount = _RLink.GetDataFrameLength(_strName, False)
                 _iTotalColumnCount = _RLink.GetDataFrameColumnCount(_strName)
                 _clsFilter.RefreshData()
-                If _clsFilter.bApplied Then
+                If _clsFilter.bFilterApplied Then
                     _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _clsFilter.iFilteredRowCount)
                 Else
                     _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _iTotalRowCount)

instat/Model/DataFrame/clsDataFrameFilter.vb

@@ -23,7 +23,8 @@ Public Class clsDataFrameFilter
     Protected _strDataFrameName As String
     Protected _RLink As RLink
 
-    Protected _bApplied As Boolean
+    Protected _bFilterApplied As Boolean
+    Protected _bColumnSelectionApplied As Boolean
     Protected _iFilteredRowCount As Integer
     Protected _strFilterName As String
 
@@ -39,9 +40,15 @@ Public Class clsDataFrameFilter
         End Get
     End Property
 
-    Public ReadOnly Property bApplied() As Boolean
+    Public ReadOnly Property bFilterApplied() As Boolean
         Get
-            Return _bApplied
+            Return _bFilterApplied
+        End Get
+    End Property
+
+    Public ReadOnly Property bColumnSelectionApplied() As Boolean
+        Get
+            Return _bColumnSelectionApplied
         End Get
     End Property
 
@@ -64,9 +71,17 @@ Public Class clsDataFrameFilter
         Return _RLink.RunInternalScriptGetValue(clsFilterApplied.ToScript()).AsLogical(0)
     End Function
 
+    Private Function GetColumnSelectionAppliedFromRCommand() As Boolean
+        Dim clsColumnSelectionApplied As New RFunction
+        clsColumnSelectionApplied.SetRCommand(_RLink.strInstatDataObject & "$column_selection_applied")
+        clsColumnSelectionApplied.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34))
+        Return _RLink.RunInternalScriptGetValue(clsColumnSelectionApplied.ToScript()).AsLogical(0)
+    End Function
+
     Public Sub RefreshData()
         _iFilteredRowCount = _RLink.GetDataFrameLength(_strDataFrameName, True)
-        _bApplied = GetFilterAppliedFromRCommand()
+        _bFilterApplied = GetFilterAppliedFromRCommand()
+        _bColumnSelectionApplied = GetColumnSelectionAppliedFromRCommand()
         _strFilterName = GetFilterNameFromRCommand()
     End Sub
 

instat/Model/RCommand/clsPrepareFunctionsForGrids.vb

@@ -208,6 +208,15 @@ Public Class clsPrepareFunctionsForGrids
         _RLink.RunScript(clsRemoveFilter.ToScript(), strComment:="Right click menu: Remove Current Filter")
     End Sub
     ''' <summary>
+    ''' Removes current column selection
+    ''' </summary>
+    Public Sub RemoveCurrentColumnSelection()
+        Dim clsRemoveCurrentColumnSelection As New RFunction
+        clsRemoveCurrentColumnSelection.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_current_column_selection")
+        clsRemoveCurrentColumnSelection.AddParameter("data_name", Chr(34) & _strDataFrame & Chr(34), iPosition:=0)
+        _RLink.RunScript(clsRemoveCurrentColumnSelection.ToScript(), strComment:="Right click menu: Remove Current Column Selection")
+    End Sub
+    ''' <summary>
     ''' Freeze selected columns
     ''' </summary>
     ''' <param name="strLastSelectedColumn"></param>

instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb

@@ -46,7 +46,7 @@ Public Class ucrDataViewLinuxGrid
     Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData
         Dim dataGrid = GetDataGridFromSelectedTab()
 
-        If dataFrame.clsFilter.bApplied Then
+        If dataFrame.clsFilter.bFilterApplied Then
             dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.Red
         Else
             dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.DarkBlue

instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb

@@ -51,7 +51,7 @@ Public Class ucrDataViewReoGrid
         grdData.CurrentWorksheet.Rows = dataFrame.iDisplayedRowCount
         UpdateWorksheetSettings(grdData.CurrentWorksheet)
 
-        If dataFrame.clsFilter.bApplied Then
+        If dataFrame.clsFilter.bFilterApplied Then
             textColour = Color.Red
         Else
             textColour = Color.DarkBlue

instat/dlgClimaticBoxPlot.vb

@@ -269,6 +269,7 @@ Public Class dlgClimaticBoxPlot
         clsRaesFunction.AddParameter("x", Chr(34) & Chr(34))
 
         clsAsFactorFunction.SetRCommand("make_factor")
+        clsAsFactorFunction.AddParameter("x", Chr(34) & Chr(34), bIncludeArgumentName:=False)
 
         clsRgeomPlotFunction.SetPackageName("ggplot2")
         clsRgeomPlotFunction.SetRCommand("geom_boxplot")