diff testApp.mm @ 28:e2c62db1e265

Started timer stuff

--- a/testApp.mm	Wed Feb 13 17:03:56 2013 +0000
+++ b/testApp.mm	Mon Feb 18 11:45:05 2013 +0000
@@ -25,7 +25,7 @@
 
 	// open an outgoing connection to HOST:PORT
 	sender.setup( HOST, PORT );
-    ofSetFrameRate(30);
+    ofSetFrameRate(50);
     // reciever
     lastMoveTime = ofGetSystemTimeMicros();
     prevTouchX = 0;
@@ -82,10 +82,9 @@
     [ofxiPhoneGetGLParentView() addSubview:bottomTabViewController.view];
 	
     [bottomTabViewController setAppRef:(id)this];
-    [bottomTabViewController show:(id)this];
-    
     bottomTabViewController.view.frame = CGRectMake(0,getHeight()-44,getWidth(),44);
     
+
     /////
     
     topButtonViewController	= [[TopButtonViewController alloc] initWithNibName:@"TopButtonViewController" bundle:nil];
@@ -115,6 +114,8 @@
     presetManager.startupLoadAll();
     eventLogger.init();
     
+    // timer.init();
+    
     whichInterfaceShowing = SLIDERS;
     setAllGUISliders(theGridView.getParams());
     // GO
@@ -210,16 +211,16 @@
 
 }
 //--------------------------------------------------------------
-void testApp::questionnaireHidden(vector<int> answers){
+void testApp::questionnaireHidden(vector<int> answers, const char* userComments){
     // send answers to server as json
-    eventLogger.questionnaireAnswersObtained(answers);
+    eventLogger.questionnaireAnswersObtained(answers, userComments);
     
     // set "we've done questionnaire" to true in event logger
     paused = false;
 
     whichInterfaceShowing = BOTH;
     // tell bottomtabviewcontroller
-    
+    [bottomTabViewController show:(id)this];
 }
 //--------------------------------------------------------------
 void testApp::showIntro(){
@@ -298,6 +299,7 @@
         ofxUISlider *slider;
         slider = (ofxUISlider *)sliderGUI->addWidgetDown(new ofxUISlider(length,dim,0.0,127,64,sliderParamNames[i-1]));
         slider->setDrawPadding(true);
+        slider->setDrawPaddingOutline(true);
         if(i <= 5){
             slider->setColorFill(ofColor(0,0,255));
             slider->setColorFillHighlight(ofColor(0,0,255));
@@ -428,7 +430,7 @@
 
         if(moveVel.norm() > 0.3){
             if(theGridView.snapped){
-                // stop it, send snap event
+                // stop it (snap check sends snap event)
                 moveVel.setCoord(0.0,0.0);
             }else{
                 theGridView.move(moveVel);
@@ -449,6 +451,7 @@
         }
 
     }
+    // ZOOM MOMENTUM
     // continiue to zoom at velocity
     if (numActiveTouches < 2 && abs(zoomVel)>0.001){
         theGridView.zoom(zoomVel + 1.0); // +1 because zoomVel factor is + or - , wheras zoom is a multiplier near 1