Changeset 10947 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/CopyOfStringConvertibleMatrixView.cs

Timestamp:

06/04/14 14:57:45 (10 years ago)

Author:

rstoll

Message:

• Changed ComparisonFilter, using DoubleValue and DateTime rather than just StringValue
• Included better input validation for ComparisonFilterView
• Bug "Search and Sorted DataGridContentView" fixed

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/CopyOfStringConvertibleMatrixView.cs (modified) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/CopyOfStringConvertibleMatrixView.cs

@@ -104 +104 @@
     }
 
+    // Was private before
+    protected void Sort() {
+      virtualRowIndices = Sort(sortedColumnIndices);
+      UpdateSortGlyph();
+      UpdateRowHeaders();
+      dataGridView.Invalidate();
+    }
+
+    // Was private before
+    protected List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
+
     #region unchanged copied from original - see  HeuristicLab.Data.Views.StringConvertibleMatrix
 
     protected int[] virtualRowIndices;
-    private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     private RowComparer rowComparer;
 
@@ -293 +303 @@
     private Point[] GetSelectedCellsAsPoints() {
       Point[] points = new Point[dataGridView.SelectedCells.Count];
-      for (int i = 0; i < dataGridView.SelectedCells.Count; i++)
-      {
+      for (int i = 0; i < dataGridView.SelectedCells.Count; i++) {
         points[i].X = dataGridView.SelectedCells[i].ColumnIndex;
         points[i].Y = dataGridView.SelectedCells[i].RowIndex;
@@ -487 +496 @@
     }
 
-    private void Sort() {
-      virtualRowIndices = Sort(sortedColumnIndices);
-      UpdateSortGlyph();
-      UpdateRowHeaders();
-      dataGridView.Invalidate();
-    }
     protected virtual int[] Sort(IEnumerable<KeyValuePair<int, SortOrder>> sortedColumns) {
       int[] newSortedIndex = Enumerable.Range(0, Content.Rows).ToArray();
@@ -597 +600 @@
     }
 
-   
+
   }
     #endregion