Changeset 9523

Timestamp:

05/24/13 14:17:56 (12 years ago)

Author:

ascheibe

Message:

#2064 fixed sorting in Hive Job Manager and ItemCollectionView

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs

@@ -31 +31 @@
   public class ListViewItemDateComparer : IComparer {
     private int col;
-    private SortOrder order;
+    public SortOrder Order { get; set; }
 
     public ListViewItemDateComparer() {
       col = 0;
-      order = SortOrder.Ascending;
+      Order = SortOrder.Ascending;
     }
 
     public ListViewItemDateComparer(int column, SortOrder order) {
       col = column;
-      this.order = order;
+      Order = order;
     }
 
@@ -66 +66 @@
       }
 
-      if (order == SortOrder.Descending) {
+      if (Order == SortOrder.Descending) {
         // invert the value returned by Compare.
         returnVal *= -1;

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -44 +44 @@
       this.itemsListView.Columns.Add(new ColumnHeader("Date") { Text = "Date" });
       this.itemsListView.Columns.Add(new ColumnHeader("Name") { Text = "Name" });
-      foreach (ColumnHeader c in this.itemsListView.Columns) {
-        c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
-      }
+
       this.itemsListView.HeaderStyle = ColumnHeaderStyle.Clickable;
       this.itemsListView.FullRowSelect = true;
 
       this.itemsListView.ListViewItemSorter = new ListViewItemDateComparer(0, SortOrder.Ascending);
-      this.itemsListView.Sorting = SortOrder.Ascending;
-      this.itemsListView.Sort();
 
       progress = new Progress() {
@@ -59 +55 @@
       };
       progressView = new ProgressView(this, progress);
+    }
+
+    protected override void SortItemsListView(SortOrder sortOrder) {
+      if (itemsListView.Sorting == sortOrder || sortOrder == SortOrder.None) return;
+      ((ListViewItemDateComparer)itemsListView.ListViewItemSorter).Order = sortOrder;
+      base.SortItemsListView(sortOrder);
+      AdjustListViewColumnSizes();
     }
 

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -407 +407 @@
     #region Helpers
     protected virtual void SortItemsListView(SortOrder sortOrder) {
-      itemsListView.Sorting = SortOrder.None;
+      if (itemsListView.Sorting == sortOrder || sortOrder == SortOrder.None) return;
       itemsListView.Sorting = sortOrder;
-      itemsListView.Sorting = SortOrder.None;
+      itemsListView.Sort();
     }
     protected virtual void AdjustListViewColumnSizes() {