Changeset 8544 for branches

Timestamp:

08/30/12 16:08:24 (12 years ago)

Author:

jkarder

Message:

#1853: ValueView now uses the TypeSelectorDialog instead of the ObjectSelectorDialog

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3

Files:

• HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj (modified) (1 diff)
• ObjectSelectorDialog.Designer.cs (deleted)
• ObjectSelectorDialog.cs (deleted)
• ValueConfigurationViews/ValueView.cs (modified) (2 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj

@@ -106 +106 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ObjectSelectorDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ObjectSelectorDialog.Designer.cs">
-      <DependentUpon>ObjectSelectorDialog.cs</DependentUpon>
-    </Compile>
     <Compile Include="OptimizableView.cs">
       <SubType>UserControl</SubType>

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/ValueConfigurationViews/ValueView.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -66 +65 @@
 
     private void setValueButton_Click(object sender, EventArgs e) {
+      // TODO: valid values get lost if the value was set to be optimized before
       var withoutNullValue = Content.ValidValues.Where(x => x != null && !(x is NullValue));
-      var objectSelectorDialog = new ObjectSelectorDialog<IItem>(withoutNullValue.GroupBy(x => ApplicationManager.Manager.GetDeclaringPlugin(x.GetType()).Name));
-      if (objectSelectorDialog.ShowDialog(this) == DialogResult.OK) {
+      var typeSelectorDialog = new TypeSelectorDialog();
+      typeSelectorDialog.Caption = "Select Item";
+      typeSelectorDialog.TypeSelector.Caption = "Available Items";
+      typeSelectorDialog.TypeSelector.Configure(withoutNullValue.Select(x => x.GetType()), false, false, false);
+      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          Content.Value = objectSelectorDialog.Item;
+          Content.Value = withoutNullValue.Single(x => x.GetType() == typeSelectorDialog.TypeSelector.SelectedType);
           valueViewHost.Content = Content.Value;
         }