Changeset 3444 for trunk/sources

Timestamp:

04/20/10 16:00:18 (15 years ago)

Author:

mkommend

Message:

reacted on TimeSpans in sorting and added protected virtual Sort method for derived classes (e.g. RunCollectionTabularView) (ticket #968)

File:

• trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -294 +294 @@
 
     private void Sort() {
+      virtualRowIndizes = Sort(sortedColumnIndizes);
+      UpdateSortGlyph();
+      dataGridView.Invalidate();
+    }
+    protected virtual int[] Sort(IEnumerable<KeyValuePair<int, SortOrder>> sortedColumns) {
       int[] newSortedIndex = Enumerable.Range(0, Content.Rows).ToArray();
-      if (sortedColumnIndizes.Count != 0) {
-        rowComparer.SortedIndizes = sortedColumnIndizes;
+      if (sortedColumns.Count() != 0) {
+        rowComparer.SortedIndizes = sortedColumns;
         rowComparer.Matrix = Content;
         Array.Sort(newSortedIndex, rowComparer);
       }
-      virtualRowIndizes = newSortedIndex;
-      UpdateSortGlyph();
-      dataGridView.Invalidate();
-    }
-
+      return newSortedIndex;
+    }
     private void UpdateSortGlyph() {
       foreach (DataGridViewColumn col in this.dataGridView.Columns)
@@ -332 +334 @@
         double double1, double2;
         DateTime dateTime1, dateTime2;
+        TimeSpan timeSpan1, timeSpan2;
         string string1, string2;
 
@@ -346 +349 @@
           else if (DateTime.TryParse(string1, out dateTime1) && DateTime.TryParse(string2, out dateTime2))
             result = dateTime1.CompareTo(dateTime2);
+          else if (TimeSpan.TryParse(string1, out timeSpan1) && TimeSpan.TryParse(string2, out timeSpan2))
+            result = timeSpan1.CompareTo(timeSpan2);
           else {
             if (string1 != null)