comparison eventLogger.h @ 25:f42a00e3f22d

Logs condensed slightly. Questionnaire button enable.
double precision location!!!

 // uploading logs to server, and storing locally if not uploaded
 
 #ifndef __oscSenderExample__eventLogger__
 #define __oscSenderExample__eventLogger__
 
-#define EVENT_LOG_FILENAME "log.json"
-#define SERVER_URL "http://127.0.0.1:8080/testservice/"
 
 #include "ofMain.h"
 #include "ofxiPhone.h"
 #include "2dvector.h"
 #include "ofxiPhoneExtras.h"

 #include <map>
 #include "2dvector.h"
 #include "json.h"
 #include "testApp.h"
 
-#import "usernameAlertViewController.h"
 
 
+
+
+#define EVENT_LOG_FILENAME "log.json"
+#define SERVER_URL "http://127.0.0.1:8080/testservice/"
+#define UPLOAD_CHUNK_SIZE 500
+#define QUESTIONNAIRE_ENABLE_TIME 100000 // milliseconds
+#define APP_CREATION_TIME 381429000000   // milliseconds to the time i wrote this wee blighter 
+
+#define PROGRAM_VERSION 1.0 // IMPORTANT TOCHNAGE!
+
 // can add but don't change ordering - this will invalidate logs
-#define PROGRAM_VERSION 1.0
-enum leventType {SAVE_PRESET,
-    SAVE_DESET,
-    SCROLL,
-    ZOOM,
-    SCROLL_STOPPED,
-    ZOOM_STOPPED,
-    SNAPPED_TO_PRESET,
-    CHANGE_SLIDER,
-    SWAP_VIEW,
-    SET_MIN_ZOOM,
-    SET_MAX_ZOOM};
+enum leventType {SAVE_PRESET,  // 0
+    SAVE_DESET,           // 1
+    SCROLL,               // 2
+    ZOOM,                 // 3
+    SCROLL_STOPPED,        // 4
+    ZOOM_STOPPED,           // 5
+    SNAPPED_TO_PRESET,      // 6
+    CHANGE_SLIDER,          // 7
+    SWAP_VIEW,              // 8
+    SET_MIN_ZOOM,           // 9
+    SET_MAX_ZOOM,           // 10
+    RANDOMISE,             // 11
+    APP_STARTED,            // 12
+    APP_EXITED,             // 13
+    CONSENT_DENIED,         // 14
+    SEQ_LOCKED,             // 15
+    SYNTH_LOCKED,           // 16
+    PLAY_PRESSED,           // 17
+    PAUSE_PRESSED};         // 18
 
 //---------------------------------------------------------------------------
 
 class lEvent{
 public:
     // try and make this as compact as possible.
     leventType eventType;
     double val1; // x coord, scale if zoom
     double val2; // y coord, 0 if zoom
-    int sliderID;
+    int sliderID; // xtra int 
     long long eventTime;
     lEvent(leventType eType, double v1 = 0.0, double v2 = 0.0,int sID = 0){
         eventType = eType;
         val1 = v1;
         val2 = v2;
         sliderID = sID;
         
         double timemsd = [NSDate timeIntervalSinceReferenceDate];
-        eventTime = (unsigned long long)(timemsd*1000);
+        eventTime = (unsigned long long)(timemsd*1000) - APP_CREATION_TIME;
         
     }
+
     lEvent(const Json::Value &jevt){
     // constructor takes "jsonToEvent" readfile function role
-        eventType = (leventType)jevt["eventType"].asInt();
-        val1 = jevt["val1"].asFloat();
-        val2 = jevt["val2"].asFloat();
-        sliderID = jevt["sliderID"].asInt();
-        eventTime = jevt["eventTime"].asLargestInt();
+        eventType = (leventType)jevt["eType"].asInt();
+        val1 = jevt["v1"].asDouble();
+        val2 = jevt["v2"].asDouble();
+        sliderID = jevt["sID"].asInt();
+        eventTime = jevt["eTime"].asLargestInt();
         
         // TODO what happens if we try to read one that isn't there?
         
     }
     Json::Value eventToJson(){
         Json::Value jevt;
-        jevt["eventType"] = eventType;
-        jevt["val1"] = val1;
-        jevt["val2"] = val2;
-        jevt["sliderID"] = sliderID;
-        jevt["eventTime"] = eventTime;
+        jevt["eType"] = eventType;
+        // here: should give a certain number of sig figs? 
+        jevt["v1"] = val1;
+        jevt["v2"] = val2;
+        jevt["sID"] = sliderID;
+        jevt["eTime"] = eventTime;
         return jevt;
     }
 };
 //---------------------------------------------------------------------------
 // streams no longer used

 }
  //---------------------------------------------------------------------------   
 
 class EventLogger{
 public:
+    int nextUploadNumber;
     bool loggingEnabled;
     bool serverConnectionOK;
+    bool consentGiven;
     unsigned int deviceID; // unique get something from hardware??
-    unsigned int totalInteractionTime, sessionTime, sessionStartTime;
+    unsigned int totalInteractionTime, savedInteractionTime, sessionTime, sessionStartTime;
     string userName; // not unique
     
     EventLogger();
     void init();
     void exitAndSave();