Changeset 4257 for trunk

Timestamp:

08/19/10 05:37:14 (14 years ago)

Author:

swagner

Message:

Implemented showing of concrete data type in value parameters (#1161)

Location:

trunk/sources/HeuristicLab.Parameters.Views/3.3

Files:

• ConstrainedValueParameterView.cs (modified) (4 diffs)
• ValueLookupParameterView.cs (modified) (4 diffs)
• ValueParameterView.cs (modified) (4 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -85 +86 @@
         FillValueComboBox();
       } else {
+        SetDataTypeTextBoxText();
         FillValueComboBox();
         viewHost.ViewType = null;
@@ -121 +123 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        valueComboBox.SelectedIndex = valueComboBoxItems.IndexOf(Content.Value);
+        SetDataTypeTextBoxText();
+        valueComboBox.SelectedIndex = valueComboBoxItems.IndexOf(Content != null ? Content.Value : null);
         viewHost.ViewType = null;
-        viewHost.Content = Content.Value;
+        viewHost.Content = Content != null ? Content.Value : null;
       }
     }
@@ -150 +153 @@
         Content.Value = valueComboBoxItems[valueComboBox.SelectedIndex];
     }
+
+    #region Helpers
+    protected void SetDataTypeTextBoxText() {
+      if (Content == null) {
+        dataTypeTextBox.Text = "-";
+      } else {
+        if ((Content.Value != null) && (Content.Value.GetType() != Content.DataType))
+          dataTypeTextBox.Text = Content.DataType.GetPrettyName() + " (" + Content.Value.GetType().GetPrettyName() + ")";
+        else
+          dataTypeTextBox.Text = Content.DataType.GetPrettyName();
+      }
+    }
+    #endregion
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -80 +81 @@
         valueViewHost.Content = null;
       } else {
+        SetDataTypeTextBoxText();
         actualNameTextBox.Text = Content.ActualName;
         valueViewHost.ViewType = null;
@@ -105 +107 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        clearValueButton.Enabled = Content.Value != null && !ReadOnly;
+        SetDataTypeTextBoxText();
+        clearValueButton.Enabled = Content != null && Content.Value != null && !ReadOnly;
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value;
+        valueViewHost.Content = Content != null ? Content.Value : null;
       }
     }
@@ -150 +153 @@
       }
     }
+
+    #region Helpers
+    protected void SetDataTypeTextBoxText() {
+      if (Content == null) {
+        dataTypeTextBox.Text = "-";
+      } else {
+        if ((Content.Value != null) && (Content.Value.GetType() != Content.DataType))
+          dataTypeTextBox.Text = Content.DataType.GetPrettyName() + " (" + Content.Value.GetType().GetPrettyName() + ")";
+        else
+          dataTypeTextBox.Text = Content.DataType.GetPrettyName();
+      }
+    }
+    #endregion
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -79 +80 @@
         valueViewHost.Content = null;
       } else {
+        SetDataTypeTextBoxText();
         clearValueButton.Visible = !(Content is ValueParameter<T>);
         valueViewHost.ViewType = null;
@@ -96 +98 @@
         Invoke(new EventHandler(Content_ValueChanged), sender, e);
       else {
-        clearValueButton.Enabled = Content.Value != null && !ReadOnly;
+        SetDataTypeTextBoxText();
+        clearValueButton.Enabled = Content != null && Content.Value != null && !ReadOnly;
         valueViewHost.ViewType = null;
-        valueViewHost.Content = Content.Value;
+        valueViewHost.Content = Content != null ? Content.Value : null;
       }
     }
@@ -138 +141 @@
       }
     }
+
+    #region Helpers
+    protected void SetDataTypeTextBoxText() {
+      if (Content == null) {
+        dataTypeTextBox.Text = "-";
+      } else {
+        if ((Content.Value != null) && (Content.Value.GetType() != Content.DataType))
+          dataTypeTextBox.Text = Content.DataType.GetPrettyName() + " (" + Content.Value.GetType().GetPrettyName() + ")";
+        else
+          dataTypeTextBox.Text = Content.DataType.GetPrettyName();
+      }
+    }
+    #endregion
   }
 }