Changeset 1533

Timestamp:

01/26/10 13:38:55 (3 years ago)

Author:

wolke

Message:

add "edit note length Pattern Editor" to undo stack

Location:

branches/undo

Files:

• gui/src/PatternEditor/DrumPatternEditor.cpp (modified) (11 diffs)
• gui/src/PatternEditor/DrumPatternEditor.h (modified) (2 diffs)
• gui/src/UndoActions.h (modified) (6 diffs)
• undo_implementation_todo (modified) (1 diff)

branches/undo/gui/src/PatternEditor/DrumPatternEditor.cpp

@@ -102 +102 @@
                 m_pPattern = NULL;
         }
+        __selectedPatternNumber = nSelectedPatternNumber;
 
 
@@ -162 +163 @@
 
         if (ev->button() == Qt::LeftButton ) {
-                SE_addNoteAction *action = new SE_addNoteAction( nColumn, row );
+                SE_addNoteAction *action = new SE_addNoteAction( nColumn, row, __selectedPatternNumber );
                 HydrogenApp::get_instance()->m_undoStack->push( action );
         }
@@ -182 +183 @@
 
                 if ( Preferences::get_instance()->__rightclickedpattereditor == 1){
-                        SE_addNoteRightClickAction *action = new SE_addNoteRightClickAction( nColumn, row );
+                        SE_addNoteRightClickAction *action = new SE_addNoteRightClickAction( nColumn, row, __selectedPatternNumber );
                         HydrogenApp::get_instance()->m_undoStack->push( action );
                         return;
@@ -232 +233 @@
                 __nColumn = nColumn;
                 __row = row;
+                __oldLength = m_pDraggedNote->get_length();
                 
                 AudioEngine::get_instance()->unlock();
@@ -237 +239 @@
 }
 
-void DrumPatternEditor::addOrDeleteNoteAction( int nColumn, int row )
-{
+void DrumPatternEditor::addOrDeleteNoteAction( int nColumn, int row, int selectedPatternNumber )
+{
+
+
+        Hydrogen *pEngine = Hydrogen::get_instance();
+        PatternList *pPatternList = pEngine->getSong()->get_pattern_list();
+        H2Core::Pattern *pPattern;
+
+        if ( ( selectedPatternNumber != -1 ) && ( (uint)selectedPatternNumber < pPatternList->get_size() ) ) {
+                pPattern = pPatternList->get( selectedPatternNumber );
+        }
+        else {
+                pPattern = NULL;
+        }
+
+
         Song *pSong = Hydrogen::get_instance()->getSong();
         int nInstruments = pSong->get_instrument_list()->get_size();
@@ -249 +265 @@
         bool bNoteAlreadyExist = false;
         std::multimap <int, Note*>::iterator pos;
-        for ( pos = m_pPattern->note_map.lower_bound( nColumn ); pos != m_pPattern->note_map.upper_bound( nColumn ); ++pos ) {
+        for ( pos = pPattern->note_map.lower_bound( nColumn ); pos != pPattern->note_map.upper_bound( nColumn ); ++pos ) {
                 Note *pNote = pos->second;
                 assert( pNote );
@@ -256 +272 @@
                         bNoteAlreadyExist = true;
                         delete pNote;
-                        m_pPattern->note_map.erase( pos );
+                        pPattern->note_map.erase( pos );
                         break;
                 }
@@ -271 +287 @@
                 Note *pNote = new Note( pSelectedInstrument, nPosition, fVelocity, fPan_L, fPan_R, nLength, fPitch );
                 pNote->set_noteoff( false );
-                m_pPattern->note_map.insert( std::make_pair( nPosition, pNote ) );
+                pPattern->note_map.insert( std::make_pair( nPosition, pNote ) );
 
                 // hear note
@@ -298 +314 @@
 
 
-void DrumPatternEditor::addNoteRightClickAction( int nColumn, int row )
-{
+void DrumPatternEditor::addNoteRightClickAction( int nColumn, int row, int selectedPatternNumber )
+{
+
+        Hydrogen *pEngine = Hydrogen::get_instance();
+        PatternList *pPatternList = pEngine->getSong()->get_pattern_list();
+
+        H2Core::Pattern *pPattern;
+        if ( (selectedPatternNumber != -1) && ( (uint)selectedPatternNumber < pPatternList->get_size() ) ) {
+                pPattern = pPatternList->get( selectedPatternNumber );
+        }
+        else {
+                pPattern = NULL;
+        }
 
         Song *pSong = Hydrogen::get_instance()->getSong();
@@ -322 +349 @@
 
         
-        m_pPattern->note_map.insert( std::make_pair( nPosition, poffNote ) );
+        pPattern->note_map.insert( std::make_pair( nPosition, poffNote ) );
 
         pSong->__is_modified = true;
@@ -351 +378 @@
                 return;
         }
+
+        if (m_bRightBtnPressed && m_pDraggedNote && ( Preferences::get_instance()->__rightclickedpattereditor == 0 ) ) {
+                if ( m_pDraggedNote->get_noteoff() ) return;
+
+                SE_editNoteLenghtAction *action = new SE_editNoteLenghtAction( m_pDraggedNote->get_position(),  m_pDraggedNote->get_position(), __row, m_pDraggedNote->get_length(),__oldLength, __selectedPatternNumber);
+                HydrogenApp::get_instance()->m_undoStack->push( action );
+        }
+}
+
+
+void DrumPatternEditor::editNoteLenghtAction( int nColumn, int nRealColumn, int row, int length, int selectedPatternNumber )
+{
+        Hydrogen *pEngine = Hydrogen::get_instance();
+        PatternList *pPatternList = pEngine->getSong()->get_pattern_list();
+
+        H2Core::Pattern *pPattern;
+        if ( (selectedPatternNumber != -1) && ( (uint)selectedPatternNumber < pPatternList->get_size() ) ) {
+                pPattern = pPatternList->get( selectedPatternNumber );
+        }
+        else {
+                pPattern = NULL;
+        }
+
+        Note *pDraggedNote;
+        Song *pSong = pEngine->getSong();
+        int nInstruments = pSong->get_instrument_list()->get_size();
+
+        Instrument *pSelectedInstrument = pSong->get_instrument_list()->get( row );
+
+        AudioEngine::get_instance()->lock( RIGHT_HERE );
+
+        std::multimap <int, Note*>::iterator pos;
+        for ( pos = pPattern->note_map.lower_bound( nColumn ); pos != pPattern->note_map.upper_bound( nColumn ); ++pos ) {
+                Note *pNote = pos->second;
+                assert( pNote );
+
+                if ( pNote->get_instrument() == pSelectedInstrument ) {
+                        pDraggedNote = pNote;
+                        break;
+                }
+        }
+        if ( !pDraggedNote ) {
+                for ( pos = pPattern->note_map.lower_bound( nRealColumn ); pos != pPattern->note_map.upper_bound( nRealColumn ); ++pos ) {
+                        Note *pNote = pos->second;
+                        assert( pNote );
+
+                        if ( pNote->get_instrument() == pSelectedInstrument ) {
+                                pDraggedNote = pNote;
+                                break;
+                        }
+                }
+
+
+        }
+        // potrei essere sulla coda di una nota precedente..
+        for ( int nCol = 0; unsigned(nCol) < nRealColumn; ++nCol ) {
+                if ( pDraggedNote ) break;
+                for ( pos = pPattern->note_map.lower_bound( nCol ); pos != pPattern->note_map.upper_bound( nCol ); ++pos ) {
+                        Note *pNote = pos->second;
+                        assert( pNote );
+
+                        if ( pNote->get_instrument() == pSelectedInstrument
+                        && ( (nRealColumn <= pNote->get_position() + pNote->get_length() )
+                        && nRealColumn >= pNote->get_position() ) ){
+                                pDraggedNote = pNote;
+                                break;
+                        }
+                }
+        }
+
+        pDraggedNote->set_length( length );
+        AudioEngine::get_instance()->unlock();
+        update( 0, 0, width(), height() );
+        m_pPatternEditorPanel->getVelocityEditor()->updateEditor();
+        m_pPatternEditorPanel->getPanEditor()->updateEditor();
+        m_pPatternEditorPanel->getLeadLagEditor()->updateEditor();
+        m_pPatternEditorPanel->getNoteKeyEditor()->updateEditor();
+
 }
 

branches/undo/gui/src/PatternEditor/DrumPatternEditor.h

@@ -65 +65 @@
                 virtual void selectedInstrumentChangedEvent();
                 //~ Implements EventListener interface
-                void addOrDeleteNoteAction( int __nColumn, int __nRow );
-                void addNoteRightClickAction( int nColumn, int nRow );
+                void addOrDeleteNoteAction( int __nColumn, int __nRow, int  selectedPatternNumber);
+                void addNoteRightClickAction( int nColumn, int nRow, int selectedPatternNumber );
+                void editNoteLenghtAction( int nColumn, int nRealColumn, int row, int length, int selectedPatternNumber );
 
         public slots:
@@ -108 +109 @@
                 int __nColumn;
                 int __row;
+                int __oldLength;
+                int __selectedPatternNumber;
 };
 

branches/undo/gui/src/UndoActions.h

@@ -457 +457 @@
 {
 public:
-        SE_addNoteAction( int nColumn, int nRow ){
+        SE_addNoteAction( int nColumn, int nRow, int selectedPatternNumber ){
         setText( QString( "Add Note ( %1, %2 )" ).arg( nColumn ).arg( nRow ) );
         //setText("add Pattern");
         __nColumn = nColumn;
         __nRow = nRow;
+        __selectedPatternNumber = selectedPatternNumber;
         }
         virtual void undo()
@@ -467 +468 @@
                 qDebug() << "Add note Undo ";
                 HydrogenApp* h2app = HydrogenApp::get_instance();
-                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addOrDeleteNoteAction( __nColumn, __nRow );
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addOrDeleteNoteAction( __nColumn, __nRow, __selectedPatternNumber );
         }
         virtual void redo()
@@ -473 +474 @@
                 qDebug() << "Add Note Redo " ;
                 HydrogenApp* h2app = HydrogenApp::get_instance();
-                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addOrDeleteNoteAction( __nColumn, __nRow );
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addOrDeleteNoteAction( __nColumn, __nRow, __selectedPatternNumber );
         }
 private:
         int __nColumn;
         int __nRow;
+        int __selectedPatternNumber;
 };
 
@@ -484 +486 @@
 {
 public:
-        SE_addNoteRightClickAction( int nColumn, int nRow ){
+        SE_addNoteRightClickAction( int nColumn, int nRow, int selectedPatternNumber ){
         setText( QString( "Add off note Note ( %1, %2 )" ).arg( nColumn ).arg( nRow ) );
         //setText("add Pattern");
         __nColumn = nColumn;
         __nRow = nRow;
+        __selectedPatternNumber = selectedPatternNumber;
         }
         virtual void undo()
@@ -494 +497 @@
                 qDebug() << "Add off note Note Undo ";
                 HydrogenApp* h2app = HydrogenApp::get_instance();
-                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addOrDeleteNoteAction( __nColumn, __nRow );
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addOrDeleteNoteAction( __nColumn, __nRow, __selectedPatternNumber );
         }
         virtual void redo()
@@ -500 +503 @@
                 qDebug() << "Add off note Note Redo " ;
                 HydrogenApp* h2app = HydrogenApp::get_instance();
-                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addNoteRightClickAction( __nColumn, __nRow );
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->addNoteRightClickAction( __nColumn, __nRow, __selectedPatternNumber );
         }
 private:
         int __nColumn;
         int __nRow;
+        int __selectedPatternNumber;
+};
+
+class SE_editNoteLenghtAction : public QUndoCommand
+{
+public:
+        SE_editNoteLenghtAction( int nColumn, int nRealColumn, int row, int length, int oldLength, int selectedPatternNumber ){
+        setText( QString( "Change note length" ) );
+        __nColumn = nColumn;
+        __nRealColumn = nRealColumn;
+        __row = row;
+        __length = length;
+        __oldLength = oldLength;
+        __selectedPatternNumber = selectedPatternNumber;
+        }
+        virtual void undo()
+        {
+                qDebug() << "Change note length Undo ";
+                HydrogenApp* h2app = HydrogenApp::get_instance();
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->editNoteLenghtAction( __nColumn,  __nRealColumn, __row, __oldLength, __selectedPatternNumber );
+        }
+        virtual void redo()
+        {
+                qDebug() << "Change note length Redo " ;
+                HydrogenApp* h2app = HydrogenApp::get_instance();
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->editNoteLenghtAction( __nColumn,  __nRealColumn, __row, __length, __selectedPatternNumber );
+        }
+private:
+        int __nColumn;
+        int __nRealColumn;
+        int __row;
+        int __oldLength;
+        int __length;
+        int __selectedPatternNumber;
 };
 #endif // UNDOACTIONS_H

branches/undo/undo_implementation_todo

@@ -23 +23 @@
  + Add/Remove note Pattern Editor                               | Done
  + Add/Remove noteoff note Pattern Editor                       | Done
- + Edit note length Pattern Editor (right cklicking)            | ----
+ + Edit note length Pattern Editor (right cklicking)            | Done
  + Add/Remove note Piano Roll Editor                            | ----
  + Add/Remove noteoff note Piano Roll Editor                    | ----