comparison eventLogger.h @ 27:ae4d2c3ce5e0

Details. Zoom trailing finger move sorted. Qs rephrased.

     APP_EXITED,             // 13
     CONSENT_DENIED,         // 14
     SEQ_LOCKED,             // 15
     SYNTH_LOCKED,           // 16
     PLAY_PRESSED,           // 17
-    PAUSE_PRESSED};         // 18
+    PAUSE_PRESSED,         // 18
+    HELP_PRESSED};          // 19
 
 //---------------------------------------------------------------------------
 
 class lEvent{
 public:

 
 class EventLogger{
 public:
     int nextUploadNumber;
     bool loggingEnabled;
+    bool logUploadInProgress;
     bool serverConnectionOK;
     bool consentGiven;
     unsigned int deviceID; // unique get something from hardware??
     unsigned int totalInteractionTime, savedInteractionTime, sessionTime, sessionStartTime;
     string userName; // not unique
-    
+
     EventLogger();
     void init();
     void exitAndSave();
     void setUsername(const char *u);
+    void newUser();
     void logEvent(const leventType& evtType,const TwoVector& centre = TwoVector(), const double& scale = 1.0, const int& sliderID = -1, const double& sliderVal = 0.0);
     void questionnaireAnswersObtained(vector<int> answers);
-    
+    void urlResponse(ofHttpResponse & response);
 private:
     // what we need...
     /*
      time, type, value
      */
 
-    
+    int currentHTTPRequestID;
     vector<lEvent> theEvents;
     
     
     // values applicable to all events
 

     bool testConnection();
     vector<int> questionnaireAnswers;
     bool questionnaireCompleted;
     bool questionnaireUploaded;
 
+    
     void checkLogFile();
-    bool uploadEventLog();
+    bool uploadEventLog(bool async);
     void firstEverAppOpen();
     void readJsonToLog(const string &jsonFile);
-    bool uploadQuestionnaire();
-    bool sendToServer(string functionName, Json::Value jsonData);
+    void uploadQuestionnaire();
+    bool sendToServer(string functionName, Json::Value jsonData, bool async);
     Json::Value logsToJson();
     Json::Value questionnaireToJson();
     void printAll(){
         cout << "ALL LOGGED EVENTS!: \n";
         vector<lEvent>::iterator evIter;