diff eventLogger.mm @ 16:fb2ef16dd013

Split alert views. Settled on using portrait mode.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Thu, 17 Jan 2013 18:21:48 +0000
parents 6a9191f5b269
children 8c0783739337
line wrap: on
line diff
--- a/eventLogger.mm	Thu Jan 17 13:01:19 2013 +0000
+++ b/eventLogger.mm	Thu Jan 17 18:21:48 2013 +0000
@@ -11,15 +11,11 @@
 
 
 EventLogger eventLogger;
-extern IViewController *iViewController;
+extern UsernameAlertViewController *usernameAlertViewController;
 
 //---------------------------------------------------------------------------
 EventLogger::EventLogger(){
     //QuestionnaireViewController * questionnaireViewController;
- 
-    questionnaireViewController	= [[QuestionnaireViewController alloc] initWithNibName:@"QuestionnaireViewController" bundle:nil];
-    
-	
 
     
     loggingEnabled = true;
@@ -34,7 +30,7 @@
     
     testConnection();
 
-    [ofxiPhoneGetGLParentView() addSubview:questionnaireViewController.view];
+
 }
 //---------------------------------------------------------------------------
 bool EventLogger::testConnection(){
@@ -114,13 +110,7 @@
     cout << "Total interaction time: " << totalInteractionTime << '\n';
     
     if(totalInteractionTime > 0){
-        // questionnaireViewController.show;
-        [questionnaireViewController show:(id)this];
-        
-        //IF THE VIEW IS HIDDEN LETS BRING IT BACK!
-        if( questionnaireViewController.view.hidden ){
-            questionnaireViewController.view.hidden = NO;
-        }
+        // testApp.showQuestionnaire();
         
     }
     // is there logged stuff that hasn't been uploaded yet?
@@ -183,7 +173,7 @@
     deviceID = ofGetSystemTimeMicros();
     totalInteractionTime = 0;
     
-    [iViewController showUserNamePrompt];
+    [usernameAlertViewController showUserNamePrompt];
     // then we get userName via setUsername, called from button delegate
     
 }