From 17421ad328d4addb3bac1a32fb53488025f8a3f4 Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Thu, 21 Mar 2024 23:44:43 +0100
Subject: Fixing gaze analysis demo.

---
 docs/user_guide/gaze_analysis_pipeline/aoi_analysis.md         |  8 ++++----
 .../gaze_analysis_pipeline/configuration_and_execution.md      |  6 +++---
 docs/user_guide/gaze_analysis_pipeline/logging.md              | 10 +++++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'docs')

diff --git a/docs/user_guide/gaze_analysis_pipeline/aoi_analysis.md b/docs/user_guide/gaze_analysis_pipeline/aoi_analysis.md
index 66fa12f..b7a4342 100644
--- a/docs/user_guide/gaze_analysis_pipeline/aoi_analysis.md
+++ b/docs/user_guide/gaze_analysis_pipeline/aoi_analysis.md
@@ -37,7 +37,7 @@ Here is an extract from the JSON [ArFrame](../../argaze.md/#argaze.ArFeatures.Ar
 			    }
         	},
         	"aoi_matcher": {
-                "DeviationCircleCoverage": {
+                "argaze.GazeAnalysis.DeviationCircleCoverage.AOIMatcher": {
                     "coverage_threshold": 0.5
                 }
             },
@@ -45,9 +45,9 @@ Here is an extract from the JSON [ArFrame](../../argaze.md/#argaze.ArFeatures.Ar
         		"duration_max": 30000
         	},
 			"aoi_scan_path_analyzers": {
-				"Basic": {},
-				"TransitionMatrix": {},
-				"NGram": {
+				"argaze.GazeAnalysis.Basic.AOIScanPathAnalyzer": {},
+				"argaze.GazeAnalysis.TransitionMatrix.AOIScanPathAnalyzer": {},
+				"argaze.GazeAnalysis.NGram.AOIScanPathAnalyzer": {
 					"n_min": 3,
 					"n_max": 5
 				}
diff --git a/docs/user_guide/gaze_analysis_pipeline/configuration_and_execution.md b/docs/user_guide/gaze_analysis_pipeline/configuration_and_execution.md
index e7a5c17..784a411 100644
--- a/docs/user_guide/gaze_analysis_pipeline/configuration_and_execution.md
+++ b/docs/user_guide/gaze_analysis_pipeline/configuration_and_execution.md
@@ -16,7 +16,7 @@ Here is a simple JSON [ArFrame](../../argaze.md/#argaze.ArFeatures.ArFrame) conf
 	"name": "My FullHD screen",
 	"size": [1920, 1080],
 	"gaze_movement_identifier": {
-		"DispersionThresholdIdentification": {
+		"argaze.GazeAnalasis.DispersionThresholdIdentification.GazeMovementIdentifier": {
 			"deviation_max_threshold": 50,
 			"duration_min_threshold": 200
 		}
@@ -25,8 +25,8 @@ Here is a simple JSON [ArFrame](../../argaze.md/#argaze.ArFeatures.ArFrame) conf
 		"duration_max": 30000
 	},
 	"scan_path_analyzers": {
-		"Basic": {},
-		"ExploreExploitRatio": {
+		"argaze.GazeAnalasis.Basic.ScanPathAnalyzer": {},
+		"argaze.GazeAnalasis.ExploreExploitRatio.ScanPathAnalyzer": {
             "short_fixation_duration_threshold": 0
         }
 	}
diff --git a/docs/user_guide/gaze_analysis_pipeline/logging.md b/docs/user_guide/gaze_analysis_pipeline/logging.md
index 9cfe152..6ed497b 100644
--- a/docs/user_guide/gaze_analysis_pipeline/logging.md
+++ b/docs/user_guide/gaze_analysis_pipeline/logging.md
@@ -40,6 +40,7 @@ Here is *my_frame_logger.py* file:
 
 ```python
 from argaze import DataFeatures
+from argaze.GazeAnalysis import Basic
 from argaze.utils import UtilsFeatures
 
 class ScanPathAnalysisLogger(DataFeatures.PipelineStepObserver, UtilsFeatures.FileWriter):
@@ -49,10 +50,12 @@ class ScanPathAnalysisLogger(DataFeatures.PipelineStepObserver, UtilsFeatures.Fi
 
         if ar_frame.is_analysis_available():
 
+            analysis = ar_frame.analysis()
+
             log = (
                 timestamp, 
-                ar_frame.analysis['argaze.GazeAnalysis.Basic'].path_duration, 
-                ar_frame.analysis['argaze.GazeAnalysis.Basic'].steps_number
+                analysis[Basic.ScanPathAnalyzer].path_duration, 
+                analysis[Basic.ScanPathAnalyzer].steps_number
             )
 
             # Write to file
@@ -75,6 +78,7 @@ Here is *my_layer_logger.py* file:
 
 ```python
 from argaze import DataFeatures
+from argaze.GazeAnalysis import NGram
 from argaze.utils import UtilsFeatures
 
 class AOIScanPathAnalysisLogger(DataFeatures.PipelineStepObserver, UtilsFeatures.FileWriter):
@@ -86,7 +90,7 @@ class AOIScanPathAnalysisLogger(DataFeatures.PipelineStepObserver, UtilsFeatures
 
             log = (
                 timestamp,
-                ar_layer.analysis['argaze.GazeAnalysis.NGram'].ngrams_count
+                ar_layer.analysis[NGram.AOIScanPathAnalyzer].ngrams_count
             )
 
             # Write to file
-- 
cgit v1.1