comparison testApp.h @ 25:f42a00e3f22d

Logs condensed slightly. Questionnaire button enable.
double precision location!!!

 
 #import "QuestionnaireViewController.h"
 #import "BottomTabViewController.h"
 #import "IntroViewController.h"
 #import "TopButtonViewController.h"
+#import "SliderViewController.h"
+#import "usernameAlertViewController.h"
 
 #define HOST "169.254.1.1"
 #define PORT 12345
 
 typedef enum {SLIDERS,ZOOMER,BOTH,INTRO,QUESTIONNAIRE}interfaceType;

 
 	
 public:
     
     interfaceType whichInterfaceShowing;
-    bool consentGiven;
     BottomTabViewController *bottomTabViewController;
+    UsernameAlertViewController *usernameAlertViewController;
     int prevTouchX;
     int prevTouchY;
     double prevDist;
     bool paused;
     // not many so dont bother with vectors/arrays?

     int numActiveTouches;
     
     QuestionnaireViewController * questionnaireViewController;
     IntroViewController * introViewController;
     TopButtonViewController * topButtonViewController;
-    
+    SliderViewController * sliderViewController;
     //
     
     void setup();
     void update();
     void draw();

     void setupSliderGui();
     ofxUICanvas *sliderGUI;
     
     void sliderMoved(int which, float value);
     void setAllGUISliders(vector<int> vals);
+    void randomise();
     
     // zoom gui - the swap view button and save preset button
     void zoomGUIEvent(ofxUIEventArgs &e);
     void setupZoomGui();