Changeset 8655

Timestamp:

09/14/12 11:40:21 (12 years ago)

Author:

jkarder

Message:

#1853:

• fixed possible deselection of all value configurations
• set AutoScaleMode to Inherit in OptimizableView

Location:

branches/ParameterConfigurationEncoding

Files:

• HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/OptimizableView.Designer.cs (modified) (1 diff)
• HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/OptimizableView.cs (modified) (1 diff)
• HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (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>

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

@@ -79 +79 @@
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.optimizeCheckBox);
       this.Controls.Add(this.viewHost);

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

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

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
-  // TODO: check that at least 1 element needs to be selected
   // TODO: control creatable item types ### EDIT: done?
   [StorableClass]
@@ -81 +80 @@
     private void RegisterEvents() {
       this.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
-      this.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_CheckedItemsChanged);
     }
 
     private void DeregisterEvents() {
-      this.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_CheckedItemsChanged);
       this.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
     }
@@ -99 +96 @@
       }
     }
-    private void CheckedValueConfigurationList_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
-      // TODO: view does not get notified
-      if (!this.CheckedItems.Any()) this.SetItemCheckedState(e.Items.Single().Value, true);
-    }
     #endregion
-
   }
 }