Changeset 9379 for trunk/sources

Timestamp:

04/18/13 16:03:44 (12 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:

• HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/EnhancedStringConvertibleMatrixView.Designer.cs) (1 diff)
• HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/EnhancedStringConvertibleMatrixView.cs) (2 diffs)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.DataAnalysis.Views {
+namespace HeuristicLab.Data.Views {
   partial class EnhancedStringConvertibleMatrixView {
     /// <summary> 

trunk/sources/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs

@@ -26 +26 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Data;
-using HeuristicLab.Data.Views;
 
-namespace HeuristicLab.Problems.DataAnalysis.Views {
+namespace HeuristicLab.Data.Views {
   public partial class EnhancedStringConvertibleMatrixView : StringConvertibleMatrixView {
     private bool[] columnVisibility, rowVisibility;
@@ -72 +70 @@
     }
     protected override void UpdateRowHeaders() {
-      if (rowVisibility == null) return;
       if (Content == null) return;
-      if (rowVisibility.Count() != dataGridView.RowCount) return;
+      if (rowVisibility != null && rowVisibility.Count() != dataGridView.RowCount) return;
 
       for (int index = 0; index < dataGridView.RowCount; index++) {
         dataGridView.Rows[index].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndices[index]);
-        dataGridView.Rows[index].Visible = rowVisibility.ElementAt(virtualRowIndices[index]);
+
+        if (rowVisibility != null) {
+          dataGridView.Rows[index].Visible = rowVisibility.ElementAt(virtualRowIndices[index]);
+        } else {
+          dataGridView.Rows[index].Visible = true;
+        }
       }
     }

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

@@ -121 +121 @@
       <DependentUpon>DoubleRangeView.cs</DependentUpon>
     </Compile>
+    <Compile Include="EnhancedStringConvertibleMatrixView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EnhancedStringConvertibleMatrixView.Designer.cs">
+      <DependentUpon>EnhancedStringConvertibleMatrixView.cs</DependentUpon>
+    </Compile>
     <Compile Include="IntRangeView.cs">
       <SubType>UserControl</SubType>

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.Designer.cs

@@ -60 +60 @@
       this.progressPanel = new System.Windows.Forms.Panel();
       this.progressLabel = new System.Windows.Forms.Label();
-      this.dataView = new HeuristicLab.Problems.DataAnalysis.Views.EnhancedStringConvertibleMatrixView();
+      this.dataView = new HeuristicLab.Data.Views.EnhancedStringConvertibleMatrixView();
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -240 +240 @@
     protected System.Windows.Forms.Panel progressPanel;
     protected System.Windows.Forms.Label progressLabel;
-    protected HeuristicLab.Problems.DataAnalysis.Views.EnhancedStringConvertibleMatrixView dataView;
+    protected HeuristicLab.Data.Views.EnhancedStringConvertibleMatrixView dataView;
 
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -161 +161 @@
     <Compile Include="DataAnalysisSolutionEvaluationView.Designer.cs">
       <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FeatureCorrelation\EnhancedStringConvertibleMatrixView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="FeatureCorrelation\EnhancedStringConvertibleMatrixView.Designer.cs">
-      <DependentUpon>EnhancedStringConvertibleMatrixView.cs</DependentUpon>
     </Compile>
     <Compile Include="FeatureCorrelation\FeatureCorrelationCalculator.cs" />