Added more time measurements

iTrace-Dev · Jul 10, 2014 · 7eb90af · 7eb90af
1 parent 556132a
commit 7eb90af
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 27 deletions.
diff --git a/src/edu/ysu/itrace/Gaze.java b/src/edu/ysu/itrace/Gaze.java
@@ -2,8 +2,6 @@
 
 import java.util.Date;
 
-import edu.ysu.itrace.gaze.IGazeResponse;
-
 public class Gaze {
     //Between 0.0 and 1.0
     private double x, left_x, right_x;
@@ -12,7 +10,9 @@ public class Gaze {
     private double left_validity;
     private double right_validity;
 
-    private Date timeStamp;
+    private Date trackerTime;
+    private long systemTime = System.currentTimeMillis();
+    private long nanoTime = System.nanoTime();
 
     public Gaze(double left_x, double right_x, double left_y, double right_y,
                 double left_validity, double right_validity, Date timestamp) {
@@ -25,7 +25,7 @@ public Gaze(double left_x, double right_x, double left_y, double right_y,
         this.x = (left_x + right_x) / 2;
         this.y = (left_y + right_y) / 2;
 
-        this.timeStamp = timestamp;
+        this.trackerTime = timestamp;
         this.left_validity = left_validity;
         this.right_validity = right_validity;
     }
@@ -62,7 +62,15 @@ public double getRightValidity() {
         return right_validity;
     }
 
-    public Date getTimeStamp() {
-        return timeStamp;
+    public Date getTrackerTime() {
+        return trackerTime;
+    }
+
+    public long getSystemTime() {
+        return systemTime;
+    }
+
+    public long getNanoTime() {
+        return nanoTime;
     }
 }
diff --git a/src/edu/ysu/itrace/Link.java b/src/edu/ysu/itrace/Link.java
@@ -27,8 +27,8 @@ public void addOccurance(Gaze startGaze, Gaze endGaze) {
 
     private void calculateTimespan(Gaze startGaze, Gaze endGaze) {
         // get time in milliseconds between gazes
-        long difference = endGaze.getTimeStamp().getTime()
-                          - startGaze.getTimeStamp().getTime();
+        long difference = endGaze.getTrackerTime().getTime()
+                          - startGaze.getTrackerTime().getTime();
 
         if (timespan != 0){
             // average the current timespan and the new one together

diff --git a/src/edu/ysu/itrace/solvers/JSONGazeExportSolver.java b/src/edu/ysu/itrace/solvers/JSONGazeExportSolver.java
@@ -87,12 +87,23 @@ public void init() {
         System.out.println("Putting files at " + outFile.getAbsolutePath());
 
         try {
-            responseWriter.beginObject().name("environment").beginObject()
-                    .name("screen-size").beginObject().name("width")
-                    .value(screenRect.width).name("height")
-                    .value(screenRect.height).endObject().name("line-height")
-                    .value(lineHeight).name("font-height").value(fontHeight)
-                    .endObject().name("gazes").beginArray();
+            responseWriter.beginObject()
+                              .name("environment")
+                              .beginObject()
+                                  .name("screen_size")
+                                  .beginObject()
+                                      .name("width")
+                                      .value(screenRect.width)
+                                      .name("height")
+                                      .value(screenRect.height)
+                                  .endObject()
+                                  .name("line_height")
+                                  .value(lineHeight)
+                                  .name("font_height")
+                                  .value(fontHeight)
+                              .endObject()
+                              .name("gazes")
+                              .beginArray();
         } catch (IOException e) {
             throw new RuntimeException("Log file header could not be written: "
                     + e.getMessage());
@@ -108,21 +119,32 @@ public void process(IGazeResponse response) {
                 int screenY =
                         (int) (screenRect.height * response.getGaze().getY());
 
-                responseWriter.beginObject().name("file")
-                        .value(response.getName()).name("type")
-                        .value(response.getType()).name("x").value(screenX)
-                        .name("y").value(screenY).name("left-validation")
-                        .value(response.getGaze().getLeftValidity())
-                        .name("right-validation")
-                        .value(response.getGaze().getRightValidity())
-                        .name("timestamp")
-                        .value(response.getGaze().getTimeStamp().getTime());
+                responseWriter.beginObject()
+                                .name("file")
+                                .value(response.getName())
+                                .name("type")
+                                .value(response.getType())
+                                .name("x")
+                                .value(screenX)
+                                .name("y")
+                                .value(screenY)
+                                .name("left_validation")
+                                .value(response.getGaze().getLeftValidity())
+                                .name("right_validation")
+                                .value(response.getGaze().getRightValidity())
+                                .name("tracker_time")
+                                .value(response.getGaze().getTrackerTime().getTime())
+                                .name("system_time")
+                                .value(response.getGaze().getSystemTime())
+                                .name("nano_time")
+                                .value(response.getGaze().getNanoTime());
 
                 for (Iterator<Entry<String, String>> entries =
                         response.getProperties().entrySet().iterator(); entries
                         .hasNext();) {
                     Entry<String, String> pair = entries.next();
-                    responseWriter.name(pair.getKey()).value(pair.getValue());
+                    responseWriter.name(pair.getKey())
+                                  .value(pair.getValue());
                 }
 
                 responseWriter.endObject();

diff --git a/src/edu/ysu/itrace/solvers/XMLGazeExportSolver.java b/src/edu/ysu/itrace/solvers/XMLGazeExportSolver.java
@@ -143,9 +143,15 @@ public void process(IGazeResponse response) {
                 responseWriter.writeAttribute("right-validation",
                         String.valueOf(response.getGaze().getRightValidity()));
                 responseWriter.writeAttribute(
-                        "timestamp",
-                        String.valueOf(response.getGaze().getTimeStamp()
+                        "tracker-time",
+                        String.valueOf(response.getGaze().getTrackerTime()
                                 .getTime()));
+                responseWriter.writeAttribute(
+                        "system-time",
+                        String.valueOf(response.getGaze().getSystemTime()));
+                responseWriter.writeAttribute(
+                        "nano-time",
+                        String.valueOf(response.getGaze().getNanoTime()));
 
                 for (Iterator<Entry<String, String>> entries =
                         response.getProperties().entrySet().iterator(); entries

diff --git a/src/edu/ysu/itrace/trackers/TobiiTracker.java b/src/edu/ysu/itrace/trackers/TobiiTracker.java
@@ -112,7 +112,7 @@ public static void main(String[] args) {
             while ((new Date()).getTime() < start + 25000) {
                 Gaze gaze = tobii_tracker.getGaze();
                 if (gaze != null) {
-                    System.out.println("Gaze at " + gaze.getTimeStamp() + ": ("
+                    System.out.println("Gaze at " + gaze.getTrackerTime() + ": ("
                             + (int) (gaze.getX() * window_bounds.width) + ", "
                             + (int) (gaze.getY() * window_bounds.height)
                             + ") with validity (Left: " + gaze.getLeftValidity()