diff testApp.h @ 8:d59de9fd3496

Refactored messageController, ready for instroduction of other stages and tests.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Fri, 17 Oct 2014 16:35:22 +0100
parents 4e00f92567d9
children d5e928887f51
line wrap: on
line diff
--- a/testApp.h	Fri Oct 17 15:13:35 2014 +0100
+++ b/testApp.h	Fri Oct 17 16:35:22 2014 +0100
@@ -28,6 +28,8 @@
 #include "buttronXY.h"
 #include "UIGrid.h"
 #include "MessageOrganiser.h"
+#include "SearchMessageOrganiser.h"
+#include "TrainingMessageOrganiser.h"
 #include "TestController.h"
 #include "timeController.h"
 #include <buttonPanel.h>
@@ -76,7 +78,13 @@
     UsernameAlertViewController *usernameAlertViewController;
     IntroViewController * introViewController;
     
-    MessageOrganiser messageOrganiser;
+    SearchMessageOrganiser searchMessageOrganiser;
+    TrainingMessageOrganiser trainingMessageOrganiser;
+    
+    
+    PDSynthWrapper targetSynth;
+    PDSynthWrapper candidateSynth;
+    
     TestController* testController;
     //TimeController timeController;
     interfaceType whichInterfaceShowing, previousInterface;