From f53fc1b7d116a27a6a382703c837465807ac5a25 Mon Sep 17 00:00:00 2001 From: Théo de la Hogue Date: Wed, 28 Jun 2023 15:28:09 +0200 Subject: Renaming setup files. --- docs/user_guide/utils/demonstrations_scripts.md | 4 +- .../demo_environment/demo_ar_features_setup.json | 79 ++++++++++++++++++++++ .../demo_environment/demo_gaze_features_setup.json | 24 +++++++ src/argaze/utils/demo_environment/setup.json | 79 ---------------------- 4 files changed, 105 insertions(+), 81 deletions(-) create mode 100644 src/argaze/utils/demo_environment/demo_ar_features_setup.json create mode 100644 src/argaze/utils/demo_environment/demo_gaze_features_setup.json delete mode 100644 src/argaze/utils/demo_environment/setup.json diff --git a/docs/user_guide/utils/demonstrations_scripts.md b/docs/user_guide/utils/demonstrations_scripts.md index 64213eb..4a54c5e 100644 --- a/docs/user_guide/utils/demonstrations_scripts.md +++ b/docs/user_guide/utils/demonstrations_scripts.md @@ -14,7 +14,7 @@ Collection of command-line scripts for demonstration purpose. Load AR environment from **setup.json** file, detect ArUco markers into camera device (-d DEVICE) images and estimate envirnoment pose. ```shell -python ./src/argaze/utils/demo_ar_features_run.py ./src/argaze/utils/demo_environment/setup.json -d DEVICE +python ./src/argaze/utils/demo_ar_features_run.py ./src/argaze/utils/demo_environment/demo_ar_features_setup.json -d DEVICE ``` !!! warning @@ -28,7 +28,7 @@ python ./src/argaze/utils/demo_ar_features_run.py ./src/argaze/utils/demo_enviro Simulate gaze position using mouse pointer to illustrate gaze features. ```shell -python ./src/argaze/utils/demo_gaze_features_run.py +python ./src/argaze/utils/demo_gaze_features_run.py ./src/argaze/utils/demo_environment/demo_gaze_features_setup.json ``` ## Heatmap demonstration diff --git a/src/argaze/utils/demo_environment/demo_ar_features_setup.json b/src/argaze/utils/demo_environment/demo_ar_features_setup.json new file mode 100644 index 0000000..2044e35 --- /dev/null +++ b/src/argaze/utils/demo_environment/demo_ar_features_setup.json @@ -0,0 +1,79 @@ +{ + "name": "AR Environment Demo", + "aruco_detector": { + "dictionary": { + "name": "DICT_APRILTAG_16h5" + }, + "marker_size": 5, + "optic_parameters": "optic_parameters.json", + "parameters": { + "cornerRefinementMethod": 1, + "aprilTagQuadSigma": 2, + "aprilTagDeglitch": 1 + } + }, + "scenes": { + "AR Scene Demo" : { + "aruco_scene": "aruco_scene.obj", + "aoi_scene": "aoi_scene.obj", + "screens": { + "GrayRectangle": { + "size": [320, 240], + "background": "screen_background.jpg", + "gaze_movement_identifier": { + "type": "DispersionThresholdIdentification", + "parameters": { + "deviation_max_threshold": 10, + "duration_min_threshold": 200 + } + } + } + }, + "aruco_axis": { + "lower_left_corner": { + "origin_marker": 2, + "horizontal_axis_marker": 3, + "vertical_axis_marker": 0 + }, + "lower_right_corner": { + "origin_marker": 3, + "horizontal_axis_marker": 2, + "vertical_axis_marker": 1 + }, + "upper_left_corner": { + "origin_marker": 0, + "horizontal_axis_marker": 1, + "vertical_axis_marker": 2 + }, + "upper_right_corner": { + "origin_marker": 1, + "horizontal_axis_marker": 0, + "vertical_axis_marker": 3 + } + }, + "aruco_aoi": { + "Screen_Plan": { + "upper_left_corner": { + "marker_identifier": 0, + "marker_corner_index": 2 + }, + "upper_right_corner": { + "marker_identifier": 1, + "marker_corner_index": 3 + }, + "lower_left_corner": { + "marker_identifier": 2, + "marker_corner_index": 1 + }, + "lower_right_corner": { + "marker_identifier": 3, + "marker_corner_index": 0 + }, + "inner_aoi": "all" + } + }, + "angle_tolerance": 15.0, + "distance_tolerance": 2.54 + } + } +} \ No newline at end of file diff --git a/src/argaze/utils/demo_environment/demo_gaze_features_setup.json b/src/argaze/utils/demo_environment/demo_gaze_features_setup.json new file mode 100644 index 0000000..02e21bc --- /dev/null +++ b/src/argaze/utils/demo_environment/demo_gaze_features_setup.json @@ -0,0 +1,24 @@ +{ + "name": "AR Environment Demo", + "scenes": { + "AR Scene Demo" : { + "aoi_scene": "aoi_scene.obj", + "screens": { + "GrayRectangle": { + "size": [1920, 1149], + "background": "screen_background.jpg", + "gaze_movement_identifier": { + "type": "DispersionThresholdIdentification", + "parameters": { + "deviation_max_threshold": 50, + "duration_min_threshold": 200 + } + }, + "scan_path": true, + "aoi_scan_path": true, + "heatmap": true + } + } + } + } +} \ No newline at end of file diff --git a/src/argaze/utils/demo_environment/setup.json b/src/argaze/utils/demo_environment/setup.json deleted file mode 100644 index 2044e35..0000000 --- a/src/argaze/utils/demo_environment/setup.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "name": "AR Environment Demo", - "aruco_detector": { - "dictionary": { - "name": "DICT_APRILTAG_16h5" - }, - "marker_size": 5, - "optic_parameters": "optic_parameters.json", - "parameters": { - "cornerRefinementMethod": 1, - "aprilTagQuadSigma": 2, - "aprilTagDeglitch": 1 - } - }, - "scenes": { - "AR Scene Demo" : { - "aruco_scene": "aruco_scene.obj", - "aoi_scene": "aoi_scene.obj", - "screens": { - "GrayRectangle": { - "size": [320, 240], - "background": "screen_background.jpg", - "gaze_movement_identifier": { - "type": "DispersionThresholdIdentification", - "parameters": { - "deviation_max_threshold": 10, - "duration_min_threshold": 200 - } - } - } - }, - "aruco_axis": { - "lower_left_corner": { - "origin_marker": 2, - "horizontal_axis_marker": 3, - "vertical_axis_marker": 0 - }, - "lower_right_corner": { - "origin_marker": 3, - "horizontal_axis_marker": 2, - "vertical_axis_marker": 1 - }, - "upper_left_corner": { - "origin_marker": 0, - "horizontal_axis_marker": 1, - "vertical_axis_marker": 2 - }, - "upper_right_corner": { - "origin_marker": 1, - "horizontal_axis_marker": 0, - "vertical_axis_marker": 3 - } - }, - "aruco_aoi": { - "Screen_Plan": { - "upper_left_corner": { - "marker_identifier": 0, - "marker_corner_index": 2 - }, - "upper_right_corner": { - "marker_identifier": 1, - "marker_corner_index": 3 - }, - "lower_left_corner": { - "marker_identifier": 2, - "marker_corner_index": 1 - }, - "lower_right_corner": { - "marker_identifier": 3, - "marker_corner_index": 0 - }, - "inner_aoi": "all" - } - }, - "angle_tolerance": 15.0, - "distance_tolerance": 2.54 - } - } -} \ No newline at end of file -- cgit v1.1