comparison TrainingMessageOrganiser.h @ 13:ab3e0e980c82

Sequence conrtollrer FINALLY works.

 
 #ifndef __riftathon__TrainingMessageOrganiser__
 #define __riftathon__TrainingMessageOrganiser__
 
 #include <iostream>
-#include "trainingTestController.h"
 #include "MessageOrganiser.h"
 #include "SequenceController.h"
 #include "globalVariables.h"
 #include "IconPanel.h"
 

 
 class TrainingMessageOrganiser : public MessageOrganiser {
 public:
     void init( PDSynthWrapper& cs, PDSynthWrapper& ts){
         
-        trainingTestController = new TrainingTestController;
-        
         MessageOrganiser::init(cs,ts);
         
         TickListenerFunction callback;
         callback = boost::bind(&TrainingMessageOrganiser::onNextTick, this, _1);
         candidateSynth.registerForTicks(callback);

         presetIconPanel = ip;
     }
     void onNextTick(int tickNumber){
         cout << "TICK " << tickNumber << endl;
         
-        if ( tickNumber % 2){
+        if ( !(tickNumber % 2)){
             // load next target preset
-            int i = sequenceController.getNextPresetIndex();
+            
+            int i = sequenceController.getCurrentPresetIndex();
             
             currentTargetPreset =  expPresetManager.getPreset(i);
             
             if (sequencePreview){
                 // show next target preset
-                presetIconPanel->setTextAndImage(currentTargetPreset->name, currentTargetPreset->getImage());
+                // presetIconPanel->setTextAndImage(currentTargetPreset->name, currentTargetPreset->getImage());
              
                 // show image
                 // show name
                 // show controllersettings
                 

          
             //
             if (sequencePreview){
                 // send target values again
                 targetSynth.setAllParams(currentTargetPreset->getValues());
+                setSlidersToTarget();
                 targetSynth.trigger();
                 
                 // flash the interface?
             }else{
                 // has this been done? yes. candidateSynth.setAllParams(ui stuff);
                 candidateSynth.trigger();
                 showUserHowTheyDid();
                 
             }
+        }
+        
+        int run = sequenceController.stepForward();
+        if (run == -2){
+            // do finished run stuff, show summary
+            candidateSynth.stopMetronome();
+            cout << "FINISHED RUN" << endl;
+        }
+        if (run == -1){
+            // finished whole block
+            candidateSynth.stopMetronome();
+            cout << "FINISHED BLOCK" << endl;
         }
     }
 
    
 protected:

             loadPreset("blah");
             return;
         }
     }
     SequenceController sequenceController;
-    TrainingTestController* trainingTestController;
     bool sequencePreview;
     Preset * currentTargetPreset;
     IconPanel* presetIconPanel;
 };
 #endif /* defined(__riftathon__TrainingMessageOrganiser__) */