Changeset 12158

Timestamp:

03/09/15 10:28:35 (10 years ago)

Author:

ehopf

Message:

#2335 Added a possibility to delete columns in the DataGrid view of the data preprocessing.

Location:

branches/DataPreprocessingImprovements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IDataGridContent.cs (modified) (1 diff)

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs ¶

@@ -438 +438 @@
       if (Content == null) return;
       if (e.Button == System.Windows.Forms.MouseButtons.Right) {
+        if (e.ColumnIndex != -1 && e.RowIndex == -1) {
+          dataGridView.Focus();
+          dataGridView.ClearSelection();
+          for (int r = 0; r < dataGridView.RowCount; r++) {
+            dataGridView[e.ColumnIndex, r].Selected = true;
+          }
+          return;
+        }
         if (e.ColumnIndex == -1 || e.RowIndex == -1) {
           replaceValueOverColumnToolStripMenuItem.Visible = false;
@@ -474 +482 @@
     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) {
+            rows.Add(selectedRows[i].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();
+        }
       }
     }

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs ¶

@@ -114 +114 @@
     }
 
-    public void DeleteRow(IEnumerable<int> rows) {
+    public void DeleteRows(IEnumerable<int> rows) {
       PreProcessingData.DeleteRowsWithIndices(rows);
       createRowNames();
+    }
+
+    public void DeleteColumn(int column) {
+      PreProcessingData.DeleteColumn(column);
     }
 

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4/Interfaces/IDataGridContent.cs ¶

@@ -31 +31 @@
     IDictionary<int, IList<int>> Selection { get; set; }
 
-    void DeleteRow(IEnumerable<int> rows);
+    void DeleteRows(IEnumerable<int> rows);
+    void DeleteColumn(int column);
     bool Validate(string value, out string errorMessage, int columnIndex);