Merge branch 'master' of ssh://git.recherche.enac.fr/interne-ihm-aero/eye-tracking/argaze

1 files changed, 24 insertions, 13 deletions

diff --git a/docs/user_guide/gaze_analysis_pipeline/visualisation.md b/docs/user_guide/gaze_analysis_pipeline/visualisation.md
index 99f0259..5f06fac 100644
--- a/docs/user_guide/gaze_analysis_pipeline/visualisation.md
+++ b/docs/user_guide/gaze_analysis_pipeline/visualisation.md
@@ -3,7 +3,7 @@ Visualize pipeline steps
 
 Visualisation is not a pipeline step but each [ArFrame](../../argaze.md/#argaze.ArFeatures.ArFrame) pipeline steps outputs can be drawn in real time or afterward, depending of application purpose.
 
-![ArFrame visualisation](../../img/ar_frame_visualisation.png)
+![ArFrame visualisation](../../img/visualisation.png)
 
 ## Add image parameters to ArFrame JSON configuration file
 
@@ -17,6 +17,22 @@ Here is an extract from the JSON ArFrame configuration file with a sample where
     "size": [1920, 1080],
     ...
     "image_parameters": {
+        "draw_gaze_positions": {
+            "color": [0, 255, 255],
+            "size": 2
+        },
+        "draw_fixations": {
+            "deviation_circle_color": [255, 255, 255],
+            "duration_border_color": [127, 0, 127],
+            "duration_factor": 1e-2,
+            "draw_positions": {
+                "position_color": [0, 255, 255],
+                "line_color": [0, 0, 0]
+            }
+        }, 
+        "draw_saccades": {
+            "line_color": [255, 0, 255]
+        },
         "draw_scan_path": {
             "draw_fixations": {
                 "deviation_circle_color": [255, 0, 255],
@@ -25,8 +41,7 @@ Here is an extract from the JSON ArFrame configuration file with a sample where
             }, 
             "draw_saccades": {
                 "line_color": [255, 0, 255]
-            },
-            "deepness": 0
+            }
         },
         "draw_layers": {
             "MyLayer": {
@@ -38,11 +53,11 @@ Here is an extract from the JSON ArFrame configuration file with a sample where
                 },
                 "draw_aoi_matching": {
                     "draw_matched_fixation": {
-                        "deviation_circle_color": [255, 255, 255]
-                    },
-                    "draw_matched_fixation_positions": {
-                        "position_color": [0, 255, 255],
-                        "line_color": [0, 0, 0]
+                        "deviation_circle_color": [255, 255, 255],
+                        "draw_positions": {
+                            "position_color": [0, 255, 0],
+                            "line_color": [0, 0, 0]
+                        }
                     },
                     "draw_matched_region": {
                         "color": [0, 255, 0],
@@ -56,10 +71,6 @@ Here is an extract from the JSON ArFrame configuration file with a sample where
                     "looked_aoi_name_offset": [0, -10]
                 }
             }
-        },
-        "draw_gaze_positions": {
-            "color": [0, 255, 255],
-            "size": 2
         }
     }
 }
@@ -81,7 +92,7 @@ import cv2
 # Assuming that timestamped gaze positions have been processed by ArFrame.look method
 ...
 
-# Export heatmap image
+# Export ArFrame image
 cv2.imwrite('./ar_frame.png', ar_frame.image())
 ```