diff eventLogger.h @ 32:ab7c86d0f3d8

V0.3 SZBeta sent out. bristol tests.

--- a/eventLogger.h	Fri Mar 01 13:28:45 2013 +0000
+++ b/eventLogger.h	Fri Mar 08 14:54:55 2013 +0000
@@ -24,18 +24,18 @@
 #include "2dvector.h"
 #include "json.h"
 #include "testApp.h"
-
+#include "presetManager.h"
 #import "ServerComms.h"
  
 #define EVENT_THIN_FACTOR 10
 #define EVENT_LOG_FILENAME "log.json"
 //#define LOGGING_SERVER_URL "http://www.isophonics.net/datacollector/"
 #define LOGGING_SERVER_URL "http://127.0.0.1:8080/testservice/"
-#define UPLOAD_CHUNK_SIZE 2000
+#define UPLOAD_CHUNK_SIZE 1000
 
 #define APP_CREATION_TIME 381429000000   // milliseconds to the time i wrote this wee blighter. saves digits
 
-#define PROGRAM_VERSION 0.2 // IMPORTANT TOCHNAGE!
+#define PROGRAM_VERSION 0.3 // IMPORTANT TOCHNAGE!
 
 // can add but don't change ordering - this will invalidate logs
 enum leventType {SAVE_PRESET,  // 0
@@ -69,7 +69,7 @@
     double val1; // x coord, scale if zoom
     double val2; // y coord, 0 if zoom
     int sliderID; // xtra int 
-    long long eventTime;
+    long long eventTime; // MILLISECONDS since app creation
     lEvent(leventType eType, double v1 = 0.0, double v2 = 0.0,int sID = 0){
         eventType = eType;
         val1 = v1;
@@ -129,14 +129,7 @@
     return os;
 }
  //---------------------------------------------------------------------------   
-    
-    class ThreadedObject: ofThread{
-        int i;
-        int threadedFunc(int i){
-            return i + 10;
-        };
-    };
-    
+ 
     
 class EventLogger{
 public:
@@ -173,6 +166,7 @@
     void testConnectionNotOK();
     
     void printAll();
+    void saveSessionToFile();
 private:
   
     vector<lEvent> theEvents;