Changeset 3775

Timestamp:

05/11/10 18:16:41 (15 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

• added automatic re-selection of elements in collection views when the content of the view is changed

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/NamedItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (modified) (5 diffs)

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

@@ -84 +84 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+
+      int selectedIndex = -1;
+      if (itemsListView.SelectedItems.Count == 1) selectedIndex = itemsListView.SelectedIndices[0];
+
       while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
       viewHost.Content = null;
@@ -90 +94 @@
         foreach (T item in Content)
           AddListViewItem(CreateListViewItem(item));
+        if ((selectedIndex != -1) && (selectedIndex < itemsListView.Items.Count))
+          itemsListView.Items[selectedIndex].Selected = true;
       }
       SetEnabledStateOfControls();

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

@@ -88 +88 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+
+      int selectedIndex = -1;
+      if (itemsListView.SelectedItems.Count == 1) selectedIndex = itemsListView.SelectedIndices[0];
+
       while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
       viewHost.Content = null;
@@ -93 +97 @@
         foreach (T item in Content)
           AddListViewItem(CreateListViewItem(item));
+        if ((selectedIndex != -1) && (selectedIndex < itemsListView.Items.Count))
+          itemsListView.Items[selectedIndex].Selected = true;
       }
       SetEnabledStateOfControls();

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

@@ -51 +51 @@
       base.RegisterContentEvents();
       Content.ItemsReplaced += new CollectionItemsChangedEventHandler<T>(Content_ItemsReplaced);
+    }
+
+    protected override void OnContentChanged() {
+      string selectedName = null;
+      if ((itemsListView.SelectedItems.Count == 1) && (itemsListView.SelectedItems[0].Tag != null))
+        selectedName = ((T)itemsListView.SelectedItems[0].Tag).Name;
+      base.OnContentChanged();
+      if (selectedName != null) {
+        foreach (ListViewItem item in itemsListView.Items) {
+          if ((item.Tag != null) && (((T)item.Tag).Name.Equals(selectedName)))
+            item.Selected = true;
+        }
+      }
     }
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -94 +94 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+
+      string selectedName = null;
+      if ((itemsListView.SelectedItems.Count == 1) && (itemsListView.SelectedItems[0].Tag != null))
+        selectedName = ((IRun)itemsListView.SelectedItems[0].Tag).Name;
+
       while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
       viewHost.Content = null;
@@ -105 +110 @@
         }
         foreach (IRun item in Content) {
-          AddListViewItem(CreateListViewItem(item));
+          ListViewItem listViewItem = CreateListViewItem(item);
+          AddListViewItem(listViewItem);
           UpdateRun(item);
+          if ((selectedName != null) && item.Name.Equals(selectedName))
+            listViewItem.Selected = true;
         }
       } else {

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -69 +70 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      FillListView();
-      viewHost.ViewType = null;
       viewHost.Content = null;
       if (Content != null)
         UpdateColorPictureBox();
+      FillListView();
 
       SetEnabledStateOfControls();
@@ -112 +112 @@
 
     private void FillListView() {
+      string selectedName = null;
+      if (listView.SelectedItems.Count == 1) selectedName = listView.SelectedItems[0].SubItems[0].Text;
+
       listView.Items.Clear();
       listView.SmallImageList.Images.Clear();
       if (Content != null) {
         foreach (string key in Content.Parameters.Keys)
-          CreateListViewItem(key, Content.Parameters[key], listView.Groups["parametersGroup"]);
+          CreateListViewItem(key, Content.Parameters[key], listView.Groups["parametersGroup"], selectedName);
         foreach (string key in Content.Results.Keys)
-          CreateListViewItem(key, Content.Results[key], listView.Groups["resultsGroup"]);
+          CreateListViewItem(key, Content.Results[key], listView.Groups["resultsGroup"], selectedName);
         if (listView.Items.Count > 0) {
           for (int i = 0; i < listView.Columns.Count; i++)
@@ -126 +129 @@
     }
 
-    private void CreateListViewItem(string name, IItem value, ListViewGroup group) {
+    private void CreateListViewItem(string name, IItem value, ListViewGroup group, string selectedName) {
       ListViewItem item = new ListViewItem(new string[] { name, value != null ? value.ToString() : "-" });
       item.Tag = value;
@@ -133 +136 @@
       item.ImageIndex = listView.SmallImageList.Images.Count - 1;
       listView.Items.Add(item);
+      if ((selectedName != null) && name.Equals(selectedName)) item.Selected = true;
     }
 
     private void listView_SelectedIndexChanged(object sender, EventArgs e) {
-      if (listView.SelectedItems.Count == 1) {
-        viewHost.ViewType = null;
+      if (listView.SelectedItems.Count == 1)
         viewHost.Content = (IContent)listView.SelectedItems[0].Tag;
-      } else {
+      else
         viewHost.Content = null;
-      }
     }
     private void listView_DoubleClick(object sender, EventArgs e) {