Changeset 9306 for branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

Timestamp:

03/11/13 16:47:11 (11 years ago)

Author:

sforsten

Message:

#2018:

• renamed the structs and methods in IStringConvertibleMatrix
• added MatrixValuesChangedEventArgs in IStringConvertibleMatrix
• added methods SetValues(MatrixValues<T>) in ValueTypeMatrix
• fixed bugs in StringConvertibleMatrixView: DataGridView has now at least one column and dataGridView_CellValidating does not set e.Cancel to true anymore.

File:

• branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (7 diffs)

branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -87 +87 @@
 
     protected override void DeregisterContentEvents() {
-      Content.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged);
+      Content.ItemsChanged -= new EventHandler<MatrixValuesChangedEventArgs>(Content_ItemChanged);
       Content.Reset -= new EventHandler(Content_Reset);
       Content.ColumnNamesChanged -= new EventHandler(Content_ColumnNamesChanged);
@@ -95 +95 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged);
+      Content.ItemsChanged += new EventHandler<MatrixValuesChangedEventArgs>(Content_ItemChanged);
       Content.Reset += new EventHandler(Content_Reset);
       Content.ColumnNamesChanged += new EventHandler(Content_ColumnNamesChanged);
@@ -130 +130 @@
       virtualRowIndices = Enumerable.Range(0, Content.Rows).ToArray();
 
-      if (Content.Columns == 0 && dataGridView.ColumnCount != Content.Columns && !Content.ReadOnly)
-        Content.Columns = dataGridView.ColumnCount;
-      else {
+      //dataGridView.RowCount = 0;
+
+      if (Content.Columns == 0) {
+        Content.Columns = 1;
+      } else {
         DataGridViewColumn[] columns = new DataGridViewColumn[Content.Columns];
         for (int i = 0; i < columns.Length; ++i) {
@@ -143 +145 @@
       }
 
-      //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;
-
+      dataGridView.RowCount = Content.Rows;
 
       ClearSorting();
@@ -200 +197 @@
         UpdateColumnHeaders();
     }
-    private void Content_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
+    private void Content_ItemChanged(object sender, MatrixValuesChangedEventArgs e) {
       if (InvokeRequired)
-        Invoke(new EventHandler<EventArgs<IEnumerable<Position>>>(Content_ItemChanged), sender, e);
+        Invoke(new EventHandler<MatrixValuesChangedEventArgs>(Content_ItemChanged), sender, e);
       else {
         foreach (var pos in e.Value) {
@@ -268 +265 @@
         string errorMessage;
         if (Content != null && !Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
-          e.Cancel = true;
+          //e.Cancel = true;
           dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
         }
@@ -376 +373 @@
       if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex;
 
-      List<RowColumnValue> setValues = new List<RowColumnValue>(values.GetLength(0) * values.GetLength(1));
+      List<MatrixValue<string>> setValues = new List<MatrixValue<string>>(values.GetLength(0) * values.GetLength(1));
       for (int row = 0; row < values.GetLength(1); row++) {
         for (int col = 0; col < values.GetLength(0); col++) {
-          setValues.Add(new RowColumnValue(new Position(row + rowIndex, col + columnIndex), values[col, row]));
-          //Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
-        }
-      }
-      Content.SetValue(setValues);
+          setValues.Add(new MatrixValue<string>(new MatrixPosition(row + rowIndex, col + columnIndex), values[col, row]));
+        }
+      }
+      Content.SetValues(setValues);
       ClearSorting();
     }