diff options
Diffstat (limited to 'src/argaze/ArUcoMarkers/ArUcoCamera.py')
| -rw-r--r-- | src/argaze/ArUcoMarkers/ArUcoCamera.py | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/argaze/ArUcoMarkers/ArUcoCamera.py b/src/argaze/ArUcoMarkers/ArUcoCamera.py index 6d13c10..5fd1499 100644 --- a/src/argaze/ArUcoMarkers/ArUcoCamera.py +++ b/src/argaze/ArUcoMarkers/ArUcoCamera.py @@ -52,7 +52,7 @@ class ArUcoCamera(ArFeatures.ArCamera): # Init private attribute self.__aruco_detector = None - self.__image_parameters = {**ArFeatures.DEFAULT_ARFRAME_IMAGE_PARAMETERS, **DEFAULT_ARUCOCAMERA_IMAGE_PARAMETERS} + self._image_parameters = {**ArFeatures.DEFAULT_ARFRAME_IMAGE_PARAMETERS, **DEFAULT_ARUCOCAMERA_IMAGE_PARAMETERS} @property def aruco_detector(self) -> ArUcoDetector.ArUcoDetector: @@ -85,38 +85,34 @@ class ArUcoCamera(ArFeatures.ArCamera): self.__aruco_detector.parent = self - @property - def scenes(self) -> dict: - """All scenes to project into camera frame.""" - return self.__scenes - - @scenes.setter + @ArFeatures.ArCamera.scenes.setter @DataFeatures.PipelineStepAttributeSetter def scenes(self, scenes: dict): - self.__scenes = {} + self._scenes = {} for scene_name, scene_data in scenes.items(): - self.__scenes[scene_name] = ArUcoScene.ArUcoScene(working_directory = self.working_directory, name = scene_name, **scene_data) + self._scenes[scene_name] = ArUcoScene.ArUcoScene(working_directory = self.working_directory, name = scene_name, **scene_data) # Edit parent - for name, scene in self.__scenes.items(): + for name, scene in self._scenes.items(): scene.parent = self - @ArFeatures.ArFrame.image_parameters.setter + @ArFeatures.ArCamera.image_parameters.setter + @DataFeatures.PipelineStepAttributeSetter def image_parameters(self, image_parameters: dict): - self.__image_parameters = image_parameters + self._image_parameters = image_parameters - if 'draw_layers' not in self.__image_parameters: + if 'draw_layers' not in self._image_parameters: - self.__image_parameters['draw_layers'] = {} + self._image_parameters['draw_layers'] = {} for layer_name in self.layers.keys(): - self.__image_parameters['draw_layers'][layer_name] = ArFeatures.DEFAULT_ARLAYER_DRAW_PARAMETERS + self._image_parameters['draw_layers'][layer_name] = ArFeatures.DEFAULT_ARLAYER_DRAW_PARAMETERS @DataFeatures.PipelineStepMethod def watch(self, image: numpy.array): |