diff testApp.h @ 16:fb2ef16dd013

Split alert views. Settled on using portrait mode.

--- a/testApp.h	Thu Jan 17 13:01:19 2013 +0000
+++ b/testApp.h	Thu Jan 17 18:21:48 2013 +0000
@@ -17,7 +17,8 @@
 
 #include "json.h"
 
-#import "iViewController.h"
+
+#import "QuestionnaireViewController.h"
 
 #define HOST "169.254.1.1"
 #define PORT 12345
@@ -31,7 +32,7 @@
     int prevTouchX;
     int prevTouchY;
     double prevDist;
-    
+    bool paused;
     // not many so dont bother with vectors/arrays?
     TwoVector touch0;
     TwoVector touch1;
@@ -55,33 +56,39 @@
     
     int numActiveTouches;
     
-    ofxiPhoneKeyboard * keyboard;
+    QuestionnaireViewController * questionnaireViewController;
     //
     
-		void setup();
-		void update();
-		void draw();
-		void exit();
-		
-		void touchDown(ofTouchEventArgs &touch);
-		void touchMoved(ofTouchEventArgs &touch);
-		void touchUp(ofTouchEventArgs &touch);
-		void touchDoubleTap(ofTouchEventArgs &touch);
-		void touchCancelled(ofTouchEventArgs &touch);
+    void setup();
+    void update();
+    void draw();
+    void exit();
+    
+    float getWidth();
+    float getHeight();
+    
+    void touchDown(ofTouchEventArgs &touch);
+    void touchMoved(ofTouchEventArgs &touch);
+    void touchUp(ofTouchEventArgs &touch);
+    void touchDoubleTap(ofTouchEventArgs &touch);
+    void touchCancelled(ofTouchEventArgs &touch);
     
     void handleScroll();
     void handleZoom();
     
     vector<float> vectorFilter(vector<float> newVec);
-
-		void lostFocus();
-		void gotFocus();
-		void gotMemoryWarning();
-		void deviceOrientationChanged(int newOrientation);
-        
-		ofxOscSender sender;
+    
+    void lostFocus();
+    void gotFocus();
+    void gotMemoryWarning();
+    void deviceOrientationChanged(int newOrientation);
+    
+    ofxOscSender sender;
     void sendOSCParams();
     
+    void showQuestionnaire();
+    void questionnaireHidden(NSArray * answers);
+    
     // stardard GUI - knbs and sliders - hides zoomer
     bool standardGUIShowing;
     void standardGUIEvent(ofxUIEventArgs &e);