Changeset 15237 for stable

Timestamp:

07/13/17 17:43:46 (7 years ago)

Author:

mkommend

Message:

#2540: Merged r15074 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (3 diffs)

stable/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -131 +131 @@
       virtualRowIndices = Enumerable.Range(0, Content.Rows).ToArray();
 
-      if (Content.Columns == 0 && dataGridView.ColumnCount != Content.Columns && !Content.ReadOnly)
-        Content.Columns = dataGridView.ColumnCount;
-      else {
-        DataGridViewColumn[] columns = new DataGridViewColumn[Content.Columns];
-        for (int i = 0; i < columns.Length; ++i) {
-          var column = new DataGridViewTextBoxColumn();
-          column.SortMode = DataGridViewColumnSortMode.Programmatic;
-          column.FillWeight = 1;
-          columns[i] = column;
-        }
-        dataGridView.Columns.Clear();
+
+      dataGridView.RowCount = 0;
+
+      DataGridViewColumn[] columns = new DataGridViewColumn[Content.Columns];
+      for (int i = 0; i < columns.Length; ++i) {
+        var column = new DataGridViewTextBoxColumn();
+        column.SortMode = DataGridViewColumnSortMode.Programmatic;
+        column.FillWeight = 1;
+        columns[i] = column;
+      }
+      dataGridView.Columns.Clear();
+
+      if (Content.Columns != 0) {
         dataGridView.Columns.AddRange(columns);
-      }
-
-      //DataGridViews with rows but no columns are not allowed !
-      if (Content.Rows == 0 && dataGridView.RowCount != Content.Rows && !Content.ReadOnly)
-        Content.Rows = dataGridView.RowCount;
-      else
         dataGridView.RowCount = Content.Rows;
-
+      }
 
       ClearSorting();
@@ -263 +259 @@
 
     #region DataGridView Events
+
     protected virtual void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
-      if (!dataGridView.ReadOnly) {
-        string errorMessage;
-        if (Content != null && !Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
-          e.Cancel = true;
-          dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
-        }
-      }
-    }
+      if (dataGridView.ReadOnly) return;
+      if (Content == null) return;
+      if (Content.Rows <= e.RowIndex || Content.Columns <= e.ColumnIndex) return;
+
+      string errorMessage;
+      if (!Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
+        e.Cancel = true;
+        dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
+      }
+    }
+
     protected virtual void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
       if (!dataGridView.ReadOnly) {
@@ -441 +441 @@
       } else
         if (newSortOrder != SortOrder.None)
-          sortedColumnIndices.Add(new KeyValuePair<int, SortOrder>(columnIndex, newSortOrder));
+        sortedColumnIndices.Add(new KeyValuePair<int, SortOrder>(columnIndex, newSortOrder));
       Sort();
     }