diff eventLogger.h @ 9:346807b47860

added extra files: JSON stuff and ofxPD altered
example code.

--- a/eventLogger.h	Thu Jan 10 18:24:26 2013 +0000
+++ b/eventLogger.h	Wed Jan 16 13:44:07 2013 +0000
@@ -27,8 +27,16 @@
 #import "iViewController.h"
 
 
-
-enum leventType {SAVE_PRESET, SAVE_DESET, SCROLL, SCROLL_STOPPED, ZOOM, CHANGE_SLIDER, SWAP_VIEW, SET_MIN_ZOOM, SET_MAX_ZOOM};
+// can add but don't change ordering - this will invalidate logs
+enum leventType {SAVE_PRESET,
+    SAVE_DESET,
+    SCROLL,
+    SCROLL_STOPPED,
+    ZOOM,
+    CHANGE_SLIDER,
+    SWAP_VIEW,
+    SET_MIN_ZOOM,
+    SET_MAX_ZOOM};
 
 //---------------------------------------------------------------------------
 
@@ -39,17 +47,25 @@
     double val1; // x coord, scale if zoom
     double val2; // y coord, 0 if zoom
     int sliderID;
+    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);
+        
     }
     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();
+        
     }
     Json::Value eventToJson(){
         Json::Value jevt;
@@ -57,6 +73,7 @@
         jevt["val1"] = val1;
         jevt["val2"] = val2;
         jevt["sliderID"] = sliderID;
+        jevt["eventTime"] = eventTime;
         return jevt;
     }
 };
@@ -94,7 +111,7 @@
      time, type, value
      */
     bool loggingEnabled;
-    
+    bool internetConnectionOK;
     vector<lEvent> theEvents;
     
     
@@ -105,9 +122,10 @@
     unsigned int nextUploadQty;
     EventLogger();
     void init();
+    bool testConnection();
     void setUsername(const char *u);
     void logEvent(const leventType& evtType,const TwoVector& centre = TwoVector(), const double& scale = 1.0, const int& sliderID = -1, const double& sliderVal = 0.0);
-    void logEvent(const leventType& evtType,const int& sliderID, const double& sliderVal);
+
     void sendHttp();
     void checkLogFile();
     bool attemptUpload();