fix copy/cut & paste TRIS: fix deselectAndOverwriteNotes()

hydrogen-music · Apr 28, 2021 · 3101b64 · 3101b64
1 parent d7dbd23
commit 3101b64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/core/Basics/Pattern.cpp b/src/core/Basics/Pattern.cpp
@@ -151,7 +151,7 @@ void Pattern::save_to( XMLNode* node, const Instrument* instrumentOnly ) const
 	}
 }
 
-Note* Pattern::find_note( double idx_a, int idx_b, Instrument* instrument, Note::Key key, Note::Octave octave, bool strict ) const // TODO tolerance epsilon
+Note* Pattern::find_note( double idx_a, int idx_b, Instrument* instrument, Note::Key key, Note::Octave octave, bool strict ) const
 {
 	for( notes_cst_it_t it=__notes.lower_bound( idx_a - POS_EPSILON ) ; it!=__notes.upper_bound( idx_a + POS_EPSILON ); it++ ) {
 		Note* note = it->second;
@@ -179,7 +179,7 @@ Note* Pattern::find_note( double idx_a, int idx_b, Instrument* instrument, Note:
 Note* Pattern::find_note( double idx_a, int idx_b, Instrument* instrument, bool strict ) const
 {
 	notes_cst_it_t it;
-	for( it=__notes.lower_bound( idx_a - POS_EPSILON ); it!=__notes.upper_bound( idx_a + POS_EPSILON ); it++ ) { // TODO tolerance epsilon
+	for( it=__notes.lower_bound( idx_a - POS_EPSILON ); it!=__notes.upper_bound( idx_a + POS_EPSILON ); it++ ) {
 		Note* note = it->second;
 		assert( note );
 		if ( note->get_instrument() == instrument ) return note;

diff --git a/src/gui/src/PatternEditor/PatternEditor.cpp b/src/gui/src/PatternEditor/PatternEditor.cpp
@@ -411,7 +411,7 @@ void PatternEditor::updateModifiers( QInputEvent *ev ) {
 
 bool PatternEditor::notesMatchExactly( Note *pNoteA, Note *pNoteB ) const {
 	return ( pNoteA->match( pNoteB->get_instrument(), pNoteB->get_key(), pNoteB->get_octave() )
-			 && pNoteA->get_position() == pNoteB->get_position()
+			 && fabs( pNoteA->get_position() - pNoteB->get_position() ) < 2 * POS_EPSILON
 			 && pNoteA->get_velocity() == pNoteB->get_velocity()
 			 && pNoteA->get_pan_r() == pNoteB->get_pan_r()
 			 && pNoteA->get_pan_l() == pNoteB->get_pan_l()
@@ -484,13 +484,15 @@ void PatternEditor::deselectAndOverwriteNotes( std::vector< H2Core::Note *> &sel
 		m_selection.removeFromSelection( pSelectedNote, /* bCheck=*/false );
 		bool bFoundExact = false;
 		double fPosition = pSelectedNote->get_position();
-		FOREACH_NOTE_IT_BOUND( pNotes, it, fPosition) {
+		for ( auto it = pNotes->lower_bound( fPosition - POS_EPSILON );
+				 it != pNotes->end() && it->first < fPosition + POS_EPSILON; ) { // NOTE: counter not incremented here!
 			Note *pNote = it->second;
 			if ( !bFoundExact && notesMatchExactly( pNote, pSelectedNote ) ) {
 				// Found an exact match. We keep this.
 				bFoundExact = true;
 				++it;
-			} else if ( pSelectedNote->match( pNote ) && pNote->get_position() == pSelectedNote->get_position() ) { //TODO tolerance
+			} else if ( pSelectedNote->match( pNote ) // match key, octave & instrument
+						&& fabs( pNote->get_position() - pSelectedNote->get_position() ) < 2 * POS_EPSILON ) {
 				// Something else occupying the same position (which may or may not be an exact duplicate)
 				it = pNotes->erase( it );
 			} else {