Changeset 9379


Ignore:
Timestamp:
04/18/13 16:03:44 (7 years ago)
Author:
ascheibe
Message:

#2035

  • moved EnhancedStringConvertibleMatrixView to Data.Views
  • fixed a bug that occurred when no row visibility was set which resulted in empty row headers and an exception when changing the row visibility
Location:
trunk/sources
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.Designer.cs

    r9378 r9379  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.DataAnalysis.Views {
     22namespace HeuristicLab.Data.Views {
    2323  partial class EnhancedStringConvertibleMatrixView {
    2424    /// <summary>
  • trunk/sources/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs

    r9378 r9379  
    2626using System.Windows.Forms;
    2727using HeuristicLab.Common;
    28 using HeuristicLab.Data;
    29 using HeuristicLab.Data.Views;
    3028
    31 namespace HeuristicLab.Problems.DataAnalysis.Views {
     29namespace HeuristicLab.Data.Views {
    3230  public partial class EnhancedStringConvertibleMatrixView : StringConvertibleMatrixView {
    3331    private bool[] columnVisibility, rowVisibility;
     
    7270    }
    7371    protected override void UpdateRowHeaders() {
    74       if (rowVisibility == null) return;
    7572      if (Content == null) return;
    76       if (rowVisibility.Count() != dataGridView.RowCount) return;
     73      if (rowVisibility != null && rowVisibility.Count() != dataGridView.RowCount) return;
    7774
    7875      for (int index = 0; index < dataGridView.RowCount; index++) {
    7976        dataGridView.Rows[index].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndices[index]);
    80         dataGridView.Rows[index].Visible = rowVisibility.ElementAt(virtualRowIndices[index]);
     77
     78        if (rowVisibility != null) {
     79          dataGridView.Rows[index].Visible = rowVisibility.ElementAt(virtualRowIndices[index]);
     80        } else {
     81          dataGridView.Rows[index].Visible = true;
     82        }
    8183      }
    8284    }
  • trunk/sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r8833 r9379  
    121121      <DependentUpon>DoubleRangeView.cs</DependentUpon>
    122122    </Compile>
     123    <Compile Include="EnhancedStringConvertibleMatrixView.cs">
     124      <SubType>UserControl</SubType>
     125    </Compile>
     126    <Compile Include="EnhancedStringConvertibleMatrixView.Designer.cs">
     127      <DependentUpon>EnhancedStringConvertibleMatrixView.cs</DependentUpon>
     128    </Compile>
    123129    <Compile Include="IntRangeView.cs">
    124130      <SubType>UserControl</SubType>
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.Designer.cs

    r8881 r9379  
    6060      this.progressPanel = new System.Windows.Forms.Panel();
    6161      this.progressLabel = new System.Windows.Forms.Label();
    62       this.dataView = new HeuristicLab.Problems.DataAnalysis.Views.EnhancedStringConvertibleMatrixView();
     62      this.dataView = new HeuristicLab.Data.Views.EnhancedStringConvertibleMatrixView();
    6363      ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
    6464      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
     
    240240    protected System.Windows.Forms.Panel progressPanel;
    241241    protected System.Windows.Forms.Label progressLabel;
    242     protected HeuristicLab.Problems.DataAnalysis.Views.EnhancedStringConvertibleMatrixView dataView;
     242    protected HeuristicLab.Data.Views.EnhancedStringConvertibleMatrixView dataView;
    243243
    244244  }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r9288 r9379  
    161161    <Compile Include="DataAnalysisSolutionEvaluationView.Designer.cs">
    162162      <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
    163     </Compile>
    164     <Compile Include="FeatureCorrelation\EnhancedStringConvertibleMatrixView.cs">
    165       <SubType>UserControl</SubType>
    166     </Compile>
    167     <Compile Include="FeatureCorrelation\EnhancedStringConvertibleMatrixView.Designer.cs">
    168       <DependentUpon>EnhancedStringConvertibleMatrixView.cs</DependentUpon>
    169163    </Compile>
    170164    <Compile Include="FeatureCorrelation\FeatureCorrelationCalculator.cs" />
Note: See TracChangeset for help on using the changeset viewer.