Merge pull request #37 from africanmathsinitiative/master

updating master

instat/Model/DataFrame/clsDataFrame.vb

@@ -24,19 +24,19 @@ Public Class clsDataFrame
     Private _clsPrepareFunctions As clsPrepareFunctionsForGrids
     Private _clsVisiblePage As clsDataFramePage
     Private _clsColumnMetaData As clsColumnMetaData
-    Private _clsFilter As clsDataFrameFilter
+    Private _clsFilterOrColumnSelection As clsDataFrameFilterOrColumnSelection
     Private _strName As String
     Private _RLink As RLink
     Private _iTotalRowCount As Integer
     Private _iTotalColumnCount As Integer
 
     ''' <summary>
-    ''' Filter information
+    ''' Filter or column selection information
     ''' </summary>
     ''' <returns></returns>
-    Public ReadOnly Property clsFilter() As clsDataFrameFilter
+    Public ReadOnly Property clsFilterOrColumnSelection() As clsDataFrameFilterOrColumnSelection
         Get
-            Return _clsFilter
+            Return _clsFilterOrColumnSelection
         End Get
     End Property
 
@@ -51,7 +51,7 @@ Public Class clsDataFrame
     End Property
 
     ''' <summary>
-    ''' Column meta data for the dataframe
+    ''' Column metadata for the dataframe
     ''' </summary>
     ''' <returns></returns>
     Public ReadOnly Property clsColumnMetaData As clsColumnMetaData
@@ -142,7 +142,7 @@ Public Class clsDataFrame
         _strName = strName
         _clsPrepareFunctions = New clsPrepareFunctionsForGrids(rLink, strName)
         _clsVisiblePage = New clsDataFramePage(rLink, strName)
-        _clsFilter = New clsDataFrameFilter(rLink, strName)
+        _clsFilterOrColumnSelection = New clsDataFrameFilterOrColumnSelection(rLink, strName)
         _clsColumnMetaData = New clsColumnMetaData(rLink, strName)
     End Sub
 
@@ -168,9 +168,9 @@ Public Class clsDataFrame
             If _clsVisiblePage.RefreshData() Then
                 _iTotalRowCount = _RLink.GetDataFrameLength(_strName, False)
                 _iTotalColumnCount = _RLink.GetDataFrameColumnCount(_strName)
-                _clsFilter.RefreshData()
-                If _clsFilter.bFilterApplied Then
-                    _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _clsFilter.iFilteredRowCount)
+                _clsFilterOrColumnSelection.RefreshData()
+                If _clsFilterOrColumnSelection.bFilterApplied Then
+                    _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _clsFilterOrColumnSelection.iFilteredRowCount)
                 Else
                     _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _iTotalRowCount)
                 End If

instat/Model/DataFrame/clsDataFrameFilter.vb

@@ -19,7 +19,7 @@ Imports RDotNet
 ''' <summary>
 ''' Holds filter information for the dataframe
 ''' </summary>
-Public Class clsDataFrameFilter
+Public Class clsDataFrameFilterOrColumnSelection
     Protected _strDataFrameName As String
     Protected _RLink As RLink
 

instat/Model/RCommand/clsPrepareFunctionsForGrids.vb

@@ -322,11 +322,11 @@ Public Class clsPrepareFunctionsForGrids
         Return _RLink.GetColumnType(_strDataFrame, strColumnName)
     End Function
 
-    '' <summary>
+    ''' <summary>
     '''  Description: To Delete one or many cells 
     ''' the delete cell function is to be used to Replace selected values with NA 
     ''' in the dataframe.
-    ''' </summary>
+    '''</summary>
     ''' <param name="lstColumnNames"></param>
     ''' <param name="lstRowNames"></param>
     Public Sub DeleteCells(lstRowNames As List(Of String), lstColumnNames As List(Of String))

instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb

@@ -48,7 +48,7 @@ Public Class ucrDataViewLinuxGrid
     Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData
         Dim dataGrid = GetDataGridFromSelectedTab()
 
-        If dataFrame.clsFilter.bFilterApplied Then
+        If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then
             dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.Red
         Else
             dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.DarkBlue
@@ -114,6 +114,9 @@ Public Class ucrDataViewLinuxGrid
         If ctrlV Or shiftIns Then
             RaiseEvent PasteValuesToDataframe()
         End If
+        If e.KeyCode = Keys.Delete OrElse e.KeyCode = Keys.Back Then
+            RaiseEvent DeleteValueToDataframe()
+        End If
     End Sub
 
     Private Function GetCurrentDataFrameFocus() As clsDataFrame
@@ -143,10 +146,4 @@ Public Class ucrDataViewLinuxGrid
     Private Sub tcTabs_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tcTabs.SelectedIndexChanged
         RaiseEvent WorksheetChanged()
     End Sub
-    Private Sub DataGridView_BeforeCellKeyDown(sender As Object, e As KeyEventArgs)
-        If e.KeyCode = unvell.ReoGrid.Interaction.KeyCode.Delete OrElse e.KeyCode = unvell.ReoGrid.Interaction.KeyCode.Back Then
-            RaiseEvent DeleteValueToDataframe()
-        End If
-    End Sub
-
 End Class

instat/UserControls/DataGrid/Linux/ucrLinuxGrid.vb

@@ -112,19 +112,27 @@ Public MustInherit Class ucrLinuxGrid
     Public Function GetSelectedRows() As List(Of String) Implements IGrid.GetSelectedRows
         Dim lstSelectedRows As New List(Of String)
         Dim dataGrid = GetGrid(tcTabs.SelectedTab)
-        For Each row As DataGridViewRow In dataGrid.SelectedRows
-            lstSelectedRows.Add(row.HeaderCell.Value)
+        'For Each row As DataGridViewRow In dataGrid.SelectedRows
+        '    lstSelectedRows.Add(row.HeaderCell.Value)
+        'Next
+        For i As Integer = 0 To dataGrid.GetCellCount(DataGridViewElementStates.Selected) - 1
+            lstSelectedRows.Add(dataGrid.SelectedCells(i).RowIndex.ToString + 1)
         Next
+        lstSelectedRows = lstSelectedRows.Distinct.ToList
         Return lstSelectedRows
     End Function
 
 
     Public Function GetSelectedColumnIndexes() As List(Of String) Implements IGrid.GetSelectedColumnIndexes
         Dim lstSelectedColumnIndexes As New List(Of String)
         Dim dataGrid = GetGrid(tcTabs.SelectedTab)
-        For Each column As DataGridViewColumn In dataGrid.SelectedColumns
-            lstSelectedColumnIndexes.Add(Column.HeaderCell.Value)
+        'For Each column As DataGridViewColumn In dataGrid.SelectedColumns
+        '    lstSelectedColumnIndexes.Add(column.HeaderCell.Value)
+        'Next
+        For i As Integer = 0 To dataGrid.GetCellCount(DataGridViewElementStates.Selected) - 1
+            lstSelectedColumnIndexes.Add(dataGrid.SelectedCells(i).ColumnIndex.ToString + 1)
         Next
+        lstSelectedColumnIndexes = lstSelectedColumnIndexes.Distinct.ToList
         Return lstSelectedColumnIndexes
     End Function
 

instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb

@@ -31,13 +31,22 @@ Public Class ucrDataViewReoGrid
     Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged
 
     Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved
+
     Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns
         Dim workSheetColumnHeader As ColumnHeader
+        Dim variableTextColour As Color
+
         grdData.CurrentWorksheet.Columns = visiblePage.lstColumns.Count
+
+        If GetCurrentDataFrameFocus.clsFilterOrColumnSelection.bColumnSelectionApplied Then
+            variableTextColour = Color.Red
+        Else
+            variableTextColour = Color.DarkBlue
+        End If
         For i = 0 To visiblePage.lstColumns.Count - 1
             workSheetColumnHeader = grdData.CurrentWorksheet.ColumnHeaders(i)
             workSheetColumnHeader.Text = visiblePage.lstColumns(i).strDisplayName
-            workSheetColumnHeader.TextColor = visiblePage.lstColumns(i).clsColour
+            workSheetColumnHeader.TextColor = variableTextColour
             workSheetColumnHeader.Style.BackColor = visiblePage.lstColumns(i).clsBackGroundColour
         Next
     End Sub
@@ -53,7 +62,7 @@ Public Class ucrDataViewReoGrid
         grdData.CurrentWorksheet.Rows = dataFrame.iDisplayedRowCount
         UpdateWorksheetSettings(grdData.CurrentWorksheet)
 
-        If dataFrame.clsFilter.bFilterApplied Then
+        If dataFrame.clsFilterOrColumnSelection.bFilterApplied Then
             textColour = Color.Red
         Else
             textColour = Color.DarkBlue

instat/dlgDeleteObjects.vb

@@ -53,13 +53,13 @@ Public Class dlgDeleteObjects
         ucrInputComboType.SetParameter(New RParameter("object_type", 2))
         dctTypes.Add("Objects", Chr(34) & "object" & Chr(34))
         dctTypes.Add("Filters", Chr(34) & "filter" & Chr(34))
+        dctTypes.Add("Column selections", Chr(34) & "column_selection" & Chr(34))
         dctTypes.Add("Calculations", Chr(34) & "calculation" & Chr(34))
         dctTypes.Add("Tables", Chr(34) & "table" & Chr(34))
         dctTypes.Add("Graphs", Chr(34) & "graph" & Chr(34))
         dctTypes.Add("Models", Chr(34) & "model" & Chr(34))
         ucrInputComboType.SetItems(dctTypes)
         ucrInputComboType.SetDropDownStyleAsNonEditable()
-
     End Sub
 
     Private Sub SetDefaults()