diff --git a/manager/manager/launcher/launcher_visualization.py b/manager/manager/launcher/launcher_visualization.py index 75eb5ed..901eb47 100644 --- a/manager/manager/launcher/launcher_visualization.py +++ b/manager/manager/launcher/launcher_visualization.py @@ -1,6 +1,6 @@ from src.manager.libs.process_utils import get_class, class_from_module -from typing import Optional -from pydantic import BaseModel +from typing import Optional, ClassVar +from pydantic import BaseModel, ConfigDict from src.manager.libs.process_utils import get_class, class_from_module, get_ros_version @@ -18,24 +18,6 @@ "internal_port": 5901, } ], - "bt_studio": [ - { - "type": "module", - "module": "console", - "display": ":1", - "external_port": 1108, - "internal_port": 5901, - }, - { - "type": "module", - "width": 1024, - "height": 768, - "module": "gazebo_view", - "display": ":2", - "external_port": 6080, - "internal_port": 5900, - }, - ], "gazebo_gra": [ { "type": "module", @@ -75,7 +57,7 @@ "type": "module", "width": 1024, "height": 768, - "module": "gazebo_view", + "module": "robot_display_view", "display": ":2", "external_port": 6080, "internal_port": 5900, @@ -100,25 +82,18 @@ ], "physic_rae": [ { + "type": "module", "module": "console", "display": ":1", "external_port": 1108, "internal_port": 5901, - }, - { - "type": "module", - "width": 1024, - "height": 768, - "module": "robot_display_view", - "display": ":2", - "external_port": 2303, - "internal_port": 5902, - }, + } ], } class LauncherVisualization(BaseModel): + running: ClassVar[bool] module: str = ".".join(__name__.split(".")[:-1]) visualization: str launchers: Optional[ILauncher] = [] diff --git a/manager/manager/launcher/launcher_world.py b/manager/manager/launcher/launcher_world.py index 8e761cc..05c0350 100644 --- a/manager/manager/launcher/launcher_world.py +++ b/manager/manager/launcher/launcher_world.py @@ -1,4 +1,4 @@ -from typing import Optional +from typing import Optional, ClassVar from pydantic import BaseModel from src.manager.libs.process_utils import get_class, class_from_module, get_ros_version @@ -48,11 +48,27 @@ } ], }, - "physical": {}, + "physical": {"1": [ + { + "type": "module", + "module": "ros_api", + "parameters": [], + "launch_file": [], + } + ], + "2": [ + { + "type": "module", + "module": "ros2_api", + "parameters": [], + "launch_file": [], + } + ],}, } class LauncherWorld(BaseModel): + running: ClassVar[bool] world: str launch_file_path: str module: str = ".".join(__name__.split(".")[:-1]) diff --git a/manager/manager/manager.py b/manager/manager/manager.py index 2cf16f5..8d3e204 100644 --- a/manager/manager/manager.py +++ b/manager/manager/manager.py @@ -248,7 +248,7 @@ def on_prepare_visualization(self, event): ) self.visualization_launcher.run() - if visualization_type == "gazebo_rae": + if visualization_type == "gazebo_rae" or visualization_type == "physic_rae": self.gui_server = Server(2303, self.update) self.gui_server.start()