Allowing to disable precision circle drawing. Loading time stamped gaze positions from json file

1 files changed, 25 insertions, 5 deletions

diff --git a/src/argaze/GazeFeatures.py b/src/argaze/GazeFeatures.py
index c3778bb..f3fa45a 100644
--- a/src/argaze/GazeFeatures.py
+++ b/src/argaze/GazeFeatures.py
@@ -3,6 +3,7 @@
 from typing import TypeVar, Tuple
 from dataclasses import dataclass, field
 import math
+import ast
 import json
 
 from argaze import DataStructures
@@ -66,7 +67,7 @@ class GazePosition():
         else:
             return dist < self.precision
 
-    def draw(self, frame, color=(0, 255, 255)):
+    def draw(self, frame, color=(0, 255, 255), draw_precision=True):
         """Draw gaze position point and precision circle."""
 
         if self.valid:
@@ -77,8 +78,8 @@ class GazePosition():
             cv.circle(frame, int_value, 2, color, -1)
 
             # Draw precision circle
-            if self.precision > 0:
-                cv.circle(frame, int_value, round(self.precision), color, 1)
+            if self.precision > 0 and draw_precision:
+                cv.circle(frame, int_value, round(self.precision), color_precision, 1)
 
 class UnvalidGazePosition(GazePosition):
     """Unvalid gaze position."""
@@ -89,6 +90,9 @@ class UnvalidGazePosition(GazePosition):
 
         super().__init__((None, None), precision=None)
 
+TimeStampedGazePositionsType = TypeVar('TimeStampedGazePositions', bound="TimeStampedGazePositions")
+# Type definition for type annotation convenience
+
 class TimeStampedGazePositions(DataStructures.TimeStampedBuffer):
     """Define timestamped buffer to store gaze positions."""
 
@@ -98,14 +102,30 @@ class TimeStampedGazePositions(DataStructures.TimeStampedBuffer):
         # Convert dict into GazePosition
         if type(value) == dict:
 
-            assert(set(["value", "precision"]).issubset(value.keys()))
+            assert(set(['value', 'precision']).issubset(value.keys()))
+
+            if 'message' in value.keys():
+
+                value = UnvalidGazePosition(value['message'])
+
+            else:
 
-            value = GazePosition(value["value"], precision=value["precision"])
+                value = GazePosition(value['value'], precision=value['precision'])
 
         assert(type(value) == GazePosition or type(value) == UnvalidGazePosition)
 
         super().__setitem__(key, value)
 
+    @classmethod
+    def from_json(self, json_filepath: str) -> TimeStampedGazePositionsType:
+        """Create a TimeStampedGazePositionsType from .json file."""
+
+        with open(json_filepath, encoding='utf-8') as ts_buffer_file:
+
+            json_buffer = json.load(ts_buffer_file)
+
+            return TimeStampedGazePositions({ast.literal_eval(ts_str): json_buffer[ts_str] for ts_str in json_buffer})
+
 GazeMovementType = TypeVar('GazeMovement', bound="GazeMovement")
 # Type definition for type annotation convenience