Changeset 3718


Ignore:
Timestamp:
05/08/10 14:09:22 (12 years ago)
Author:
mkommend
Message:

forgot to commit RunCollectionViews (ticket #970)

Location:
trunk/sources/HeuristicLab.Optimization.Views/3.3
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r3702 r3718  
    100100      <DependentUpon>BatchRunView.cs</DependentUpon>
    101101    </Compile>
    102     <Compile Include="RunCollectioComparisonConstraintView.cs">
    103       <SubType>UserControl</SubType>
    104     </Compile>
    105     <Compile Include="RunCollectioComparisonConstraintView.Designer.cs">
    106       <DependentUpon>RunCollectioComparisonConstraintView.cs</DependentUpon>
     102    <Compile Include="RunCollectionComparisonConstraintView.cs">
     103      <SubType>UserControl</SubType>
     104    </Compile>
     105    <Compile Include="RunCollectionComparisonConstraintView.Designer.cs">
     106      <DependentUpon>RunCollectionComparisonConstraintView.cs</DependentUpon>
    107107    </Compile>
    108108    <Compile Include="RunCollectionTypeCompatibilityConstraintView.cs">
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs

    r3713 r3718  
    5252          }
    5353        }
    54         if (Content.ConstraintColumn >= 0) {
    55           this.cmbConstraintColumn.SelectedItem = (matrix.ColumnNames.ElementAt(Content.ConstraintColumn));
     54         if (!string.IsNullOrEmpty(Content.ConstraintColumn)) {
     55          this.cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
    5656          if (Content.ConstraintData != null)
    5757            txtConstraintData.Text = Content.ConstraintData.GetValue();
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs

    r3614 r3718  
    4646      if (Content.ConstrainedValue != null) {
    4747        this.cmbConstraintColumn.Items.AddRange(((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ToArray());
    48         if (Content.ConstraintColumn >= 0)
    49           this.cmbConstraintColumn.SelectedItem = ((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ElementAt(Content.ConstraintColumn);
     48        if (!string.IsNullOrEmpty(Content.ConstraintColumn))
     49          this.cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
    5050      }
    5151    }
     
    8787    protected virtual void Content_ConstraintColumnChanged(object sender, EventArgs e) {
    8888      if (Content.ConstrainedValue != null) {
    89         string columnName = ((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ElementAt(Content.ConstraintColumn);
    90         if (cmbConstraintColumn.SelectedItem.ToString() != columnName)
    91           cmbConstraintColumn.SelectedItem = columnName;
     89        if (cmbConstraintColumn.SelectedItem.ToString() != Content.ConstraintColumn)
     90          cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
    9291      }
    9392    }
    9493    private void cmbConstraintColumn_SelectedIndexChanged(object sender, EventArgs e) {
    9594      if (Content.ConstrainedValue != null) {
    96         Content.ConstraintColumn = ((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ToList().IndexOf(cmbConstraintColumn.SelectedItem.ToString());
     95        Content.ConstraintColumn = (string) cmbConstraintColumn.SelectedItem;
    9796      }
    9897    }
Note: See TracChangeset for help on using the changeset viewer.