Changeset 2891 for trunk/sources/HeuristicLab.Parameters.Views

Timestamp:

03/01/10 04:46:06 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms and parameters

Location:

trunk/sources/HeuristicLab.Parameters.Views/3.3

Files:

• HeuristicLab.Parameters.Views-3.3.csproj (modified) (1 diff)
• OptionalValueParameterView.Designer.cs (added)
• OptionalValueParameterView.cs (added)
• ValueParameterView.Designer.cs (modified) (6 diffs)
• ValueParameterView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Parameters.Views/3.3/HeuristicLab.Parameters.Views-3.3.csproj

@@ -74 +74 @@
     <Compile Include="ConstrainedValueParameterView.Designer.cs">
       <DependentUpon>ConstrainedValueParameterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="OptionalValueParameterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OptionalValueParameterView.Designer.cs">
+      <DependentUpon>OptionalValueParameterView.cs</DependentUpon>
     </Compile>
     <Compile Include="ValueLookupParameterView.cs">

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.Designer.cs

@@ -33 +33 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        if (typeSelectorDialog != null) typeSelectorDialog.Dispose();
         if (components != null) components.Dispose();
       }
@@ -46 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.valueGroupBox = new System.Windows.Forms.GroupBox();
       this.valuePanel = new System.Windows.Forms.Panel();
       this.viewHost = new HeuristicLab.Core.Views.ViewHost();
-      this.clearValueButton = new System.Windows.Forms.Button();
-      this.setValueButton = new System.Windows.Forms.Button();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.valueGroupBox.SuspendLayout();
@@ -81 +76 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.valueGroupBox.Controls.Add(this.valuePanel);
-      this.valueGroupBox.Controls.Add(this.clearValueButton);
-      this.valueGroupBox.Controls.Add(this.setValueButton);
       this.valueGroupBox.Location = new System.Drawing.Point(0, 120);
       this.valueGroupBox.Name = "valueGroupBox";
@@ -97 +90 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.valuePanel.Controls.Add(this.viewHost);
-      this.valuePanel.Location = new System.Drawing.Point(6, 49);
+      this.valuePanel.Location = new System.Drawing.Point(6, 19);
       this.valuePanel.Name = "valuePanel";
-      this.valuePanel.Size = new System.Drawing.Size(374, 140);
+      this.valuePanel.Size = new System.Drawing.Size(374, 170);
       this.valuePanel.TabIndex = 0;
       this.valuePanel.DragOver += new System.Windows.Forms.DragEventHandler(this.valuePanel_DragEnterOver);
@@ -111 +104 @@
       this.viewHost.Location = new System.Drawing.Point(0, 0);
       this.viewHost.Name = "viewHost";
-      this.viewHost.Size = new System.Drawing.Size(374, 140);
+      this.viewHost.Size = new System.Drawing.Size(374, 170);
       this.viewHost.TabIndex = 0;
-      // 
-      // clearValueButton
-      // 
-      this.clearValueButton.Enabled = false;
-      this.clearValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Remove;
-      this.clearValueButton.Location = new System.Drawing.Point(36, 19);
-      this.clearValueButton.Name = "clearValueButton";
-      this.clearValueButton.Size = new System.Drawing.Size(24, 24);
-      this.clearValueButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.clearValueButton, "Clear Value");
-      this.clearValueButton.UseVisualStyleBackColor = true;
-      this.clearValueButton.Click += new System.EventHandler(this.clearValueButton_Click);
-      // 
-      // setValueButton
-      // 
-      this.setValueButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Add;
-      this.setValueButton.Location = new System.Drawing.Point(6, 19);
-      this.setValueButton.Name = "setValueButton";
-      this.setValueButton.Size = new System.Drawing.Size(24, 24);
-      this.setValueButton.TabIndex = 0;
-      this.toolTip.SetToolTip(this.setValueButton, "Set Value");
-      this.setValueButton.UseVisualStyleBackColor = true;
-      this.setValueButton.Click += new System.EventHandler(this.setValueButton_Click);
+      this.viewHost.ViewType = null;
       // 
       // ValueParameterView
@@ -164 +135 @@
     protected System.Windows.Forms.Panel valuePanel;
     protected HeuristicLab.Core.Views.ViewHost viewHost;
-    protected System.Windows.Forms.Button setValueButton;
-    protected System.Windows.Forms.ToolTip toolTip;
-    protected System.Windows.Forms.Button clearValueButton;
   }
 }

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

@@ -30 +30 @@
   /// The visual representation of a <see cref="Parameter"/>.
   /// </summary>
-  [Content(typeof(OptionalValueParameter<>), true)]
-  [Content(typeof(IValueParameter<>), false)]
+  [Content(typeof(ValueParameter<>), true)]
   public partial class ValueParameterView<T> : ParameterView where T : class, IItem {
-    protected TypeSelectorDialog typeSelectorDialog;
-
     /// <summary>
     /// Gets or sets the variable to represent visually.
@@ -40 +37 @@
     /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
     /// No own data storage present.</remarks>
-    public new IValueParameter<T> Content {
-      get { return (IValueParameter<T>)base.Content; }
+    public new ValueParameter<T> Content {
+      get { return (ValueParameter<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -57 +54 @@
     /// <remarks>Calls <see cref="VariableView()"/>.</remarks>
     /// <param name="variable">The variable to represent visually.</param>
-    public ValueParameterView(IValueParameter<T> content)
+    public ValueParameterView(ValueParameter<T> content)
       : this() {
       Content = content;
@@ -84 +81 @@
       if (Content == null) {
         Caption = "ValueParameter";
-        setValueButton.Enabled = false;
-        clearValueButton.Enabled = false;
         viewHost.Content = null;
         valueGroupBox.Enabled = false;
       } else {
         Caption = Content.Name + " (" + Content.GetType().Name + ")";
-        setValueButton.Enabled = Content.Value == null;
-        clearValueButton.Enabled = Content.Value != null;
         valueGroupBox.Enabled = true;
         viewHost.Content = Content.Value;
@@ -101 +94 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        setValueButton.Enabled = Content.Value == null;
-        clearValueButton.Enabled = Content.Value != null;
         viewHost.Content = Content.Value;
       }
     }
 
-    protected virtual void setValueButton_Click(object sender, EventArgs e) {
-      if (typeSelectorDialog == null) {
-        typeSelectorDialog = new TypeSelectorDialog();
-        typeSelectorDialog.Caption = "Select Value";
-        typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, false);
-      }
-      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK)
-        Content.Value = (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-    }
-    protected virtual void clearValueButton_Click(object sender, EventArgs e) {
-      Content.Value = null;
-    }
     protected virtual void valuePanel_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;