From a420eaa75e2ddcb1fd03a7f1868744722f368ad3 Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Tue, 15 Mar 2022 18:19:41 +0100
Subject: Removing useless data. Improving documentation.

---
 src/argaze/utils/README.md                         | 12 ++--
 src/argaze/utils/data/roi3D_scene.obj              | 67 ----------------------
 src/argaze/utils/data/tobii_camera.json            | 29 ----------
 .../utils/track_aruco_rois_with_tobii_glasses.py   |  1 -
 4 files changed, 6 insertions(+), 103 deletions(-)
 delete mode 100644 src/argaze/utils/data/roi3D_scene.obj
 delete mode 100644 src/argaze/utils/data/tobii_camera.json

(limited to 'src')

diff --git a/src/argaze/utils/README.md b/src/argaze/utils/README.md
index 5ce668f..afcc232 100644
--- a/src/argaze/utils/README.md
+++ b/src/argaze/utils/README.md
@@ -6,10 +6,10 @@ Use -help to get arguments documentation.
 
 Consider that all inline commands below needs to be executed into ArGaze root folder.
 
-- Export 50 4x4 markers at 300 dpi into an export folder:
+- Export 50 4x4 markers at 300 dpi into an export/markers folder:
 
 ```
-python ./src/argaze/utils/export_aruco_markers.py -o export
+python ./src/argaze/utils/export_aruco_markers.py -o export/markers
 ```
 
 - Export a 7 columns and 5 rows calibration board with 5cm squares and 3cm markers inside at 50 dpi into an export folder:
@@ -21,11 +21,11 @@ python ./src/argaze/utils/export_calibration_board.py 7 5 5 3 -o export
 - Calibrate Tobii Glasses Pro 2 camera (replace IP_ADDRESS) using a 7 columns and 5 rows calibration board with 5cm squares and 3cm markers inside. Then, export its optical parameters into an tobii_camera.json file:
 
 ```
-python ./src/argaze/utils/tobii_camera_calibration.py 7 5 5 3 -t IP_ADDRESS -o tobii_camera.json
+python ./src/argaze/utils/tobii_camera_calibration.py 7 5 5 3 -t IP_ADDRESS -o export/tobii_camera.json
 ```
 
-- Track any 6cm ArUco marker into Tobii camera video stream (replace IP_ADDRESS). Load an roi3D_scene.obj file, position it virtually like the detected ArUco markers and project the scene into camera frame. Then, detect if Tobii gaze point is inside any ROI. Export all collected datas into an export folder.
+- Track any 6cm ArUco marker into calibrated Tobii camera video stream (replace IP_ADDRESS). Load an roi scene (replace ROI_SCENE) .obj file, position it virtually like the detected ArUco markers and project the scene into camera frame. Then, detect if Tobii gaze point is inside any ROI. Export all collected datas into an export folder.
 
 ```
-python ./src/argaze/utils/track_aruco_rois_with_tobii_glasses.py -t IP_ADDRESS -c data/tobii_camera.json -s data/roi3D_scene.obj -o export
-```
\ No newline at end of file
+python ./src/argaze/utils/track_aruco_rois_with_tobii_glasses.py -t IP_ADDRESS -c export/tobii_camera.json -s ROI_SCENE -o export/data
+```
diff --git a/src/argaze/utils/data/roi3D_scene.obj b/src/argaze/utils/data/roi3D_scene.obj
deleted file mode 100644
index d0b7c51..0000000
--- a/src/argaze/utils/data/roi3D_scene.obj
+++ /dev/null
@@ -1,67 +0,0 @@
-# Blender v3.0.1 OBJ File: 'scene.blend'
-# www.blender.org
-o Marker_Plan
-v -3.000000 -3.000000 0.000000
-v 3.000000 -3.000000 0.000000
-v -3.000000 3.000000 0.000000
-v 3.000000 3.000000 0.000000
-s off
-f 1 2 4 3
-o Air_Speed_Plan.001
-v -41.971680 -4.745928 -2.684396
-v -39.497086 -4.745928 -2.684396
-v -41.971680 7.846082 -2.684396
-v -39.497086 7.846082 -2.684396
-s off
-f 5 6 8 7
-o Attitude_Plan.005
-v -38.940212 -3.709124 -2.684396
-v -30.117123 -3.709124 -2.684396
-v -38.940212 6.711202 -2.684396
-v -30.117123 6.711202 -2.684396
-s off
-f 9 10 12 11
-o Localiser_Plan.003
-v -38.940212 -7.889488 -2.684396
-v -30.117125 -7.889488 -2.684396
-v -38.940212 -4.223971 -2.684396
-v -30.117125 -4.223971 -2.684396
-s off
-f 13 14 16 15
-o Vertical_Speed_Plan.002
-v -29.570124 -4.718364 -2.684396
-v -26.876801 -4.713788 -2.684396
-v -29.528456 7.846082 -2.684396
-v -26.835133 7.850657 -2.684396
-s off
-f 17 18 20 19
-o PFD_Plan.004
-v -42.908882 -9.217942 -2.684396
-v -26.146378 -9.217942 -2.684396
-v -42.908882 14.918060 -2.684396
-v -26.146378 14.918060 -2.684396
-s off
-f 21 22 24 23
-o ND_Plan.107
-v -22.813946 -9.217942 -2.684396
-v -6.051440 -9.217942 -2.684396
-v -22.813946 14.918060 -2.684396
-v -6.051440 14.918060 -2.684396
-s off
-f 25 26 28 27
-o FCU_Plan.108
-v -6.507059 16.577757 26.295910
-v 50.183128 16.577757 26.295910
-v -6.507059 23.751425 26.295910
-v 50.183128 23.751425 26.295910
-s off
-f 29 30 32 31
-o Exterior_Plan.006
-v -46.568127 34.893536 7.561725
-v 12.047465 39.802032 9.644265
-v -46.951084 38.173790 10.614324
-v 11.661365 43.150181 12.620070
-v 13.887004 62.445206 40.607811
-v -35.566383 52.329830 33.684719
-s off
-f 33 34 36 37 38 35
diff --git a/src/argaze/utils/data/tobii_camera.json b/src/argaze/utils/data/tobii_camera.json
deleted file mode 100644
index b7b5108..0000000
--- a/src/argaze/utils/data/tobii_camera.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "rms": 0.2778430441943373,
-    "camera matrix": [
-        [
-            567.7948916261545,
-            0.0,
-            477.23038710185534
-        ],
-        [
-            0.0,
-            566.2897424860757,
-            288.75352250724296
-        ],
-        [
-            0.0,
-            0.0,
-            1.0
-        ]
-    ],
-    "distortion coefficients": [
-        [
-            0.07351688052834335,
-            -0.18678684802766135,
-            0.001473915039947321,
-            0.0008389464646594935,
-            0.13193649892597786
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/src/argaze/utils/track_aruco_rois_with_tobii_glasses.py b/src/argaze/utils/track_aruco_rois_with_tobii_glasses.py
index 6091b89..e7abc05 100644
--- a/src/argaze/utils/track_aruco_rois_with_tobii_glasses.py
+++ b/src/argaze/utils/track_aruco_rois_with_tobii_glasses.py
@@ -172,7 +172,6 @@ def main():
     y_speed_patch = mpatches.Patch(color='#9427B6', label='Y')
     subplot.legend(handles=[x_patch, y_speed_patch], loc='upper left')
 
-
     # plot maker position data
     subplot = figure.add_subplot(212)
     subplot.set_title('Marker')
-- 
cgit v1.1