Changeset 4199

Timestamp:

08/11/10 17:36:21 (14 years ago)

Author:

mkommend

Message:

corrected StringConvertibleMatrixView (ticket #1134)

File:

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

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

@@ -34 +34 @@
   [Content(typeof(IStringConvertibleMatrix), true)]
   public partial class StringConvertibleMatrixView : AsynchronousContentView {
-    protected int[] virtualRowIndizes;
+    private int[] virtualRowIndizes;
     private List<KeyValuePair<int, SortOrder>> sortedColumnIndizes;
     private RowComparer rowComparer;
@@ -114 +114 @@
         dataGridView.ColumnCount = Content.Columns;
 
+      UpdateColumnHeaders();
       UpdateRowHeaders();
-      UpdateColumnHeaders();
+      dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
+      dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
       dataGridView.Enabled = true;
-      dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
-    }
-
-    private void UpdateColumnHeaders() {
+    }
+
+    protected void UpdateColumnHeaders() {
       for (int i = 0; i < dataGridView.ColumnCount; i++) {
         if (Content.ColumnNames.Count() != 0)
@@ -127 +128 @@
           dataGridView.Columns[i].HeaderText = "Column " + (i + 1);
       }
-      dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.ColumnHeader);
-    }
-
-    private void UpdateRowHeaders() {
-      int firstDisplayedRowIndex = dataGridView.FirstDisplayedScrollingRowIndex;
-      if (firstDisplayedRowIndex == -1)
-        firstDisplayedRowIndex = 0;
-      int lastDisplaydRowIndex = firstDisplayedRowIndex + dataGridView.DisplayedRowCount(true);
-
-      for (int i = firstDisplayedRowIndex; i < lastDisplaydRowIndex; i++) {
+    }
+    protected void UpdateRowHeaders() {
+      int index = dataGridView.FirstDisplayedScrollingRowIndex;
+      if (index == -1) index = 0;
+      int updatedRows = 0;
+      int count = dataGridView.DisplayedRowCount(true);
+
+      while (updatedRows < count) {
         if (Content.RowNames.Count() != 0)
-          dataGridView.Rows[i].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndizes[i]);
+          dataGridView.Rows[index].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndizes[index]);
         else
-          dataGridView.Rows[i].HeaderCell.Value = "Row " + (i + 1);
+          dataGridView.Rows[index].HeaderCell.Value = "Row " + (index + 1);
+        if (dataGridView.Rows[index].Visible)
+          updatedRows++;
+        index++;
       }
     }