Changeset 7652 for branches/HeuristicLab.DataImporter

Timestamp:

03/22/12 11:13:17 (13 years ago)

Author:

mkommend

Message:

#1804: improved responsiveness of DataImporter during scroll operations.

File:

• branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs (modified) (9 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/View/ColumnGroupView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.DataImporter.Data.Command;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Data.Command;
 
 
@@ -58 +56 @@
       this.dataGridView.AllowUserToOrderColumnsChanged += new EventHandler(dataGridView_AllowUserToOrderColumnsChanged);
       this.dataGridView.KeyDown += new KeyEventHandler(dataGridView_KeyDown);
-      this.dataGridView.Scroll += new ScrollEventHandler(dataGridView_Scroll);
-      this.dataGridView.Resize += new EventHandler(dataGridView_Resize);
       this.dataGridView.RowHeadersWidthChanged += new EventHandler(dataGridView_RowHeadersWidthChanged);
       this.dataGridView.CellMouseEnter += new DataGridViewCellEventHandler(dataGridView_CellMouseEnter);
@@ -286 +282 @@
         if (Math.Abs(dataGridView.RowCount - ColumnGroup.RowCount) > 10)
           dataGridView.Rows.Clear();
-        bool rowAdded = false;
-        //new row added - dataGridView has always one row more because of the last empty row for inserting new rows
-        if (dataGridView.RowCount == ColumnGroup.RowCount && dataGridView.RowCount != 0)
-          rowAdded = true;
-
-        dataGridView.RowCount = ColumnGroup.RowCount + (ColumnGroup.Columns.Count() == 0 ? 0 : 1);
+        bool rowAdded = dataGridView.RowCount == ColumnGroup.RowCount && dataGridView.RowCount != 0;
+        dataGridView.RowCount = ColumnGroup.RowCount + (!ColumnGroup.Columns.Any() ? 0 : 1);
 
         if (rowAdded) {
@@ -300 +292 @@
           this.dataGridView.CurrentCell.Selected = true;
         }
-        UpdateRowHeaders();
         this.dataGridView.CellValuePushed += new DataGridViewCellValueEventHandler(dataGridView_CellValuePushed);
       }
 
+      UpdateDataGridViewHeaderCells();
       this.dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
       this.dataGridView.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders);
@@ -313 +305 @@
         dataGridView.FirstDisplayedCell = dataGridView[firstVisibleColIndex, firstVisibleRowIndex];
       }
+
       UpdateSortGlyph();
       this.txtColumnGroupName.Text = this.ColumnGroup.Name + "  " + ColumnGroup.RowCount + " rows";
@@ -318 +311 @@
       this.dataGridView.Invalidate();
       UpdateStateInformation();
+    }
+
+    private void UpdateDataGridViewHeaderCells() {
+      for (int i = 1; i <= columnGroup.RowCount; i++)
+        dataGridView.Rows[i].HeaderCell.Value = i.ToString();
     }
 
@@ -462 +460 @@
       else if (e.Control && e.KeyCode == Keys.C)
         CopyClipboardContent();
-    }
-
-    private void dataGridView_Scroll(object sender, ScrollEventArgs e) {
-      UpdateRowHeaders();
-    }
-
-    private void dataGridView_Resize(object sender, EventArgs e) {
-      UpdateRowHeaders();
-    }
-
-    private void UpdateRowHeaders() {
-      for (int i = dataGridView.FirstDisplayedScrollingRowIndex; i < dataGridView.FirstDisplayedScrollingRowIndex + dataGridView.DisplayedRowCount(true); i++)
-        dataGridView.Rows[i].HeaderCell.Value = i.ToString();
-      dataGridView.Invalidate();
     }
 
@@ -548 +532 @@
 
     #region DataGridView virtual mode event handler
-
     private void dataGridView_CellValueNeeded(object sender, System.Windows.Forms.DataGridViewCellValueEventArgs e) {
-      if (e.ColumnIndex < this.ColumnGroup.Columns.Count())
-        e.Value = ColumnGroup.Columns.ElementAt(e.ColumnIndex).GetValue(e.RowIndex);
+      e.Value = ColumnGroup.Columns.ElementAt(e.ColumnIndex).GetValue(e.RowIndex);
     }
 
@@ -597 +579 @@
       }
     }
-
     #endregion