comparison eventLogger.h @ 33:92dba082d957

Added trail and EVALUATION_POINT event type.

 #include "2dvector.h"
 #include "json.h"
 #include "testApp.h"
 #include "presetManager.h"
 #import "ServerComms.h"
- 
-#define EVENT_THIN_FACTOR 10
+#include "grid.h"
+
+#define EVENT_THIN_FACTOR 15
 #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 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.3 // IMPORTANT TOCHNAGE!
+
+#define SUPERVISED // this def will save files
+
 
 // can add but don't change ordering - this will invalidate logs
 enum leventType {SAVE_PRESET,  // 0
     SAVE_DESET,           // 1
     SCROLL,               // 2

     SEQ_LOCKED,             // 15
     SYNTH_LOCKED,           // 16
     PLAY_PRESSED,           // 17
     PAUSE_PRESSED,         // 18
     HELP_PRESSED,            // 19
-    QUESTIONNAIRE_COMPLETED};     // 20
+    QUESTIONNAIRE_COMPLETED,  // 20
+    EVALUATION_POINT,       // 21
+    EMPTY_EVENT};          // 22
 
 //---------------------------------------------------------------------------
 
 class lEvent{
 public:

         jevt["v2"] = val2;
         jevt["sID"] = sliderID;
         jevt["eTime"] = eventTime;
         return jevt;
     }
+    void draw();
 };
 //---------------------------------------------------------------------------
 // streams no longer used
 inline istream& operator>>(istream & is, lEvent& e){
     is.setf(ios_base::fixed,ios_base::floatfield);

     void eventlogNotOK();
     void testConnectionNotOK();
     
     void printAll();
     void saveSessionToFile();
+    void drawTrail(const TwoVector min, const TwoVector max);
+    vector<lEvent> getDrawableEventsInRange(const TwoVector min, const TwoVector max);
+    vector<TwoVector> getRecentPath(int numEvents);
 private:
   
     vector<lEvent> theEvents;
 
     void thinnedLogEvent(lEvent nextEvent);
+    void thinnedScrollEvent(lEvent nextEvent);
     unsigned int nextUploadQty;
 
     string questionnaireComments;
     
     ofxiPhoneDeviceType iOSdeviceType;