diff options
Diffstat (limited to 'src/argaze/ArFeatures.py')
| -rw-r--r-- | src/argaze/ArFeatures.py | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py index 509712e..4524823 100644 --- a/src/argaze/ArFeatures.py +++ b/src/argaze/ArFeatures.py @@ -216,7 +216,8 @@ class ArLayer(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): "aoi_matcher": self.__aoi_matcher, "aoi_scan_path": self.__aoi_scan_path, "aoi_scan_path_analyzers": self.__aoi_scan_path_analyzers, - "draw_parameters": self.__draw_parameters + "draw_parameters": self.__draw_parameters, + **DataFeatures.PipelineStepObject.as_dict(self) } @classmethod @@ -381,9 +382,6 @@ class ArLayer(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): # Load temporary pipeline step object from layer_data then export it as dict temp_pipeline_step_object_data = DataFeatures.PipelineStepObject.from_dict(layer_data, working_directory).as_dict() - # DEBUG - print('ArLayer.from_dict: temp_pipeline_step_object_data=', temp_pipeline_step_object_data) - # Create layer return ArLayer( \ new_layer_name, \ @@ -411,6 +409,14 @@ class ArLayer(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): return ArLayer.from_dict(layer_data, working_directory) + def __str__(self) -> str: + """ + Returns: + String representation + """ + + return str(self.aoi_scene.keys()) + @DataFeatures.PipelineStepMethod def look(self, timestamp: int|float, gaze_movement: GazeFeatures.GazePosition = GazeFeatures.UnvalidGazePosition()): """ @@ -543,9 +549,6 @@ class ArFrame(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): image_parameters: default parameters passed to image method """ - # DEBUG - print('ArFrame.__init__', name, layers, kwargs) - # Init parent classes DataFeatures.SharedObject.__init__(self) DataFeatures.PipelineStepObject.__init__(self, **kwargs) @@ -687,7 +690,8 @@ class ArFrame(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): "background": self.__background, "heatmap": self.__heatmap, "layers": self.__layers, - "image_parameters": self.__image_parameters + "image_parameters": self.__image_parameters, + **DataFeatures.PipelineStepObject.as_dict(self) } @classmethod @@ -894,9 +898,6 @@ class ArFrame(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): # Load temporary pipeline step object from frame_data then export it as dict temp_pipeline_step_object_data = DataFeatures.PipelineStepObject.from_dict(frame_data, working_directory).as_dict() - # DEBUG - print('ArFrame.from_dict: temp_pipeline_step_object_data=', temp_pipeline_step_object_data) - # Create frame return ArFrame( \ new_frame_name, \ @@ -929,6 +930,14 @@ class ArFrame(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): return ArFrame.from_dict(frame_data, working_directory) + def __str__(self) -> str: + """ + Returns: + String representation + """ + + return str(self.size) + @DataFeatures.PipelineStepMethod def look(self, timestamp: int|float, gaze_position: GazeFeatures.GazePosition = GazeFeatures.UnvalidGazePosition()) -> Iterator[Union[object, type, dict]]: """ @@ -1108,7 +1117,7 @@ class ArScene(DataFeatures.PipelineStepObject): Define abstract Augmented Reality scene with ArLayers and ArFrames inside. """ - def __init__(self, name: str = None, layers: dict = None, frames: dict = None, angle_tolerance: float = 0., distance_tolerance: float = 0.): + def __init__(self, name: str = None, layers: dict = None, frames: dict = None, angle_tolerance: float = 0., distance_tolerance: float = 0., **kwargs): """ Initialize ArScene Parameters: @@ -1120,7 +1129,7 @@ class ArScene(DataFeatures.PipelineStepObject): """ # Init parent classes - super().__init__() + super().__init__(**kwargs) # Init private attributes self.__name = name @@ -1193,7 +1202,8 @@ class ArScene(DataFeatures.PipelineStepObject): "layers": self.__layers, "frames": self.__frames, "angle_tolerance": self.__angle_tolerance, - "distance_tolerance": self.__distance_tolerance + "distance_tolerance": self.__distance_tolerance, + **DataFeatures.PipelineStepObject.as_dict(self) } @classmethod @@ -1411,9 +1421,6 @@ 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', kwargs) - # Init parent class super().__init__(**kwargs) @@ -1508,7 +1515,8 @@ class ArCamera(ArFrame): return { "scenes": self.__scenes, "visual_hfov": self.__visual_hfov, - "visual_vfov": self.__visual_vfov + "visual_vfov": self.__visual_vfov, + **ArFrame.as_dict(self) } def __str__(self) -> str: @@ -1517,7 +1525,7 @@ class ArCamera(ArFrame): String representation """ - output = f'Name:\n{self.__name}\n' + output = f'Name:\n{self.name}\n' for name, scene in self.__scenes.items(): output += f'\"{name}\" {type(scene)}:\n{scene}\n' |