Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Core.Views/3.3/TypeSelector.cs

Timestamp:

01/02/12 11:40:31 (12 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (2 diffs, 1 prop)

branches/RegressionBenchmarks/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -128 +128 @@
           pluginNode.Tag = plugin;
 
-          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, assignableToAllTypes)
+          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, ShowGenericTypes, assignableToAllTypes)
                       where typeCondition(t)
                       orderby t.Name ascending
                       select t;
           foreach (Type type in types) {
-            bool valid = true;
-            valid = valid && (ShowGenericTypes || !type.ContainsGenericParameters);
-            valid = valid && (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor
+            bool valid = (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor
             if (valid) {
               TreeNode typeNode = new TreeNode();
@@ -144 +142 @@
               else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3;
               else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
-              else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract && type.GetConstructor(Type.EmptyTypes) != null) {
-                IItem item = (IItem)Activator.CreateInstance(type);
-                imageList.Images.Add(type.FullName, item.ItemImage);
-                typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+              else {
+                var image = ItemAttribute.GetImage(type);
+                if (image != null) {
+                  imageList.Images.Add(type.FullName, image);
+                  typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+                }
               }
               typeNode.SelectedImageIndex = typeNode.ImageIndex;