From d6f68a4adc6f8c1af0697710dfcadb8b22194f3b Mon Sep 17 00:00:00 2001 From: Théo de la Hogue Date: Thu, 18 Jan 2024 18:16:40 +0100 Subject: Fixing scan_path_analysis logging. --- src/argaze/ArFeatures.py | 2 +- src/argaze/DataFeatures.py | 2 +- src/argaze/utils/demo_data/demo_gaze_analysis_setup.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py index 5782512..7e7545e 100644 --- a/src/argaze/ArFeatures.py +++ b/src/argaze/ArFeatures.py @@ -978,7 +978,7 @@ class ArFrame(DataFeatures.SharedObject): look_data = DataFeatures.DataDictionary({ "gaze_position": self.__gaze_position, "gaze_movement": identified_gaze_movement, - "scan_step_analysis": DataFeatures.DataDictionary(scan_step_analysis), + "scan_path_analysis": DataFeatures.DataDictionary(scan_step_analysis), "execution_times": DataFeatures.DataDictionary(execution_times), "exception": exception, "layers": DataFeatures.DataDictionary(layers_look_data) diff --git a/src/argaze/DataFeatures.py b/src/argaze/DataFeatures.py index 1f3ae7a..d58cecf 100644 --- a/src/argaze/DataFeatures.py +++ b/src/argaze/DataFeatures.py @@ -467,7 +467,7 @@ class TimeStampedDataLogger(): if eval(self.selector, globals(), data): - return self.emit(eval(self.formatter, globals(), data)) + self.emit(eval(self.formatter, globals(), data)) def emit(self, formatted_log: any): """Emit formatted log to a destination.""" diff --git a/src/argaze/utils/demo_data/demo_gaze_analysis_setup.json b/src/argaze/utils/demo_data/demo_gaze_analysis_setup.json index a8ff8f2..008727e 100644 --- a/src/argaze/utils/demo_data/demo_gaze_analysis_setup.json +++ b/src/argaze/utils/demo_data/demo_gaze_analysis_setup.json @@ -49,9 +49,9 @@ }, "loggers": { "File" : { - "path": "_export/logs/KCoefficient.csv", + "path": "_export/logs/KCoefficientModified.csv", "header": "Timestamp (ms), K", - "selector": "GazeFeatures.is_fixation(gaze_movement) and gaze_movement.finished and 'argaze.GazeAnalysis.KCoefficient' in aoi_scan_path_analysis", + "selector": "'argaze.GazeAnalysis.KCoefficient' in aoi_scan_path_analysis", "formatter": "timestamp, aoi_scan_path_analysis['argaze.GazeAnalysis.KCoefficient'].K" } } @@ -59,7 +59,7 @@ }, "loggers": { "File" : { - "path": "_export/logs/fixations.csv", + "path": "_export/logs/Fixations.csv", "header": "Timestamp (ms), Focus (px), Duration (ms), AOI", "selector": "GazeFeatures.is_fixation(gaze_movement) and gaze_movement.finished", "formatter": "timestamp, gaze_movement.focus, gaze_movement.duration, layers.main_layer.looked_aoi_name" -- cgit v1.1