Changeset 10622

Timestamp:

03/19/14 13:28:28 (11 years ago)

Author:

rstoll

Message:

Delete rows implemented

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridLogic.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Data.Views;
 using HeuristicLab.MainForm;
-using System.Drawing;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -53 +52 @@
       dataGridView.CellMouseClick += dataGridView_CellMouseClick;
       dataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(dataGridView_CellPainting);
+      dataGridView.KeyUp += dataGridView_KeyUp;
       contextMenuCell.Items.Add(ShowHideColumns);
+    }
+
+    void dataGridView_KeyUp(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);
+        }
+        triggersOwnEvent(() => {
+          Content.DataGridLogic.DeleteRow(rows);
+          OnContentChanged();
+        });
+      }
     }
 
@@ -73 +87 @@
     void Content_Changed(object sender, DataPreprocessingChangedEventArgs e) {
       if (notOwnEvent) {
-        dataGridView.Refresh();
+        switch (e.Type) {
+          case DataPreprocessingChangedEventType.AddColumn:
+          case DataPreprocessingChangedEventType.AddRow:
+          case DataPreprocessingChangedEventType.DeleteColumn:
+          case DataPreprocessingChangedEventType.DeleteRow:
+          case DataPreprocessingChangedEventType.Any:
+            OnContentChanged();
+            break;
+          case DataPreprocessingChangedEventType.ChangeColumn:
+          case DataPreprocessingChangedEventType.ChangeItem:
+            dataGridView.Refresh();
+            break;
+        }
+
       }
     }
@@ -183 +210 @@
       var selectedCells = new Dictionary<int, List<int>>();
       for (int i = 0; i < dataGridView.SelectedCells.Count; i++) {
-        var columnIndex=dataGridView.SelectedCells[i].ColumnIndex;
-        if(!selectedCells.ContainsKey(columnIndex)){
-          selectedCells.Add(columnIndex,new List<int>());
+        var columnIndex = dataGridView.SelectedCells[i].ColumnIndex;
+        if (!selectedCells.ContainsKey(columnIndex)) {
+          selectedCells.Add(columnIndex, new List<int>());
         }
         selectedCells[columnIndex].Add(dataGridView.SelectedCells[i].RowIndex);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridLogic.cs

@@ -120 +120 @@
     }
 
+    public void DeleteRow(List<int> rows) {
+      preprocessingData.InTransaction(() => {
+        foreach (int rowIndex in rows) {
+          preprocessingData.DeleteRow(rowIndex);
+        }
+      });
+    }
+
     public event DataPreprocessingChangedEventHandler Changed {
       add { preprocessingData.Changed += value; }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridLogic.cs

@@ -36 +36 @@
 
     event DataPreprocessingChangedEventHandler Changed;
+
+    void DeleteRow(List<int> rows);
   }
 }