comparison eventLogger.h @ 42:3d627dce8bf0

Tidied up startup logic.

 #import "ServerComms.h"
 #include "grid.h"
 
 #define EVENT_THIN_FACTOR 12
 #define EVENT_LOG_FILENAME "log.json"
-#define UPLOAD_CHUNK_SIZE 10
+#define UPLOAD_CHUNK_SIZE 1000
 #define APP_CREATION_TIME 381429000000   // milliseconds to the time i wrote this wee blighter. saves digits
 #define SCROLL_TRAIL_LENGTH 200
 #define PROGRAM_VERSION 0.5 // NOW USES NEW HILBERT CURVE. ALL OLD PRESETS WILL BE INVALID :(
 
 #define SUPERVISED // this def will save files

 
 // constr
     EventLogger();
     
 // public methods:
-    void init();
+    void startLoadAll();
     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, const char* userComments);

 
     string questionnaireComments;
     
     ofxiPhoneDeviceType iOSdeviceType;
     
-    void testConnection();
+
     vector<int> questionnaireAnswers;
     int interfaceOrder;
 
 // private methods
+    void testConnection();
     void checkLogFile();
     void deleteLogs(); // new user
     bool uploadEventLog(bool async);
     void firstEverAppOpen();
-    void checkExistingLogFile(const string &jsonFile);
+    void loadExistingLogFile(const string &jsonFile);
     void uploadQuestionnaire();
     bool sendToServer(string functionName, Json::Value jsonData, bool async);