Changeset 9356 for branches/ParameterConfigurationEncoding

Timestamp:

04/11/13 17:11:32 (12 years ago)

Author:

jkarder

Message:

#1853:

• moved ValueConfigurationCheckedItemCollectionView to ParameterConfigurationEncoding
• renamed ValueConfigurationCheckedItemCollectionView to ValueConfigurationCheckedItemListView

Location:

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

Files:

• HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj (modified) (2 diffs)
• OptimizableView.cs (modified) (1 diff)
• ValueConfigurationViews/ValueConfigurationCheckedItemListView.Designer.cs (moved) (moved from branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemCollectionView.Designer.cs) (2 diffs)
• ValueConfigurationViews/ValueConfigurationCheckedItemListView.cs (moved) (moved from branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemCollectionView.cs) (3 diffs)

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

@@ -121 +121 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-    <Compile Include="ValueConfigurationViews\CheckedValueConfigurationListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ValueConfigurationViews\CheckedValueConfigurationListView.Designer.cs">
-      <DependentUpon>CheckedValueConfigurationListView.cs</DependentUpon>
-    </Compile>
     <Compile Include="ValueConfigurationViews\RangeView.cs">
       <SubType>UserControl</SubType>
@@ -132 +126 @@
     <Compile Include="ValueConfigurationViews\RangeView.Designer.cs">
       <DependentUpon>RangeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemListView.Designer.cs">
+      <DependentUpon>ValueConfigurationCheckedItemListView.cs</DependentUpon>
     </Compile>
     <Compile Include="ValueConfigurationViews\ValueView.cs">

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

@@ -70 +70 @@
             } else {
               viewHost.Content = pc.ValueConfigurations;
-              viewHost.ViewType = typeof(CheckedValueConfigurationListView);
+              viewHost.ViewType = typeof(ValueConfigurationCheckedItemListView);
             }
           } else if (vc != null) {

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemListView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding.Views {
-  partial class ValueConfigurationCheckedItemCollectionView {
+  partial class ValueConfigurationCheckedItemListView {
     /// <summary> 
     /// Required designer variable.
@@ -25 +25 @@
     private void InitializeComponent() {
       components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     }
 

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

@@ -10 +10 @@
   [View("ValueConfigurationList View")]
   [Content(typeof(ICheckedValueConfigurationList), IsDefaultView = true)]
-  public sealed partial class ValueConfigurationCheckedItemCollectionView : CheckedItemListView<IValueConfiguration> {
+  public sealed partial class ValueConfigurationCheckedItemListView : CheckedItemListView<IValueConfiguration> {
     public new ICheckedValueConfigurationList Content {
       get { return (ICheckedValueConfigurationList)base.Content; }
@@ -16 +16 @@
     }
 
-    public ValueConfigurationCheckedItemCollectionView() {
+    public ValueConfigurationCheckedItemListView() {
       InitializeComponent();
       this.viewHost.ViewsLabelVisible = false;
+      this.typeSelectorDialog = new TypeSelectorDialog();
     }
 
@@ -45 +46 @@
 
     protected override IValueConfiguration CreateItem() {
-      var objectSelectorDialog = new ObjectSelectorDialog<IItem>(Content.ValidValues.GroupBy(x => ApplicationManager.Manager.GetDeclaringPlugin(x.GetType()).Name));
-      if (objectSelectorDialog.ShowDialog(this) == DialogResult.OK) {
+      typeSelectorDialog.Caption = "Select Item";
+      typeSelectorDialog.TypeSelector.Caption = "Available Items";
+      typeSelectorDialog.TypeSelector.Configure(Content.ValidValues.Select(x => x.GetType()), false, false, false);
+      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          IItem value = (IItem)objectSelectorDialog.Item.Clone();
+          IItem value = (IItem)Content.ValidValues.Single(x => x.GetType() == typeSelectorDialog.TypeSelector.SelectedType).Clone();
           if (value is NullValue) {
             return new NullValueConfiguration();