- Timestamp:
- 03/11/13 16:47:11 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs
r9286 r9306 87 87 88 88 protected override void DeregisterContentEvents() { 89 Content.ItemsChanged -= new EventHandler< EventArgs<IEnumerable<Position>>>(Content_ItemChanged);89 Content.ItemsChanged -= new EventHandler<MatrixValuesChangedEventArgs>(Content_ItemChanged); 90 90 Content.Reset -= new EventHandler(Content_Reset); 91 91 Content.ColumnNamesChanged -= new EventHandler(Content_ColumnNamesChanged); … … 95 95 protected override void RegisterContentEvents() { 96 96 base.RegisterContentEvents(); 97 Content.ItemsChanged += new EventHandler< EventArgs<IEnumerable<Position>>>(Content_ItemChanged);97 Content.ItemsChanged += new EventHandler<MatrixValuesChangedEventArgs>(Content_ItemChanged); 98 98 Content.Reset += new EventHandler(Content_Reset); 99 99 Content.ColumnNamesChanged += new EventHandler(Content_ColumnNamesChanged); … … 130 130 virtualRowIndices = Enumerable.Range(0, Content.Rows).ToArray(); 131 131 132 if (Content.Columns == 0 && dataGridView.ColumnCount != Content.Columns && !Content.ReadOnly) 133 Content.Columns = dataGridView.ColumnCount; 134 else { 132 //dataGridView.RowCount = 0; 133 134 if (Content.Columns == 0) { 135 Content.Columns = 1; 136 } else { 135 137 DataGridViewColumn[] columns = new DataGridViewColumn[Content.Columns]; 136 138 for (int i = 0; i < columns.Length; ++i) { … … 143 145 } 144 146 145 //DataGridViews with rows but no columns are not allowed ! 146 if (Content.Rows == 0 && dataGridView.RowCount != Content.Rows && !Content.ReadOnly) 147 Content.Rows = dataGridView.RowCount; 148 else 149 dataGridView.RowCount = Content.Rows; 150 147 dataGridView.RowCount = Content.Rows; 151 148 152 149 ClearSorting(); … … 200 197 UpdateColumnHeaders(); 201 198 } 202 private void Content_ItemChanged(object sender, EventArgs<IEnumerable<Position>>e) {199 private void Content_ItemChanged(object sender, MatrixValuesChangedEventArgs e) { 203 200 if (InvokeRequired) 204 Invoke(new EventHandler< EventArgs<IEnumerable<Position>>>(Content_ItemChanged), sender, e);201 Invoke(new EventHandler<MatrixValuesChangedEventArgs>(Content_ItemChanged), sender, e); 205 202 else { 206 203 foreach (var pos in e.Value) { … … 268 265 string errorMessage; 269 266 if (Content != null && !Content.Validate(e.FormattedValue.ToString(), out errorMessage)) { 270 e.Cancel = true;267 //e.Cancel = true; 271 268 dataGridView.Rows[e.RowIndex].ErrorText = errorMessage; 272 269 } … … 376 373 if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex; 377 374 378 List< RowColumnValue> setValues = new List<RowColumnValue>(values.GetLength(0) * values.GetLength(1));375 List<MatrixValue<string>> setValues = new List<MatrixValue<string>>(values.GetLength(0) * values.GetLength(1)); 379 376 for (int row = 0; row < values.GetLength(1); row++) { 380 377 for (int col = 0; col < values.GetLength(0); col++) { 381 setValues.Add(new RowColumnValue(new Position(row + rowIndex, col + columnIndex), values[col, row])); 382 //Content.SetValue(values[col, row], row + rowIndex, col + columnIndex); 383 } 384 } 385 Content.SetValue(setValues); 378 setValues.Add(new MatrixValue<string>(new MatrixPosition(row + rowIndex, col + columnIndex), values[col, row])); 379 } 380 } 381 Content.SetValues(setValues); 386 382 ClearSorting(); 387 383 }
Note: See TracChangeset
for help on using the changeset viewer.