diff options
author | Théo de la Hogue | 2023-06-19 16:49:45 +0200 |
---|---|---|
committer | Théo de la Hogue | 2023-06-19 16:49:45 +0200 |
commit | d6f43282c094ce516e5eba1a975346cd7a780f9d (patch) | |
tree | 9033c38abfc3ab239920d2e9cebcf1440d0a71e7 /src | |
parent | 91857bacd4f82e48d8a06b43bcc48294701d6a1d (diff) | |
download | argaze-d6f43282c094ce516e5eba1a975346cd7a780f9d.zip argaze-d6f43282c094ce516e5eba1a975346cd7a780f9d.tar.gz argaze-d6f43282c094ce516e5eba1a975346cd7a780f9d.tar.bz2 argaze-d6f43282c094ce516e5eba1a975346cd7a780f9d.tar.xz |
Allowing to load detector parameters from a separate json file.
Diffstat (limited to 'src')
-rw-r--r-- | src/argaze/ArFeatures.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py index 03f57f6..0eba2e1 100644 --- a/src/argaze/ArFeatures.py +++ b/src/argaze/ArFeatures.py @@ -79,8 +79,21 @@ class ArEnvironment(): new_optic_parameters = ArUcoOpticCalibrator.OpticParameters(**optic_parameters_value) - new_aruco_detecor_parameters = ArUcoDetector.DetectorParameters(**new_detector_data.pop('parameters')) - new_aruco_detector = ArUcoDetector.ArUcoDetector(new_aruco_dictionary, new_marker_size, new_optic_parameters, new_aruco_detecor_parameters) + # Check detector parameters value type + detector_parameters_value = new_detector_data.pop('parameters') + + # str: relative path to .json file + if type(detector_parameters_value) == str: + + detector_parameters_value = os.path.join(working_directory, detector_parameters_value) + new_aruco_detector_parameters = ArUcoDetector.DetectorParameters.from_json(detector_parameters_value) + + # dict: + else: + + new_aruco_detector_parameters = ArUcoDetector.DetectorParameters(**new_detector_data.pop('parameters')) + + new_aruco_detector = ArUcoDetector.ArUcoDetector(new_aruco_dictionary, new_marker_size, new_optic_parameters, new_aruco_detector_parameters) new_scenes = {} for scene_name, scene_data in data.pop('scenes').items(): |