Changeset 1549

Timestamp:

02/01/10 01:35:22 (3 years ago)

Author:

wolke

Message:

add "drag and drop intrument from library" to undo stack

Location:

branches/undo

Files:

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

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

@@ -1274 +1274 @@
         m_pPatternEditorPanel->getPianoRollEditor()->updateEditor();
 }
+
+
+void DrumPatternEditor::functionMoveInstrumentAction( int nSourceInstrument,  int nTargetInstrument )
+{
+                Hydrogen *engine = Hydrogen::get_instance();
+                AudioEngine::get_instance()->lock( RIGHT_HERE );
+
+                Song *pSong = engine->getSong();
+                InstrumentList *pInstrumentList = pSong->get_instrument_list();
+
+                if ( ( nTargetInstrument > (int)pInstrumentList->get_size() ) || ( nTargetInstrument < 0) ) {
+                        AudioEngine::get_instance()->unlock();
+                        return;
+                }
+
+
+                // move instruments...
+
+                Instrument *pSourceInstr = pInstrumentList->get(nSourceInstrument);
+                if ( nSourceInstrument < nTargetInstrument) {
+                        for (int nInstr = nSourceInstrument; nInstr < nTargetInstrument; nInstr++) {
+                                Instrument * pInstr = pInstrumentList->get(nInstr + 1);
+                                pInstrumentList->replace( pInstr, nInstr );
+                        }
+                        pInstrumentList->replace( pSourceInstr, nTargetInstrument );
+                }
+                else {
+                        for (int nInstr = nSourceInstrument; nInstr >= nTargetInstrument; nInstr--) {
+                                Instrument * pInstr = pInstrumentList->get(nInstr - 1);
+                                pInstrumentList->replace( pInstr, nInstr );
+                        }
+                        pInstrumentList->replace( pSourceInstr, nTargetInstrument );
+                }
+
+                #ifdef JACK_SUPPORT
+                engine->renameJackPorts();
+                #endif
+
+                AudioEngine::get_instance()->unlock();
+                engine->setSelectedInstrumentNumber( nTargetInstrument );
+
+                pSong->__is_modified = true;
+}
+
+
+void  DrumPatternEditor::functionDropInstrumentUndoAction( int nTargetInstrument )
+{
+        Hydrogen *pEngine = Hydrogen::get_instance();
+        pEngine->removeInstrument( nTargetInstrument, false );
+        
+        AudioEngine::get_instance()->lock( RIGHT_HERE );
+#ifdef JACK_SUPPORT
+        pEngine->renameJackPorts();
+#endif
+        AudioEngine::get_instance()->unlock();
+        updateEditor();
+}
+
+
+void  DrumPatternEditor::functionDropInstrumentRedoAction( QString sDrumkitName, QString sInstrumentName, int nTargetInstrument )
+{
+                Instrument *pNewInstrument = Instrument::load_instrument( sDrumkitName, sInstrumentName );
+                if( pNewInstrument == NULL ) return;            
+
+                Hydrogen *pEngine = Hydrogen::get_instance();
+
+                // create a new valid ID for this instrument
+                int nID = -1;
+                for ( uint i = 0; i < pEngine->getSong()->get_instrument_list()->get_size(); ++i ) {
+                        Instrument* pInstr = pEngine->getSong()->get_instrument_list()->get( i );
+                        if ( pInstr->get_id().toInt() > nID ) {
+                                nID = pInstr->get_id().toInt();
+                        }
+                }
+                ++nID;
+
+                pNewInstrument->set_id( QString("%1").arg( nID ) );
+
+                AudioEngine::get_instance()->lock( RIGHT_HERE );
+                pEngine->getSong()->get_instrument_list()->add( pNewInstrument );
+
+                #ifdef JACK_SUPPORT
+                pEngine->renameJackPorts();
+                #endif
+
+                AudioEngine::get_instance()->unlock();
+                //move instrument to the position where it was dropped
+                functionMoveInstrumentAction(pEngine->getSong()->get_instrument_list()->get_size() - 1 , nTargetInstrument );
+
+                // select the new instrument
+                pEngine->setSelectedInstrumentNumber(nTargetInstrument);
+                updateEditor();
+}
 ///~undo / redo actions from pattern editor instrument list
 ///==========================================================

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

@@ -91 +91 @@
                 void functionFillNotesRedoAction( QStringList noteList, int nSelectedInstrument, int patternNumber );
                 void functionRandomVelocityAction( QStringList noteVeloValue, int nSelectedInstrument, int selectedPatternNumber );
+                void functionMoveInstrumentAction( int nSourceInstrument,  int nTargetInstrument );
+                void functionDropInstrumentUndoAction( int nTargetInstrument );
+                void functionDropInstrumentRedoAction( QString sDrumkitName, QString sInstrumentName, int nTargetInstrument );
 
         public slots:

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

@@ -440 +440 @@
 
 
-void PatternEditorInstrumentList::moveInstrumentLine( int nSourceInstrument , int nTargetInstrument )
-{
-                Hydrogen *engine = Hydrogen::get_instance();
-                AudioEngine::get_instance()->lock( RIGHT_HERE );
-
-                Song *pSong = engine->getSong();
-                InstrumentList *pInstrumentList = pSong->get_instrument_list();
-
-                if ( ( nTargetInstrument > (int)pInstrumentList->get_size() ) || ( nTargetInstrument < 0) ) {
-                        AudioEngine::get_instance()->unlock();
-                        return;
-                }
-
-
-                // move instruments...
-
-                Instrument *pSourceInstr = pInstrumentList->get(nSourceInstrument);
-                if ( nSourceInstrument < nTargetInstrument) {
-                        for (int nInstr = nSourceInstrument; nInstr < nTargetInstrument; nInstr++) {
-                                Instrument * pInstr = pInstrumentList->get(nInstr + 1);
-                                pInstrumentList->replace( pInstr, nInstr );
-                        }
-                        pInstrumentList->replace( pSourceInstr, nTargetInstrument );
-                }
-                else {
-                        for (int nInstr = nSourceInstrument; nInstr >= nTargetInstrument; nInstr--) {
-                                Instrument * pInstr = pInstrumentList->get(nInstr - 1);
-                                pInstrumentList->replace( pInstr, nInstr );
-                        }
-                        pInstrumentList->replace( pSourceInstr, nTargetInstrument );
-                }
-
-                #ifdef JACK_SUPPORT
-                engine->renameJackPorts();
-                #endif
-
-                AudioEngine::get_instance()->unlock();
-                engine->setSelectedInstrumentNumber( nTargetInstrument );
-
-                pSong->__is_modified = true;
-}
 
 ///
@@ -573 +532 @@
                 }
 
-                moveInstrumentLine( nSourceInstrument , nTargetInstrument );
+                SE_moveInstrumentAction *action = new SE_moveInstrumentAction( nSourceInstrument, nTargetInstrument );
+                HydrogenApp::get_instance()->m_undoStack->push( action );
 
                 event->acceptProposedAction();
@@ -585 +545 @@
                 QString sDrumkitName = tokens.at( 0 );
                 QString sInstrumentName = tokens.at( 1 );
-                
-                Instrument *pNewInstrument = Instrument::load_instrument( sDrumkitName, sInstrumentName );
-                if( pNewInstrument == NULL ) return;            
-
-                Hydrogen *pEngine = Hydrogen::get_instance();
-
-                // create a new valid ID for this instrument
-                int nID = -1;
-                for ( uint i = 0; i < pEngine->getSong()->get_instrument_list()->get_size(); ++i ) {
-                        Instrument* pInstr = pEngine->getSong()->get_instrument_list()->get( i );
-                        if ( pInstr->get_id().toInt() > nID ) {
-                                nID = pInstr->get_id().toInt();
-                        }
-                }
-                ++nID;
-
-                pNewInstrument->set_id( QString("%1").arg( nID ) );
-
-                AudioEngine::get_instance()->lock( RIGHT_HERE );
-                pEngine->getSong()->get_instrument_list()->add( pNewInstrument );
-
-                #ifdef JACK_SUPPORT
-                pEngine->renameJackPorts();
-                #endif
-
-                AudioEngine::get_instance()->unlock();
-
-        
+
                 int nTargetInstrument = event->pos().y() / m_nGridHeight;
 
@@ -619 +552 @@
                     Because the right part of the grid starts above the name column, we have to subtract the difference 
                 */
-
                 if (  event->pos().x() > 181 ) nTargetInstrument = ( event->pos().y() - 90 )  / m_nGridHeight ;
 
-                //move instrument to the position where it was dropped
-                moveInstrumentLine(pEngine->getSong()->get_instrument_list()->get_size() - 1 , nTargetInstrument );
-
-
-
-                // select the new instrument
-                pEngine->setSelectedInstrumentNumber(nTargetInstrument);
+                SE_dragInstrumentAction *action = new SE_dragInstrumentAction( sDrumkitName, sInstrumentName, nTargetInstrument );
+                HydrogenApp::get_instance()->m_undoStack->push( action );
 
                 event->acceptProposedAction();

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

@@ -117 +117 @@
 
                 InstrumentLine* createInstrumentLine();
-                void moveInstrumentLine(int,int);
 
 };

branches/undo/gui/src/UndoActions.h

@@ -720 +720 @@
         int __nSelectedInstrument;
         int __selectedPatternNumber;
+};
+
+
+
+class SE_moveInstrumentAction : public QUndoCommand
+{
+public:
+        SE_moveInstrumentAction(  int nSourceInstrument, int nTargetInstrument  ){
+        setText( QString( "move Instrument" ) );
+        __nSourceInstrument = nSourceInstrument;
+        __nTargetInstrument = nTargetInstrument;
+        }
+        virtual void undo()
+        {
+                qDebug() << "move Instrument Undo ";
+                HydrogenApp* h2app = HydrogenApp::get_instance();
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->functionMoveInstrumentAction( __nTargetInstrument, __nSourceInstrument );
+        }
+        virtual void redo()
+        {
+                qDebug() << "move Instrument Redo " ;
+                HydrogenApp* h2app = HydrogenApp::get_instance();
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->functionMoveInstrumentAction( __nSourceInstrument, __nTargetInstrument );
+        }
+private:
+        int __nSourceInstrument;
+        int __nTargetInstrument;
+};
+
+class SE_dragInstrumentAction : public QUndoCommand
+{
+public:
+        SE_dragInstrumentAction(  QString sDrumkitName, QString sInstrumentName, int nTargetInstrument  ){
+        setText( QString( "drop Instrument" ) );
+        __sDrumkitName = sDrumkitName;
+        __sInstrumentName = sInstrumentName;
+        __nTargetInstrument = nTargetInstrument;
+        }
+        virtual void undo()
+        {
+                qDebug() << "drop Instrument Undo ";
+                HydrogenApp* h2app = HydrogenApp::get_instance();
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->functionDropInstrumentUndoAction( __nTargetInstrument );
+        }
+        virtual void redo()
+        {
+                qDebug() << "drop Instrument Redo " ;
+                HydrogenApp* h2app = HydrogenApp::get_instance();
+                h2app->getPatternEditorPanel()->getDrumPatternEditor()->functionDropInstrumentRedoAction( __sDrumkitName, __sInstrumentName, __nTargetInstrument );
+        }
+private:
+        QString __sDrumkitName;
+        QString __sInstrumentName;
+        int __nTargetInstrument;
 };
 //~pattern editor commands

branches/undo/undo_implementation_todo

@@ -33 +33 @@
  + Context menu fill notes                                      | Done
  + Context menu random velocity                                 | Done
- + Add/delete instrument                                        | ----
+ + Drag and drop instruments order                              | Done
+ + Context menu Delete instrument                               | ----
  + Drag and drop intrument from library                         | ----
- + Drag and drop instruments order                              | ----
+ + Main menu Add instrument                                     | ----
 
 
@@ -43 +44 @@
  + Edit lead lag                                                | Done
  + Edit note key                                                | Done
-