diff TrainingMessageOrganiser.h @ 13:ab3e0e980c82

Sequence conrtollrer FINALLY works.

--- a/TrainingMessageOrganiser.h	Mon Oct 20 14:12:23 2014 +0100
+++ b/TrainingMessageOrganiser.h	Mon Oct 20 19:36:39 2014 +0100
@@ -10,7 +10,6 @@
 #define __riftathon__TrainingMessageOrganiser__
 
 #include <iostream>
-#include "trainingTestController.h"
 #include "MessageOrganiser.h"
 #include "SequenceController.h"
 #include "globalVariables.h"
@@ -22,8 +21,6 @@
 public:
     void init( PDSynthWrapper& cs, PDSynthWrapper& ts){
         
-        trainingTestController = new TrainingTestController;
-        
         MessageOrganiser::init(cs,ts);
         
         TickListenerFunction callback;
@@ -70,15 +67,16 @@
     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
@@ -100,6 +98,7 @@
             if (sequencePreview){
                 // send target values again
                 targetSynth.setAllParams(currentTargetPreset->getValues());
+                setSlidersToTarget();
                 targetSynth.trigger();
                 
                 // flash the interface?
@@ -110,6 +109,18 @@
                 
             }
         }
+        
+        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;
+        }
     }
 
    
@@ -195,7 +206,6 @@
         }
     }
     SequenceController sequenceController;
-    TrainingTestController* trainingTestController;
     bool sequencePreview;
     Preset * currentTargetPreset;
     IconPanel* presetIconPanel;