Changeset 12689 for branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

Timestamp:

07/08/15 15:32:12 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (5 diffs)

branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -61 +61 @@
       dataGridView.KeyDown += dataGridView_KeyDown;
       dataGridView.MouseUp += dataGridView_MouseUp;
-      dataGridView.ColumnHeaderMouseClick += dataGridView_ColumnHeaderMouseClick;
       contextMenuCell.Items.Add(ShowHideColumns);
       _highlightedCellsBackground = new Dictionary<int, IList<int>>();
@@ -127 +126 @@
 
       string errorMessage;
-      if (Content != null) {
+      if (!String.IsNullOrEmpty(e.FormattedValue.ToString())) {
         if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered) {
           errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode.";
@@ -164 +163 @@
     }
 
-    private void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
+    protected override void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
+      if (Content != null) {
+        if (e.Button == System.Windows.Forms.MouseButtons.Left) {
+          dataGridView.Focus();
+          dataGridView.ClearSelection();
+          dataGridView.SelectionChanged -= dataGridView_SelectionChanged;
+          for (int i = 0; i < dataGridView.RowCount; i++) {
+            if (i + 1 == dataGridView.RowCount)
+              dataGridView.SelectionChanged += dataGridView_SelectionChanged;
+            dataGridView[e.ColumnIndex, i].Selected = true;
+          }
+        } else if (Content.SortableView) {
+          SortColumn(e.ColumnIndex);
+        }
+      }
       searchIterator = null;
     }
@@ -437 +450 @@
     private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
       if (Content == null) return;
-      if (e.Button == System.Windows.Forms.MouseButtons.Right) {
+      if (e.Button == System.Windows.Forms.MouseButtons.Right && !(e.ColumnIndex != -1 && e.RowIndex == -1)) {
         if (e.ColumnIndex == -1 || e.RowIndex == -1) {
           replaceValueOverColumnToolStripMenuItem.Visible = false;
@@ -474 +487 @@
     private void dataGridView_KeyDown(object sender, KeyEventArgs e) {
       var selectedRows = dataGridView.SelectedRows;
-      if (e.KeyCode == Keys.Delete && selectedRows.Count > 0) {
-        List<int> rows = new List<int>();
-        for (int i = 0; i < selectedRows.Count; ++i) {
-          rows.Add(selectedRows[i].Index);
-        }
-        Content.DeleteRow(rows);
-      } else if (e.Control && e.KeyCode == Keys.F) {
-        CreateFindAndReplaceDialog();
-        findAndReplaceDialog.ActivateSearch();
-      } else if (e.Control && e.KeyCode == Keys.R) {
-        CreateFindAndReplaceDialog();
-        findAndReplaceDialog.ActivateReplace();
+      var selectedCells = dataGridView.SelectedCells;
+      if (!Content.FilterLogic.IsFiltered) { //data is in read only mode....
+        if (e.KeyCode == Keys.Delete && selectedCells.Count == Content.Rows && selectedCells.Count > 0) {
+          Content.DeleteColumn(selectedCells[0].ColumnIndex);
+        } else if (e.KeyCode == Keys.Delete && selectedRows.Count > 0) {
+          List<int> rows = new List<int>();
+          for (int i = 0; i < selectedRows.Count; ++i) {
+            int index = (sortedColumnIndices.Count != 0) ? (Convert.ToInt32(selectedRows[i].HeaderCell.Value) - 1) :
+              selectedRows[i].Index;
+            rows.Add(index);
+          }
+          Content.DeleteRows(rows);
+        } else if (e.Control && e.KeyCode == Keys.F) {
+          CreateFindAndReplaceDialog();
+          findAndReplaceDialog.ActivateSearch();
+        } else if (e.Control && e.KeyCode == Keys.R) {
+          CreateFindAndReplaceDialog();
+          findAndReplaceDialog.ActivateReplace();
+        }
       }
     }