Changeset 3341 for trunk/sources/HeuristicLab.Optimization.Views/3.3

Timestamp:

04/14/10 05:09:59 (15 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893).

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionView.cs (modified) (3 diffs)
• RunView.cs (modified) (3 diffs)

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

@@ -83 +83 @@
 
     protected virtual ListViewItem CreateListViewItem(IRun item) {
-      if (!itemsListView.SmallImageList.Images.ContainsKey(item.GetType().FullName))
-        itemsListView.SmallImageList.Images.Add(item.GetType().FullName, item.ItemImage);
-
       ListViewItem listViewItem = new ListViewItem();
       listViewItem.Text = item.ToString();
       listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
-      listViewItem.ImageIndex = itemsListView.SmallImageList.Images.IndexOfKey(item.GetType().FullName);
+      itemsListView.SmallImageList.Images.Add(item.ItemImage);
+      listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
       listViewItem.Tag = item;
       return listViewItem;
@@ -95 +93 @@
     protected virtual void AddListViewItem(ListViewItem listViewItem) {
       itemsListView.Items.Add(listViewItem);
+      ((IRun)listViewItem.Tag).ItemImageChanged += new EventHandler(Item_ItemImageChanged);
       ((IRun)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
     }
     protected virtual void RemoveListViewItem(ListViewItem listViewItem) {
+      ((IRun)listViewItem.Tag).ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
       ((IRun)listViewItem.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
       listViewItem.Remove();
-    }
-    protected virtual void UpdateListViewItem(ListViewItem listViewItem) {
-      if (!listViewItem.Text.Equals(listViewItem.Tag.ToString())) {
+      foreach (ListViewItem other in itemsListView.Items)
+        if (other.ImageIndex > listViewItem.ImageIndex) other.ImageIndex--;
+      itemsListView.SmallImageList.Images.RemoveAt(listViewItem.ImageIndex);
+    }
+    protected virtual void UpdateListViewItemImage(ListViewItem listViewItem) {
+      int i = listViewItem.ImageIndex;
+      listViewItem.ImageList.Images[i] = ((IRun)listViewItem.Tag).ItemImage;
+      listViewItem.ImageIndex = -1;
+      listViewItem.ImageIndex = i;
+    }
+    protected virtual void UpdateListViewItemText(ListViewItem listViewItem) {
+      if (!listViewItem.Text.Equals(listViewItem.Tag.ToString()))
         listViewItem.Text = listViewItem.Tag.ToString();
-      }
     }
     protected virtual IEnumerable<ListViewItem> GetListViewItemsForItem(IRun item) {
@@ -226 +234 @@
 
     #region Item Events
-    protected virtual void Item_ToStringChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Item_ToStringChanged), sender, e);
+    protected virtual void Item_ItemImageChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Item_ItemImageChanged), sender, e);
       else {
         IRun item = (IRun)sender;
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
-          UpdateListViewItem(listViewItem);
+          UpdateListViewItemImage(listViewItem);
+      }
+    }
+    protected virtual void Item_ToStringChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Item_ToStringChanged), sender, e);
+      else {
+        IRun item = (IRun)sender;
+        foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
+          UpdateListViewItemText(listViewItem);
       }
     }

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

@@ -75 +75 @@
 
     private void FillListView() {
-      if (!listView.SmallImageList.Images.ContainsKey("Default"))
-        listView.SmallImageList.Images.Add("Default", HeuristicLab.Common.Resources.VS2008ImageLibrary.Nothing);
-
       listView.Items.Clear();
+      listView.SmallImageList.Images.Clear();
       if (Content != null) {
-        foreach (string key in Content.Parameters.Keys) {
-          IItem value = Content.Parameters[key];
-          if ((value != null) && (!listView.SmallImageList.Images.ContainsKey(value.GetType().FullName)))
-            listView.SmallImageList.Images.Add(value.GetType().FullName, value.ItemImage);
-
-          ListViewItem item = new ListViewItem(new string[] { key, value != null ? value.ToString() : "-" });
-          item.Tag = value;
-          item.Group = listView.Groups["parametersGroup"];
-          item.ImageIndex = listView.SmallImageList.Images.IndexOfKey(value != null ? value.GetType().FullName : "Default");
-          listView.Items.Add(item);
-        }
-        foreach (string key in Content.Results.Keys) {
-          IItem value = Content.Results[key];
-          if ((value != null) && (!listView.SmallImageList.Images.ContainsKey(value.GetType().FullName)))
-            listView.SmallImageList.Images.Add(value.GetType().FullName, value.ItemImage);
-
-          ListViewItem item = new ListViewItem(new string[] { key, value != null ? value.ToString() : "-" });
-          item.Tag = value;
-          item.Group = listView.Groups["resultsGroup"];
-          item.ImageIndex = listView.SmallImageList.Images.IndexOfKey(value != null ? value.GetType().FullName : "Default");
-          listView.Items.Add(item);
-        }
+        foreach (string key in Content.Parameters.Keys)
+          CreateListViewItem(key, Content.Parameters[key], listView.Groups["parametersGroup"]);
+        foreach (string key in Content.Results.Keys)
+          CreateListViewItem(key, Content.Results[key], listView.Groups["resultsGroup"]);
         if (listView.Items.Count > 0) {
           for (int i = 0; i < listView.Columns.Count; i++)
@@ -107 +87 @@
         }
       }
+    }
+
+    private void CreateListViewItem(string name, IItem value, ListViewGroup group) {
+      ListViewItem item = new ListViewItem(new string[] { name, value != null ? value.ToString() : "-" });
+      item.Tag = value;
+      item.Group = group;
+      listView.SmallImageList.Images.Add(value == null ? HeuristicLab.Common.Resources.VS2008ImageLibrary.Nothing : value.ItemImage);
+      item.ImageIndex = listView.SmallImageList.Images.Count - 1;
+      listView.Items.Add(item);
     }
 
@@ -130 +119 @@
       data.SetData("Type", item.GetType());
       data.SetData("Value", item);
-      DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
+      DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy);
     }
     private void showAlgorithmButton_Click(object sender, EventArgs e) {
-      MainFormManager.CreateDefaultView(Content.Algorithm).Show();
+      MainFormManager.CreateDefaultView(Content.Algorithm.Clone()).Show();
     }
   }