Mercurial > hg > soniczoomios

diff testApp.h @ 25:f42a00e3f22d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Logs condensed slightly. Questionnaire button enable. double precision location!!!
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Fri, 01 Feb 2013 17:39:19 +0000
parents a4908ad8c78e
children 2e1fdac115af
line wrap: on
line diff
--- a/testApp.h	Fri Feb 01 11:16:56 2013 +0000
+++ b/testApp.h	Fri Feb 01 17:39:19 2013 +0000
@@ -22,6 +22,8 @@
 #import "BottomTabViewController.h"
 #import "IntroViewController.h"
 #import "TopButtonViewController.h"
+#import "SliderViewController.h"
+#import "usernameAlertViewController.h"
 
 #define HOST "169.254.1.1"
 #define PORT 12345
@@ -34,8 +36,8 @@
 public:
     
     interfaceType whichInterfaceShowing;
-    bool consentGiven;
     BottomTabViewController *bottomTabViewController;
+    UsernameAlertViewController *usernameAlertViewController;
     int prevTouchX;
     int prevTouchY;
     double prevDist;
@@ -66,7 +68,7 @@
     QuestionnaireViewController * questionnaireViewController;
     IntroViewController * introViewController;
     TopButtonViewController * topButtonViewController;
-    
+    SliderViewController * sliderViewController;
     //
     
     void setup();
@@ -118,6 +120,7 @@
     
     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);