diff testApp.mm @ 8:d59de9fd3496

Refactored messageController, ready for instroduction of other stages and tests.

--- a/testApp.mm	Fri Oct 17 15:13:35 2014 +0100
+++ b/testApp.mm	Fri Oct 17 16:35:22 2014 +0100
@@ -17,22 +17,23 @@
     
     
     initialiseVariables();
-    
-    
-    testController = new TestController;
+
     
     expPresetManager.onAppLoad();
     
     //presetManager.startLoadAll();
     
+    targetSynth.init(&core,"targetSynth");
+    candidateSynth.init(&core,"candidateSynth");
     
-    messageOrganiser.init(&core, testController);
+    searchMessageOrganiser.init(targetSynth, candidateSynth);
     timeController.init();
     initialiseGUIs();
     initialiseMIDI();
     setupUIElements();
 
 
+
     
     light.setSpotlight(45. , 1.);
     light.enable();
@@ -134,36 +135,36 @@
     
     Buttron* playTargetButton = new Buttron(p.buttonWidth*0.2,680, p);
     playTargetButton->setLabel("Target");
-    messageOrganiser.mapButtonToAction(playTargetButton, TRIGGER_TARGET_ID);
+    searchMessageOrganiser.mapButtonToAction(playTargetButton, TRIGGER_TARGET_ID);
     bottomButtonPanel->addButton(playTargetButton);
-    messageOrganiser.setTargetButton(playTargetButton);
+    searchMessageOrganiser.setTargetButton(playTargetButton);
     
     Buttron * playCandidateButton = new Buttron(p.buttonWidth*1.4,680, p);
     playCandidateButton->setLabel("Current");
-    messageOrganiser.mapButtonToAction(playCandidateButton, TRIGGER_CANDIDATE_ID);
+    searchMessageOrganiser.mapButtonToAction(playCandidateButton, TRIGGER_CANDIDATE_ID);
     bottomButtonPanel->addButton(playCandidateButton);
     
     
     // submit button - only one for now
     Buttron * submitButton = new Buttron(ofGetWidth()*0.5 - p.buttonWidth*0.5,680, p);
     submitButton->setLabel("Submit");
-    messageOrganiser.mapButtonToAction(submitButton, SUBMIT_CANDIDATE);
+    searchMessageOrganiser.mapButtonToAction(submitButton, SUBMIT_CANDIDATE);
     bottomButtonPanel->addButton(submitButton);
     
     //  button - just for spacing pruposes
     Buttron * saveButton = new Buttron(ofGetWidth()*0.5 - p.buttonWidth*0.5,680, p);
     saveButton->setLabel("SAVE");
-    messageOrganiser.mapButtonToAction(saveButton, SAVE_PRESET_HIT);
+    searchMessageOrganiser.mapButtonToAction(saveButton, SAVE_PRESET_HIT);
     bottomButtonPanel->addButton(saveButton);
     saveButton->hide();
     
     Buttron * recallButton = new Buttron(ofGetWidth()*0.5 - p.buttonWidth*0.5,680, p);
     recallButton->setLabel("RECALL");
-    messageOrganiser.mapButtonToAction(recallButton, RECALL_PRESET_HIT);
+    searchMessageOrganiser.mapButtonToAction(recallButton, RECALL_PRESET_HIT);
     bottomButtonPanel->addButton(recallButton);
     recallButton->hide();
     
-    messageOrganiser.setBottomPanel(bottomButtonPanel);
+    searchMessageOrganiser.setBottomPanel(bottomButtonPanel);
     UIElements.push_back(bottomButtonPanel);
     bottomButtonPanel->showBorder(false);
 
@@ -171,19 +172,19 @@
     
     CountdownText * countDownBox = new CountdownText("5" , 500, 380, 455, 455, p);
     UIElements.push_back(countDownBox);
-    messageOrganiser.setCountdownPanel(countDownBox);
+    searchMessageOrganiser.setCountdownPanel(countDownBox);
     countDownBox->hide();
     
     TextPanel * scoreFeedback = new TextPanel("Feedback panel", ofGetWidth()*0.5 - p.buttonWidth*0.5, 666, 400,100,p);
     scoreFeedback->setFontSize(SMALLFONT);
     UIElements.push_back(scoreFeedback);
-    messageOrganiser.setScorePanel(scoreFeedback);
+    searchMessageOrganiser.setScorePanel(scoreFeedback);
     scoreFeedback->hide();
     
     TextPanel * finishPanel = new TextPanel("Finish txt panel", 250, 250, 1000,400,p);
     finishPanel->setFontSize(LARGEFONT);
     finishPanel->setText("Experiment completed");
-    messageOrganiser.setFinishPanel(finishPanel);
+    searchMessageOrganiser.setFinishPanel(finishPanel);
     
     UIElements.push_back(finishPanel);
     finishPanel->hide();
@@ -192,12 +193,12 @@
     Buttron * newTestButton = new Buttron(ofGetWidth()-300,690, p);
     newTestButton->setLabel("Next Test");
     UIElements.push_back(newTestButton);
-    messageOrganiser.mapButtonToAction(newTestButton, NEW_TEST_ID);
+    searchMessageOrganiser.mapButtonToAction(newTestButton, NEW_TEST_ID);
     newTestButton->hide();
-    messageOrganiser.setNewTestButton(newTestButton);
+    searchMessageOrganiser.setNewTestButton(newTestButton);
     
     TargetSymbol* targetSymbol = new TargetSymbol(ofGetWidth()*0.5,160,30,p);
-    messageOrganiser.setTargetSymbol(targetSymbol);
+    searchMessageOrganiser.setTargetSymbol(targetSymbol);
     UIElements.push_back(targetSymbol);
     
 }
@@ -215,7 +216,7 @@
                                                  sl2);
     
     UIElements.push_back(controlPanel);
-    messageOrganiser.setControlPanel(controlPanel);
+    searchMessageOrganiser.setControlPanel(controlPanel);
     controlPanel->showBorder(true);
 }
 //--------------------------------------------------------------
@@ -319,9 +320,7 @@
 		delete outputs[i];
 	}
     deleteVectorOfPointers(&UIElements); // TODO this crashes??
-    
-    
-    delete testController;
+
     
     cout << "exit done \n";
 }
@@ -383,7 +382,7 @@
     eventLogger.logEvent(START_THE_TESTS);
     whichInterfaceShowing = COUNT_DOWN;
     // do countdown etc
-    messageOrganiser.countdownToNewTest();
+    searchMessageOrganiser.countdownToNewTest();
     // TODO how is testApp going to kknow whichInterfaceShowing ???
     
 }
@@ -487,7 +486,7 @@
     //ofLine(0,150,1024,150);
     
     //drawWaveform();
-    drawScore();
+    searchMessageOrganiser.drawScore();
     
     
 
@@ -500,28 +499,7 @@
         (*UIitr)->draw();
     }
 }
-//------------------------------------------------------------------------
-void testApp::drawScore(){
-    ofColor txtCol = ofColor(150,235,200,255);
-    
-    int score = messageOrganiser.getScore();
-    stringstream msg;
-    
-    msg << "Test: " << testController->getCurrentTestLetter();
-    ofSetColor(txtCol);
-    verdBig.drawString(msg.str(), 40, 140);
-    msg.str(std::string());
-    
-    msg << "Score: " << score;
-    verdBig.drawString(msg.str(), 240, 140);
-    msg.str(std::string());
-    
-    pair<int,int> time;
-    time = messageOrganiser.getTime();
-    msg << "Time taken: " << time.first << ":" << time.second << endl;
-    verdBig.drawString(msg.str(), 600, 140);
-    
-}
+
 //------------------------------------------------------------------------
 
 //--------------------------------------------------------------
@@ -664,7 +642,7 @@
         int ctl_val = msg.value;
         // TODO route control change message here
         //cout << " ctrl : " << ctl_num << " : " << ctl_val << endl;
-        messageOrganiser.midiFromLeap(ctl_num, ctl_val);
+        searchMessageOrganiser.midiFromLeap(ctl_num, ctl_val);
     }
  
 }