Changeset 3604 for trunk

Timestamp:

05/04/10 14:20:10 (15 years ago)

Author:

mkommend

Message:

added ConstraintCollectionView (ticket #996)

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• ConstraintCollectionView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.Designer.cs) (1 diff)
• ConstraintCollectionView.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs) (1 diff)
• HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/ConstraintCollectionView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.Core.Views {
-  partial class ParameterCollectionView {
+  partial class ConstraintCollectionView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Core.Views/3.3/ConstraintCollectionView.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Core.Views {
-  [View("ParameterCollection View")]
-  [Content(typeof(ParameterCollection), true)]
-  [Content(typeof(IKeyedItemCollection<string, IParameter>), false)]
-  public partial class ParameterCollectionView : NamedItemCollectionView<IParameter> {
+  [View("ConstraintCollection View")]
+  [Content(typeof(ConstraintCollection), true)]
+  [Content(typeof(IItemCollection<IConstraint>), false)]
+  public partial class ConstraintCollectionView : ItemCollectionView<IConstraint> {
     protected CreateParameterDialog createParameterDialog;
     /// <summary>
     /// Initializes a new instance of <see cref="VariablesScopeView"/> with caption "Variables Scope View".
     /// </summary>
-    public ParameterCollectionView() {
+    public ConstraintCollectionView() {
       InitializeComponent();
-      Caption = "ParameterCollection";
-      itemsGroupBox.Text = "Parameters";
+      Caption = "ConstraintCollection";
+      itemsGroupBox.Text = "Constraints";
     }
 
-    protected override IParameter CreateItem() {
-      if (createParameterDialog == null) createParameterDialog = new CreateParameterDialog();
+    protected override IConstraint CreateItem() {
+      if (typeSelectorDialog == null) {
+        typeSelectorDialog = new TypeSelectorDialog();
+        typeSelectorDialog.Caption = "Select Operator";
+        typeSelectorDialog.TypeSelector.Caption = "Available Operators";
+        typeSelectorDialog.TypeSelector.Configure(typeof(IConstraint), false, true);
+      }
 
-      if (createParameterDialog.ShowDialog(this) == DialogResult.OK) {
-        IParameter param = createParameterDialog.Parameter;
-        if ((param != null) && Content.ContainsKey(param.Name))
-          param = (IParameter)Activator.CreateInstance(param.GetType(), GetUniqueName(param.Name), param.Description);
-        return param;
+      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
+        try {
+          return (IConstraint)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
+        }
+        catch (Exception ex) {
+          Auxiliary.ShowErrorMessageBox(ex);
+        }
       }
       return null;

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

@@ -105 +105 @@
       <DependentUpon>CheckedItemListView.cs</DependentUpon>
     </Compile>
+    <Compile Include="ConstraintCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ConstraintCollectionView.Designer.cs">
+      <DependentUpon>ConstraintCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="LogView.cs">
       <SubType>UserControl</SubType>