Edit context names for mutiple devices from the same ET company

8 files changed, 15 insertions, 33 deletions

diff --git a/src/argaze/utils/contexts/PupilLabs.py b/src/argaze/utils/contexts/PupilLabsInvisible.py
index 035915b..5c9a138 100644
--- a/src/argaze/utils/contexts/PupilLabs.py
+++ b/src/argaze/utils/contexts/PupilLabsInvisible.py
@@ -44,7 +44,7 @@ class LiveStream(ArFeatures.DataCaptureContext):
 
 	def __enter__(self):
 
-		logging.info('Pupil-Labs Device connexion starts...')
+		logging.info('Pupil-Labs Invisible connexion starts...')
 
 		# Init timestamp
 		self.__start_time = time.time()
@@ -77,7 +77,7 @@ class LiveStream(ArFeatures.DataCaptureContext):
 	def __stream_gaze(self):
 		"""Stream gaze."""
 
-		logging.debug('Stream gaze from Pupil Device')
+		logging.debug('Stream gaze from Pupil Invisible')
 
 		while self.is_running():
 
@@ -108,7 +108,7 @@ class LiveStream(ArFeatures.DataCaptureContext):
 	def __stream_video(self):
 		"""Stream video."""
 
-		logging.debug('Stream video from Pupil Device')
+		logging.debug('Stream video from Pupil Invisible')
 
 		while self.is_running():
 
diff --git a/src/argaze/utils/contexts/TobiiProGlasses3.py b/src/argaze/utils/contexts/TobiiProGlasses3.py
index 7deb4d5..a53c095 100644
--- a/src/argaze/utils/contexts/TobiiProGlasses3.py
+++ b/src/argaze/utils/contexts/TobiiProGlasses3.py
@@ -1,6 +1,6 @@
 """Handle network connection to Tobii Pro G3 devices. 
 	Based on Tobii Realtime Python API.
-	g3pylib must be installed
+	g3pylib must be installed.
 """
 
 """
diff --git a/src/argaze/utils/demo/aruco_markers_pipeline.json b/src/argaze/utils/demo/aruco_markers_pipeline.json
index 0681bc3..8221cec 100644
--- a/src/argaze/utils/demo/aruco_markers_pipeline.json
+++ b/src/argaze/utils/demo/aruco_markers_pipeline.json
@@ -1,7 +1,7 @@
 {
     "argaze.ArUcoMarker.ArUcoCamera.ArUcoCamera": {
         "name": "Head-mounted camera",
-        "size": [1920, 1080],
+        "size": [1088, 1080],
         "copy_background_into_scenes_frames": true,
         "aruco_detector": {
             "dictionary": "DICT_APRILTAG_16h5",
@@ -56,7 +56,7 @@
                 },
                 "frames": {
                     "GrayRectangle": {
-                        "size": [1920, 1149],
+                        "size": [1088, 1080],
                         "background": "frame_background.jpg",
                         "gaze_movement_identifier": {
                             "argaze.GazeAnalysis.DispersionThresholdIdentification.GazeMovementIdentifier": {
@@ -71,17 +71,12 @@
                             "argaze.GazeAnalysis.Basic.ScanPathAnalyzer": {},
                             "argaze.GazeAnalysis.KCoefficient.ScanPathAnalyzer": {},
                             "argaze.GazeAnalysis.NearestNeighborIndex.ScanPathAnalyzer": {
-                                "size": [1920, 1149]
+                                "size": [1088, 1080]
                             },
                             "argaze.GazeAnalysis.ExploreExploitRatio.ScanPathAnalyzer": {
                                 "short_fixation_duration_threshold": 0
                             }
                         },
-                        "observers": {
-                            "recorders.ScanPathAnalysisRecorder": {
-                                "path": "_export/records/scan_path_metrics.csv"
-                            }
-                        },
                         "layers": {
                             "demo_layer": {
                                 "aoi_scene": "aoi_2d_scene.json",
@@ -101,11 +96,6 @@
                                         "n_max": 3
                                     },
                                     "argaze.GazeAnalysis.Entropy.AOIScanPathAnalyzer":{}
-                                },
-                                "observers": {
-                                    "recorders.AOIScanPathAnalysisRecorder": {
-                                        "path": "_export/records/aoi_scan_path_metrics.csv"
-                                    }
                                 }
                             }
                         },
@@ -152,14 +142,6 @@
                     }
                 }
             }
-        },
-        "observers": {
-            "argaze.utils.UtilsFeatures.LookPerformanceRecorder": {
-                "path": "_export/records/look_performance.csv"
-            },
-            "argaze.utils.UtilsFeatures.WatchPerformanceRecorder": {
-                "path": "_export/records/watch_performance.csv"
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/argaze/utils/demo/gaze_analysis_pipeline.json b/src/argaze/utils/demo/gaze_analysis_pipeline.json
index 8b8212e..6e23321 100644
--- a/src/argaze/utils/demo/gaze_analysis_pipeline.json
+++ b/src/argaze/utils/demo/gaze_analysis_pipeline.json
@@ -1,7 +1,7 @@
 {
     "argaze.ArFeatures.ArFrame": {
         "name": "GrayRectangle",
-        "size": [1920, 1149],
+        "size": [1088, 1080],
         "background": "frame_background.jpg",
         "gaze_movement_identifier": {
             "argaze.GazeAnalysis.DispersionThresholdIdentification.GazeMovementIdentifier": {
diff --git a/src/argaze/utils/demo/pupillabs_invisible_live_stream_context.json b/src/argaze/utils/demo/pupillabs_invisible_live_stream_context.json
new file mode 100644
index 0000000..3418de6
--- /dev/null
+++ b/src/argaze/utils/demo/pupillabs_invisible_live_stream_context.json
@@ -0,0 +1,6 @@
+{
+    "argaze.utils.contexts.PupilLabsInvisible.LiveStream" : {
+        "name": "PupilLabs Invisible",
+        "pipeline": "aruco_markers_pipeline.json"
+    }
+}
\ No newline at end of file
diff --git a/src/argaze/utils/demo/pupillabs_live_stream_context.json b/src/argaze/utils/demo/pupillabs_live_stream_context.json
deleted file mode 100644
index bcb7263..0000000
--- a/src/argaze/utils/demo/pupillabs_live_stream_context.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "argaze.utils.contexts.PupilLabs.LiveStream" : {
-        "name": "PupilLabs",
-        "pipeline": "aruco_markers_pipeline.json"
-    }
-}
\ No newline at end of file
diff --git a/src/argaze/utils/demo/tobii_live_stream_context.json b/src/argaze/utils/demo/tobii_g2_live_stream_context.json
index 6950617..6950617 100644
--- a/src/argaze/utils/demo/tobii_live_stream_context.json
+++ b/src/argaze/utils/demo/tobii_g2_live_stream_context.json
diff --git a/src/argaze/utils/demo/tobii_g3_live_stream_context.json b/src/argaze/utils/demo/tobii_g3_live_stream_context.json
index 4619b3c..20f6ab1 100644
--- a/src/argaze/utils/demo/tobii_g3_live_stream_context.json
+++ b/src/argaze/utils/demo/tobii_g3_live_stream_context.json
@@ -1,6 +1,6 @@
 {
     "argaze.utils.contexts.TobiiProGlasses3.LiveStream" : {
-        "name": "TobiiProGlasses3",
+        "name": "Tobii Pro Glasses 3 live stream",
         "pipeline": "aruco_markers_pipeline.json"
     }
 }
\ No newline at end of file