Changeset 4707

Timestamp:

11/02/10 13:38:43 (14 years ago)

Author:

mkommend

Message:

Fixed StringConvertibleMatrix and RunCollectionTabularView to handle filter columns correctly (ticket #1251).

Location:

trunk/sources

Files:

• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (2 diffs)

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

@@ -116 +116 @@
       columnsTextBox.Text = Content.Columns.ToString();
       columnsTextBox.Enabled = true;
+
       //DataGridViews with rows but no columns are not allowed !
       if (Content.Rows == 0 && dataGridView.RowCount != Content.Rows && !Content.ReadOnly)
@@ -129 +130 @@
       UpdateColumnHeaders();
       UpdateRowHeaders();
+
       dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
       dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
@@ -135 +137 @@
 
     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));
+
       for (int i = 0; i < dataGridView.ColumnCount; i++) {
-        if (Content.ColumnNames.Count() != 0)
+        if (i < Content.ColumnNames.Count())
           dataGridView.Columns[i].HeaderText = Content.ColumnNames.ElementAt(i);
         else
           dataGridView.Columns[i].HeaderText = "Column " + (i + 1);
       }
+
+      foreach (DataGridViewColumn column in dataGridView.Columns)
+        column.Visible = visibleColumnNames.Contains(column.HeaderText) || visibleColumnNames.Count == 0;
     }
     protected void UpdateRowHeaders() {
@@ -149 +157 @@
 
       while (updatedRows < count) {
-        if (Content.RowNames.Count() != 0)
+        if (virtualRowIndizes[index] < Content.RowNames.Count())
           dataGridView.Rows[index].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndizes[index]);
         else

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -88 +88 @@
           columnNamesChanged |= AddResult(result.Key, result.Value);
       }
-      if (columnNamesChanged) {
-        columnNameCache = null;
-        OnColumnNamesChanged();
-      }
+      if (columnNamesChanged) columnNameCache = null;
       rowNamesCache = null;
       base.OnItemsAdded(items);
+      OnReset();
       OnRowNamesChanged();
-      OnReset();
+      if (columnNamesChanged) OnColumnNamesChanged();
       UpdateFiltering(false);
     }
@@ -106 +104 @@
           columnNamesChanged |= RemoveResultName(resultName);
       }
-      if (columnNamesChanged) {
-        columnNameCache = null;
-        OnColumnNamesChanged();
-      }
+      if (columnNamesChanged) columnNameCache = null;
       rowNamesCache = null;
       base.OnItemsRemoved(items);
+      OnReset();
       OnRowNamesChanged();
-      OnReset();
+      if (columnNamesChanged) OnColumnNamesChanged();
     }