[Performous-commit] Tapio Vierros : Implemented multiple note deletion.

[Tapio V. <aa...@us...>]

Module: editor
Branch: master
Commit: 6edae48232f35b526c260fae2a64adc3065907a9

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Feb  2 10:10:54 2011 +0200

Implemented multiple note deletion.

---

 notegraphwidget.cc |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/notegraphwidget.cc b/notegraphwidget.cc
index e8ae7c1..675923c 100644
--- a/notegraphwidget.cc
+++ b/notegraphwidget.cc
@@ -432,15 +432,26 @@ void NoteGraphWidget::split(NoteLabel *note, float ratio)
 
 void NoteGraphWidget::del(NoteLabel *note)
 {
-	if (note && (note->nextSelected || note->prevSelected)) return;// FIXME: Multiple note handling
 	if (!note) return;
 
-	if (m_selectedNote == note)
-		selectNote(NULL);
+	// If delete is directed to a selected note, all selected notes will be deleted
+	if (note->isSelected() && m_selectedNote) {
+		note = m_selectedNote;
+		m_selectedNote = NULL;
+	}
 
-	Operation op("DEL");
-	op << getNoteLabelId(note);
-	doOperation(op);
+	int delcount = 0;
+	for (NoteLabel *n = note, *nn; n; n = nn, ++delcount) {
+		nn = n->nextSelected; // Need to put this into temp variable because it is cleared in setSelected(false)
+		Operation op("DEL");
+		op << getNoteLabelId(n);
+		doOperation(op);
+	}
+
+	// Combine to one undo operation
+	if (delcount > 1) {
+		Operation op("COMBINER"); op << delcount; doOperation(op);
+	}
 }
 
 void NoteGraphWidget::setType(NoteLabel *note, int index)
@@ -563,7 +574,7 @@ void NoteGraphWidget::keyPressEvent(QKeyEvent *event)
 			doOperation(op);
 		}
 
-	} else if (k == Qt::Key_Delete) { // Delete selected note
+	} else if (k == Qt::Key_Delete) { // Delete selected note(s)
 		del(m_selectedNote);
 
 	} else {
@@ -591,6 +602,7 @@ void NoteGraphWidget::doOperation(const Operation& op, Operation::OperationFlags
 			NoteLabel *n = m_notes.at(op.i(1));
 			if (n) {
 				if (action == "DEL") {
+					n->setSelected(false); // Remove from selection list
 					n->close();
 					m_notes.removeAt(op.i(1));
 				} else if (action == "SETGEOM") {
@@ -646,7 +658,7 @@ VocalTrack NoteGraphWidget::getVocalTrack() const
 QString NoteGraphWidget::getCurrentSentence() const
 {
 	QString lyrics;
-	if (!m_notes.isEmpty() && m_selectedNote) {
+	if (!m_notes.isEmpty() && m_selectedNote && !m_selectedNote->nextSelected) {
 		int id = getNoteLabelId(m_selectedNote);
 		for (int i = id; i < m_notes.size(); ++i) {
 			if (i != id && m_notes[i]->note().lineBreak) break;