diff options
Diffstat (limited to 'src/argaze/ArFeatures.py')
| -rw-r--r-- | src/argaze/ArFeatures.py | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py index 1c2de8e..758e702 100644 --- a/src/argaze/ArFeatures.py +++ b/src/argaze/ArFeatures.py @@ -136,14 +136,16 @@ class ArLayer(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): self.__aoi_scene = AOI3DScene.AOI3DScene(self.__aoi_scene) - # Edit expected AOI list by removing AOI with name equals to layer name - expected_aoi = list(self.__aoi_scene.keys()) + # Edit aoi_scan_path's expected aoi list by removing aoi with name equals to layer name + if self.__aoi_scan_path is not None: + + expected_aoi = list(self.__aoi_scene.keys()) - if self.name in expected_aoi: + if self.name in expected_aoi: - expected_aoi.remove(self.name) + expected_aoi.remove(self.name) - self.__aoi_scan_path.expected_aoi = expected_aoi + self.__aoi_scan_path.expected_aoi = expected_aoi # Edit pipeline step objects parent if self.__aoi_scene is not None: @@ -220,7 +222,7 @@ class ArLayer(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): """Export ArLayer attributes as dictionary.""" return { - **DataFeatures.PipelineStepObject.as_dict(), + **DataFeatures.PipelineStepObject.as_dict(self), "aoi_scene": self.__aoi_scene, "aoi_matcher": self.__aoi_matcher, "aoi_scan_path": self.__aoi_scan_path, @@ -665,7 +667,7 @@ class ArFrame(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): frame_data: dictionary with frame attributes values. """ d = { - **DataFeatures.PipelineStepObject.as_dict(), + **DataFeatures.PipelineStepObject.as_dict(self), "size": self.__size, "gaze_position_calibrator": self.__gaze_position_calibrator, "gaze_movement_identifier": self.__gaze_movement_identifier, @@ -678,8 +680,6 @@ class ArFrame(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): "image_parameters": self.__image_parameters } - print('ArFrame.as_dict', DataFeatures.PipelineStepObject.as_dict()) - return d @classmethod @@ -1097,6 +1097,9 @@ class ArScene(DataFeatures.PipelineStepObject): distance_tolerance: Optional distance error tolerance to validate marker pose in centimeter used into [estimate_pose][argaze.ArFeatures.ArScene.estimate_pose] function. """ + # DEBUG + print('ArScene.__init__', kwargs) + # Init parent classes super().__init__(**kwargs) @@ -1149,7 +1152,7 @@ class ArScene(DataFeatures.PipelineStepObject): """Export ArScene attributes as dictionary.""" return { - **DataFeatures.PipelineStepObject.as_dict(), + **DataFeatures.PipelineStepObject.as_dict(self), "layers": self.__layers, "frames": self.__frames, "angle_tolerance": self.__angle_tolerance, @@ -1325,7 +1328,7 @@ class ArScene(DataFeatures.PipelineStepObject): aoi_scene_copy = layer.aoi_scene.copy() # Project layer aoi scene - yield name, aoi_scene_copy.project(tvec, rvec, self.__parent.aruco_detector.optic_parameters.K) + yield name, aoi_scene_copy.project(tvec, rvec, self.parent.aruco_detector.optic_parameters.K) def draw(self, image: numpy.array, **kwargs: dict): """ @@ -1351,6 +1354,9 @@ class ArCamera(ArFrame): visual_vfov: Optional angle in degree to clip scenes projection according visual vertical field of view (VFOV). """ + # DEBUG + print('ArCamera.__init__', kwargs) + # Init parent class super().__init__(**kwargs) @@ -1443,7 +1449,7 @@ class ArCamera(ArFrame): """Export ArCamera attributes as dictionary.""" return { - **ArFrame.as_dict(), + **ArFrame.as_dict(self), "scenes": self.__scenes, "visual_hfov": self.__visual_hfov, "visual_vfov": self.__visual_vfov |