Changeset 5898

Timestamp:

03/30/11 18:27:08 (14 years ago)

Author:

mkommend

Message:

#1454: Updated TypeSelector to handle logical connection operators when discovering multiple types.

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs

@@ -275 +275 @@
         problemTypeSelectorDialog.TypeSelector.Caption = "Available Problems";
       }
-      problemTypeSelectorDialog.TypeSelector.Configure(new List<Type>() { Content.ProblemType, Content.Algorithm.ProblemType }, false, true);
+      problemTypeSelectorDialog.TypeSelector.Configure(new List<Type>() { Content.ProblemType, Content.Algorithm.ProblemType }, false, true, true);
       if (problemTypeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         Content.Problem = (IDataAnalysisProblem)problemTypeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();

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

@@ -86 +86 @@
 
     public virtual void Configure(Type baseType, bool showNotInstantiableTypes, bool showGenericTypes) {
-      Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes);
-    }
-
-    public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes) {
+      Configure(new List<Type>() { baseType }, showNotInstantiableTypes, showGenericTypes, true);
+    }
+
+    public virtual void Configure(IEnumerable<Type> baseTypes, bool showNotInstantiableTypes, bool showGenericTypes, bool allTypes) {
       if (baseTypes == null) throw new ArgumentNullException();
       if (InvokeRequired)
-        Invoke(new Action<IEnumerable<Type>, bool, bool>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes);
+        Invoke(new Action<IEnumerable<Type>, bool, bool, bool>(Configure), baseTypes, showNotInstantiableTypes, showGenericTypes, allTypes);
       else {
         this.baseTypes = baseTypes;
@@ -114 +114 @@
         foreach (IPluginDescription plugin in plugins) {
           TreeNode pluginNode = new TreeNode();
-          pluginNode.Text = string.Format("{0} [{1}.{2}]", plugin.Name, plugin.Version.Major, plugin.Version.Minor);
+          pluginNode.Text = string.Format("{0} {1}.{2}", plugin.Name, plugin.Version.Major, plugin.Version.Minor);
           pluginNode.ImageIndex = 1;
           pluginNode.SelectedImageIndex = pluginNode.ImageIndex;
           pluginNode.Tag = plugin;
 
-          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, ShowNotInstantiableTypes)
+          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, ShowNotInstantiableTypes, allTypes)
                       orderby t.Name ascending
                       select t;
@@ -258 +258 @@
       Type[] constraints = param.GetGenericParameterConstraints();
       bool showNotInstantiableTypes = !param.GenericParameterAttributes.HasFlag(GenericParameterAttributes.DefaultConstructorConstraint);
-      typeSelectorDialog.TypeSelector.Configure(constraints, showNotInstantiableTypes, true);
+      typeSelectorDialog.TypeSelector.Configure(constraints, showNotInstantiableTypes, true, true);
 
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {