Changeset 2948 for trunk/sources/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs

Timestamp:

03/06/10 03:30:37 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• implemented reviewers' comments on version r2917.

File:

• trunk/sources/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
@@ -32 +32 @@
   /// </summary>
   [View("ConstrainedValueParameter View")]
+  [Content(typeof(OptionalConstrainedValueParameter<>), true)]
   [Content(typeof(ConstrainedValueParameter<>), true)]
   public partial class ConstrainedValueParameterView<T> : ParameterView where T : class, IItem {
+    private List<T> valueComboBoxItems;
+
     /// <summary>
     /// Gets or sets the variable to represent visually.
@@ -39 +42 @@
     /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
     /// No own data storage present.</remarks>
-    public new ConstrainedValueParameter<T> Content {
-      get { return (ConstrainedValueParameter<T>)base.Content; }
+    public new OptionalConstrainedValueParameter<T> Content {
+      get { return (OptionalConstrainedValueParameter<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -50 +53 @@
       InitializeComponent();
       Caption = "ConstrainedValueParameter";
+      valueComboBoxItems = new List<T>();
     }
     /// <summary>
@@ -56 +60 @@
     /// <remarks>Calls <see cref="VariableView()"/>.</remarks>
     /// <param name="variable">The variable to represent visually.</param>
-    public ConstrainedValueParameterView(ConstrainedValueParameter<T> content)
+    public ConstrainedValueParameterView(OptionalConstrainedValueParameter<T> content)
       : this() {
       Content = content;
@@ -102 +106 @@
     private void FillValueComboBox() {
       valueComboBox.SelectedIndexChanged -= new EventHandler(valueComboBox_SelectedIndexChanged);
-      valueComboBox.DataSource = null;
+      valueComboBoxItems.Clear();
+      valueComboBox.Items.Clear();
+      if (!(Content is ConstrainedValueParameter<T>)) {
+        valueComboBoxItems.Add(null);
+        valueComboBox.Items.Add("-");
+      }
       if (Content != null) {
-        valueComboBox.DataSource = Content.ValidValues.ToList();
+        foreach (T item in Content.ValidValues) {
+          valueComboBoxItems.Add(item);
+          valueComboBox.Items.Add(item.ToString());
+        }
         valueComboBox.Enabled = valueComboBox.Items.Count > 0;
-        valueComboBox.SelectedItem = Content.Value;
+        valueComboBox.SelectedIndex = valueComboBoxItems.IndexOf(Content.Value);
       }
       valueComboBox.SelectedIndexChanged += new EventHandler(valueComboBox_SelectedIndexChanged);
@@ -116 +128 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        valueComboBox.SelectedItem = Content.Value;
+        valueComboBox.SelectedIndex = valueComboBoxItems.IndexOf(Content.Value);
         viewHost.Content = Content.Value;
       }
@@ -141 +153 @@
 
     private void valueComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      Content.Value = (T)valueComboBox.SelectedItem;
+      Content.Value = valueComboBoxItems[valueComboBox.SelectedIndex];
     }
   }