diff TrainingMessageOrganiser.h @ 12:af71bf84660f

icon stuff. not working/tested.

--- a/TrainingMessageOrganiser.h	Mon Oct 20 11:23:55 2014 +0100
+++ b/TrainingMessageOrganiser.h	Mon Oct 20 14:12:23 2014 +0100
@@ -14,6 +14,8 @@
 #include "MessageOrganiser.h"
 #include "SequenceController.h"
 #include "globalVariables.h"
+#include "IconPanel.h"
+
 extern ExplorePresetManager expPresetManager;
 
 class TrainingMessageOrganiser : public MessageOrganiser {
@@ -27,6 +29,8 @@
         TickListenerFunction callback;
         callback = boost::bind(&TrainingMessageOrganiser::onNextTick, this, _1);
         candidateSynth.registerForTicks(callback);
+        
+        sequencePreview = true;
     }
 
     void setupDefaultMapping(){
@@ -34,7 +38,7 @@
         
         controlPanelType cpt = REVISITABLE;
         vector<controllerType> elemList;
-        for(int i = 0; i < 8; i++){
+        for(int i = 0; i < TOTAL_NUM_PARAMS; i++){
             elemList.push_back(SLIDER);
         }
         
@@ -47,7 +51,7 @@
     
     vector<int> getMappingIDsFromSynths(){
         vector<int> index;
-        for(int i = 0; i < 8; i++){
+        for(int i = 0; i < TOTAL_NUM_PARAMS; i++){
             index.push_back(i);
         }
         vector<int> mids = candidateSynth.getMappingIDForIndices(index);
@@ -60,6 +64,9 @@
         
     };
     
+    void setIconPanel(IconPanel * ip){
+        presetIconPanel = ip;
+    }
     void onNextTick(int tickNumber){
         cout << "TICK " << tickNumber << endl;
         
@@ -71,6 +78,7 @@
             
             if (sequencePreview){
                 // show next target preset
+                presetIconPanel->setTextAndImage(currentTargetPreset->name, currentTargetPreset->getImage());
              
                 // show image
                 // show name
@@ -96,7 +104,9 @@
                 
                 // flash the interface?
             }else{
-                // else the user should be hitting the play button
+                // has this been done? yes. candidateSynth.setAllParams(ui stuff);
+                candidateSynth.trigger();
+                showUserHowTheyDid();
                 
             }
         }
@@ -104,7 +114,12 @@
 
    
 protected:
-
+    void showUserHowTheyDid(){
+        // colour flash
+        // distance ?
+        // score
+        
+    }
     void loadPreset(string pname){
         
         vector<int> values = expPresetManager.recallPreset(pname);
@@ -183,5 +198,6 @@
     TrainingTestController* trainingTestController;
     bool sequencePreview;
     Preset * currentTargetPreset;
+    IconPanel* presetIconPanel;
 };
 #endif /* defined(__riftathon__TrainingMessageOrganiser__) */