Changeset 3337 for trunk

Timestamp:

04/13/10 19:15:19 (15 years ago)

Author:

mkommend

Message:

fixed bug in StringConvertibleMatrixView (ticket #968)

File:

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

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

@@ -105 +105 @@
       virtualRowIndizes = Enumerable.Range(0, Content.Rows).ToArray();
       //DataGridViews with Rows but no columns are not allowed !
-      if (Content.Rows == 0 && dataGridView.RowCount != Content.Rows)
+      if (Content.Rows == 0 && dataGridView.RowCount != Content.Rows && !Content.ReadOnlyView)
         Content.Rows = dataGridView.RowCount;
       else
         dataGridView.RowCount = Content.Rows;
-      if (Content.Columns == 0 && dataGridView.ColumnCount != Content.Columns)
+      if (Content.Columns == 0 && dataGridView.ColumnCount != Content.Columns && !Content.ReadOnlyView)
         Content.Columns = dataGridView.ColumnCount;
       else
@@ -245 +245 @@
     }
     private void dataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
-      int rowIndex = virtualRowIndizes[e.RowIndex];
-      if (e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns)
+      if (e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns) {
+        int rowIndex = virtualRowIndizes[e.RowIndex];
         e.Value = Content.GetValue(rowIndex, e.ColumnIndex);
+      }
     }
     private void dataGridView_Scroll(object sender, ScrollEventArgs e) {