From 421fc1ee8b4b754df6af846f083b99d629c4fb6f Mon Sep 17 00:00:00 2001 From: Théo de la Hogue Date: Tue, 14 Mar 2023 14:49:05 +0100 Subject: Default ArUco Dictionary creation. --- src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py | 11 +++++++++-- src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py b/src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py index 58849a6..e27580f 100644 --- a/src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py +++ b/src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py @@ -15,13 +15,20 @@ class TestArUcoMarkersDictionaryClass(unittest.TestCase): aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('BAD_DICT_NAME') - # Check DICT_ARUCO_ORIGINAL ArUcoMarkersDictionary creation - aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_ARUCO_ORIGINAL') + # Check default ArUcoMarkersDictionary creation + aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary() self.assertEqual(aruco_dictionary.name, 'DICT_ARUCO_ORIGINAL') self.assertEqual(aruco_dictionary.format, '5X5') self.assertEqual(aruco_dictionary.number, 1024) + # Check DICT_APRILTAG_16h5 ArUcoMarkersDictionary creation + aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_APRILTAG_16h5') + + self.assertEqual(aruco_dictionary.name, 'DICT_APRILTAG_16h5') + self.assertEqual(aruco_dictionary.format, '4X4') + self.assertEqual(aruco_dictionary.number, 30) + if __name__ == '__main__': unittest.main() \ No newline at end of file diff --git a/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py b/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py index 9be895b..8599293 100644 --- a/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py +++ b/src/argaze/ArUcoMarkers/ArUcoMarkersDictionary.py @@ -37,7 +37,7 @@ ArUcoMarkerType = TypeVar('ArUcoMarker', bound="ArUcoMarker") class ArUcoMarkersDictionary(): """Handle an ArUco markers dictionary.""" - def __init__(self, name): + def __init__(self, name: str = 'DICT_ARUCO_ORIGINAL'): if all_aruco_markers_dictionaries.get(name, None) is None: raise NameError(f'Bad ArUco markers dictionary name: {name}') -- cgit v1.1