comparison MessageOrganiser.h @ 16:2da0350a4aa2

expMessageOrganiser and express/explore view setup.

 #include "3Dbox.h"
 #include "TextPanel.h"
 #include "CountdownText.h"
 #include "buttonPanel.h"
 #include "ExplorePresetManager.h"
-
+#include "IconPanel.h"
 
 // should be called TIMED TEST MESSAGE ORGANISER ?
 
 // event logger needs to know
 // which controls were showing in what mode

         
     };
     void setBottomPanel(ButtonPanel * ntb){
         bottomPanel = ntb;
     };
+    
+    
+    void setIconPanel(IconPanel * ip){
+        presetIconPanel = ip;
+    }
+    void setInstructionPanel(TextPanel * ip){
+        instructionPanel = ip;
+        instructionPanel->show();
+    }
+
+    
+    //-----------------------------------------------------------------------------
+    void hideMyPanels(){
+        presetIconPanel->hide();
+        instructionPanel->hide();
+        bottomPanel->hide();
+        panel->hide();
+    }
+    void showMyPanels(){
+        presetIconPanel->show();
+        instructionPanel->show();
+        bottomPanel->show();
+        panel->show();
+    }
 protected:
 
     PDSynthWrapper candidateSynth;
     PDSynthWrapper targetSynth;
     ButtonPanel* bottomPanel; // shows during test : play buttons and submit
     SliderPanel* panel;
+    
+    IconPanel* presetIconPanel;
+    TextPanel* instructionPanel;
+    
     map<int,UIElement*> currentMapping; // could get more sophisticated if not 1-1 ?
     
 
     void triggerCandidateSound(){
         // log event

         currentMapping.insert(std::pair<int,UIElement*>(mappingID,control));
         cout << " Mapped control to ID: " << mappingID << "Name: " << candidateSynth.getNameForMappingID(mappingID) << endl;
         control->setLabel(candidateSynth.getNameForMappingID(mappingID));
     };
     
+    //-----------------------------------------------------------------------------
+    
+    void mapSlidersToParams(vector<UIElement*> elems, vector<int> mids){
+        
+        vector<UIElement*>::iterator elit;
+        vector<int> typeListLog;
+        int i = 0;
+        for(elit=elems.begin(); elit<elems.end();elit++){
+            if ( (*elit)->getType() == SLIDER){
+                if(i >= mids.size()){
+                    
+                    cout << "ERROR ERROR: too many controls for mapping IDs: " << mids.size() << endl;
+                }
+                
+                ButtronSlider* theSlider = (ButtronSlider*)(*elit);
+                mapControlToParam((*elit), mids[i]);
+                theSlider->setValueAndScale(candidateSynth.getParamValueForID(mids[i]));
+                cout << "Hint Value " << targetSynth.getParamValueFromName(candidateSynth.getNameForMappingID(mids[i])) << endl;
+                theSlider->setHintValue(targetSynth.getParamValueFromName(candidateSynth.getNameForMappingID(mids[i])));
+                i++;
+                typeListLog.push_back(int(SLIDER));
+                
+            }else{
+                cout << "ERROR ERROR: ui type not handled my mapping function !" << endl;
+            }
+        }
+        
+        eventLogger.logEvent(CONTROL_LIST,typeListLog);
+    };
+    
     void mapXYToParams(ButtronXY* control, int mappingIDX, int mappingIDY){
         UICallbackFunction callback;
         
         callback = boost::bind(&MessageOrganiser::paramChangeCallback, this, _1,_2);