Changeset 3718

Timestamp:

05/08/10 14:09:22 (15 years ago)

Author:

mkommend

Message:

forgot to commit RunCollectionViews (ticket #970)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• RunCollectionComparisonConstraintView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectioComparisonConstraintView.Designer.cs)
• RunCollectionComparisonConstraintView.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectioComparisonConstraintView.cs) (1 diff)
• RunCollectionConstraintView.cs (modified) (2 diffs)

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

@@ -100 +100 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
-    <Compile Include="RunCollectioComparisonConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RunCollectioComparisonConstraintView.Designer.cs">
-      <DependentUpon>RunCollectioComparisonConstraintView.cs</DependentUpon>
+    <Compile Include="RunCollectionComparisonConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionComparisonConstraintView.Designer.cs">
+      <DependentUpon>RunCollectionComparisonConstraintView.cs</DependentUpon>
     </Compile>
     <Compile Include="RunCollectionTypeCompatibilityConstraintView.cs">

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs

@@ -52 +52 @@
           }
         }
-        if (Content.ConstraintColumn >= 0) {
-          this.cmbConstraintColumn.SelectedItem = (matrix.ColumnNames.ElementAt(Content.ConstraintColumn));
+         if (!string.IsNullOrEmpty(Content.ConstraintColumn)) {
+          this.cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
           if (Content.ConstraintData != null)
             txtConstraintData.Text = Content.ConstraintData.GetValue();

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs

@@ -46 +46 @@
       if (Content.ConstrainedValue != null) {
         this.cmbConstraintColumn.Items.AddRange(((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ToArray());
-        if (Content.ConstraintColumn >= 0)
-          this.cmbConstraintColumn.SelectedItem = ((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ElementAt(Content.ConstraintColumn);
+        if (!string.IsNullOrEmpty(Content.ConstraintColumn))
+          this.cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
       }
     }
@@ -87 +87 @@
     protected virtual void Content_ConstraintColumnChanged(object sender, EventArgs e) {
       if (Content.ConstrainedValue != null) {
-        string columnName = ((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ElementAt(Content.ConstraintColumn);
-        if (cmbConstraintColumn.SelectedItem.ToString() != columnName)
-          cmbConstraintColumn.SelectedItem = columnName;
+        if (cmbConstraintColumn.SelectedItem.ToString() != Content.ConstraintColumn)
+          cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
       }
     }
     private void cmbConstraintColumn_SelectedIndexChanged(object sender, EventArgs e) {
       if (Content.ConstrainedValue != null) {
-        Content.ConstraintColumn = ((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ToList().IndexOf(cmbConstraintColumn.SelectedItem.ToString());
+        Content.ConstraintColumn = (string) cmbConstraintColumn.SelectedItem;
       }
     }