Fixing board and marker picture size. Changing ids by identifier.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/argaze/utils/aruco_calibration_board_export.py b/src/argaze/utils/aruco_calibration_board_export.py
index 43653b1..dde2b47 100644
--- a/src/argaze/utils/aruco_calibration_board_export.py
+++ b/src/argaze/utils/aruco_calibration_board_export.py
@@ -16,7 +16,7 @@ def main():
     parser.add_argument('marker_size', metavar='MARKER_SIZE', type=int, default=3, help='marker size (cm)')
     parser.add_argument('-o', '--output', metavar='OUT', type=str, default='.', help='destination path')
     parser.add_argument('-d', '--dictionary', metavar='DICT', type=ArUcoMarkersDictionary.ArUcoMarkersDictionary, 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)')
-    parser.add_argument('-r', '--resolution', metavar='RES', type=int, default=50, help='picture resolution in dpi')
+    parser.add_argument('-r', '--resolution', metavar='RES', type=int, default=300, help='picture resolution in dpi')
     args = parser.parse_args()
 
     # Manage destination folder
@@ -28,7 +28,7 @@ def main():
     aruco_board = ArUcoBoard.ArUcoBoard(args.dictionary, args.columns, args.rows, args.square_size, args.marker_size)
 
     # Export aruco board
-    aruco_board.export(args.output, args.resolution)
+    aruco_board.save(args.output, args.resolution)
 
 if __name__ == '__main__':
 
diff --git a/src/argaze/utils/aruco_markers_export.py b/src/argaze/utils/aruco_markers_export.py
index 40d3e20..2115b2f 100644
--- a/src/argaze/utils/aruco_markers_export.py
+++ b/src/argaze/utils/aruco_markers_export.py
@@ -13,7 +13,7 @@ def main():
     parser.add_argument('-o', '--output', metavar='OUT', type=str, default='.', help='destination path')
     parser.add_argument('-d', '--dictionary', metavar='DICT', type=ArUcoMarkersDictionary.ArUcoMarkersDictionary, 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)')
     parser.add_argument('-s', '--size', metavar='SIZE', type=float, default=3., help='marker size in cm')
-    parser.add_argument('-r', '--resolution', metavar='RES', type=int, default=50, help='picture resolution in dpi')
+    parser.add_argument('-r', '--resolution', metavar='RES', type=int, default=300, help='picture resolution in dpi')
     args = parser.parse_args()
 
     # manage destination folder
@@ -22,7 +22,7 @@ def main():
         print(f'{args.output} folder created')
 
     # export markers
-    args.dictionary.export_all(args.output, args.size, args.resolution)
+    args.dictionary.save(args.output, args.size, args.resolution)
 
 if __name__ == '__main__':
 
diff --git a/src/argaze/utils/tobii_camera_calibrate.py b/src/argaze/utils/tobii_camera_calibrate.py
index cd546bb..6cfcd80 100644
--- a/src/argaze/utils/tobii_camera_calibrate.py
+++ b/src/argaze/utils/tobii_camera_calibrate.py
@@ -100,7 +100,7 @@ def main():
                 aruco_tracker.draw_board(video_frame.matrix)
 
                 # append data
-                aruco_camera.store_calibration_data(aruco_tracker.board_corners, aruco_tracker.board_corners_ids)
+                aruco_camera.store_calibration_data(aruco_tracker.board_corners, aruco_tracker.board_corners_identifier)
 
                 cv.imshow('Tobii Camera Calibration', video_frame.matrix)