diff options
| author | Théo de la Hogue | 2022-10-26 14:16:57 +0200 |
|---|---|---|
| committer | Théo de la Hogue | 2022-10-26 14:16:57 +0200 |
| commit | ffa8aeab869608dc97c0aab5469eaa802db9de1c (patch) | |
| tree | f6857c121a77123b9e63d8c71b254dc35eb7674b | |
| parent | 73f031a492124980b4cf2173732c20cd67e2a610 (diff) | |
| parent | 9a9c07758cbf368fec558656d70f3bfadbb1cc95 (diff) | |
| download | argaze-ffa8aeab869608dc97c0aab5469eaa802db9de1c.zip argaze-ffa8aeab869608dc97c0aab5469eaa802db9de1c.tar.gz argaze-ffa8aeab869608dc97c0aab5469eaa802db9de1c.tar.bz2 argaze-ffa8aeab869608dc97c0aab5469eaa802db9de1c.tar.xz | |
Merge branch 'master' into dev-arcube
| -rw-r--r-- | src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py | 2 | ||||
| -rw-r--r-- | src/argaze/utils/tobii_stream_aruco_aoi_display.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py b/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py index 604220c..84a78b9 100644 --- a/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py +++ b/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py @@ -23,7 +23,7 @@ all_aruco_markers_dictionaries = { 'DICT_7X7_1000': aruco.DICT_7X7_1000, 'DICT_ARUCO_ORIGINAL': aruco.DICT_ARUCO_ORIGINAL, 'DICT_APRILTAG_16h5': aruco.DICT_APRILTAG_16h5, - 'DICT_APRILTAG_25h9': aruco.DICT_APRILTAG_16h5, + 'DICT_APRILTAG_25h9': aruco.DICT_APRILTAG_25h9, 'DICT_APRILTAG_36h10': aruco.DICT_APRILTAG_36h10, 'DICT_APRILTAG_36h11': aruco.DICT_APRILTAG_36h11 } diff --git a/src/argaze/utils/tobii_stream_aruco_aoi_display.py b/src/argaze/utils/tobii_stream_aruco_aoi_display.py index 0ded26f..b9e669e 100644 --- a/src/argaze/utils/tobii_stream_aruco_aoi_display.py +++ b/src/argaze/utils/tobii_stream_aruco_aoi_display.py @@ -21,7 +21,7 @@ def main(): # Manage arguments parser = argparse.ArgumentParser(description=main.__doc__.split('-')[0]) - parser.add_argument('-t', '--tobii_ip', metavar='TOBII_IP', type=str, default='10.34.0.12', help='tobii glasses ip') + parser.add_argument('-t', '--tobii_ip', metavar='TOBII_IP', type=str, default=None, help='tobii glasses ip') parser.add_argument('-c', '--camera_calibration', metavar='CAM_CALIB', type=str, default=None, help='json camera calibration filepath') parser.add_argument('-p', '--aruco_tracker_configuration', metavar='TRACK_CONFIG', type=str, default=None, help='json aruco tracker configuration filepath') parser.add_argument('-md', '--marker_dictionary', metavar='MARKER_DICT', type=str, default='DICT_ARUCO_ORIGINAL', help='aruco marker dictionnary (DICT_4X4_50, DICT_4X4_100, DICT_4X4_250, DICT_4X4_1000, DICT_5X5_50, DICT_5X5_100, DICT_5X5_250, DICT_5X5_1000, DICT_6X6_50, DICT_6X6_100, DICT_6X6_250, DICT_6X6_1000, DICT_7X7_50, DICT_7X7_100, DICT_7X7_250, DICT_7X7_1000, DICT_ARUCO_ORIGINAL,DICT_APRILTAG_16h5, DICT_APRILTAG_25h9, DICT_APRILTAG_36h10, DICT_APRILTAG_36h11)') |