Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Optimizer

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (6 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -30 +30 @@
   internal partial class NewItemDialog : Form {
     private bool initialized;
-    private List<IItem> items;
 
     private IItem item;
@@ -39 +38 @@
     public NewItemDialog() {
       initialized = false;
-      items = new List<IItem>();
       item = null;
       InitializeComponent();
@@ -53 +51 @@
 
         itemsListView.SmallImageList = new ImageList();
+        itemsListView.SmallImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Class);  // default icon
         foreach (var category in categories) {
           ListViewGroup group = new ListViewGroup(category.Key);
           itemsListView.Groups.Add(group);
           foreach (var creatable in category) {
-            IItem i = (IItem)Activator.CreateInstance(creatable);
-            items.Add(i);
-            ListViewItem item = new ListViewItem(new string[] { i.ItemName, i.ItemVersion.ToString(), i.ItemDescription }, group);
-            itemsListView.SmallImageList.Images.Add(i.ItemImage);
-            item.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
-            item.Tag = i;
+            string name = ItemAttribute.GetName(creatable);
+            string version = ItemAttribute.GetVersion(creatable).ToString();
+            string description = ItemAttribute.GetDescription(creatable);
+            ListViewItem item = new ListViewItem(new string[] { name, version, description }, group);
+            item.ImageIndex = 0;
+            Image image = ItemAttribute.GetImage(creatable);
+            if (image != null) {
+              itemsListView.SmallImageList.Images.Add(image);
+              item.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
+            }
+            item.Tag = creatable;
             itemsListView.Items.Add(item);
           }
@@ -82 +86 @@
     private void okButton_Click(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        item = (IItem)((IItem)itemsListView.SelectedItems[0].Tag).Clone();
+        item = (IItem)Activator.CreateInstance((Type)itemsListView.SelectedItems[0].Tag);
         DialogResult = DialogResult.OK;
         Close();
@@ -89 +93 @@
     private void itemTypesListView_DoubleClick(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        item = (IItem)((IItem)itemsListView.SelectedItems[0].Tag).Clone();
+        item = (IItem)Activator.CreateInstance((Type)itemsListView.SelectedItems[0].Tag);
         DialogResult = DialogResult.OK;
         Close();