Changeset 4798 for trunk

Timestamp:

11/15/10 15:26:51 (14 years ago)

Author:

mkommend

Message:

Fixed updating of StringConvertibleMatrixView if the number of columns gets changed (ticket #1266).

File:

• trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (3 diffs)

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

@@ -134 +134 @@
       else
         dataGridView.ColumnCount = Content.Columns;
+
       ClearSorting();
 
@@ -145 +146 @@
 
     protected void UpdateColumnHeaders() {
-      HashSet<string> visibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>()
-          .Where(c => c.Visible && !string.IsNullOrEmpty(c.HeaderText)).Select(c => c.HeaderText));
-      if (!visibleColumnNames.Intersect(Content.ColumnNames).Any())
-        visibleColumnNames.Clear();
+      HashSet<string> invisibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>()
+      .Where(c => !c.Visible && !string.IsNullOrEmpty(c.HeaderText)).Select(c => c.HeaderText));
 
       for (int i = 0; i < dataGridView.ColumnCount; i++) {
@@ -155 +154 @@
         else
           dataGridView.Columns[i].HeaderText = "Column " + (i + 1);
-      }
-
-      foreach (DataGridViewColumn column in dataGridView.Columns)
-        column.Visible = visibleColumnNames.Contains(column.HeaderText) || visibleColumnNames.Count == 0;
+        dataGridView.Columns[i].Visible = !invisibleColumnNames.Contains(dataGridView.Columns[i].HeaderText);
+      }
     }
     protected void UpdateRowHeaders() {