Replace IfElseSubstitution with IfCondition UnlessCondition (#44)

This fixes a regression introduced in 858a542
UniversalRobots · Jul 8, 2024 · 01ccb2f · 01ccb2f
1 parent 858a542
commit 01ccb2f
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/ur_simulation_gz/launch/ur_sim_control.launch.py b/ur_simulation_gz/launch/ur_sim_control.launch.py
@@ -43,7 +43,6 @@
     FindExecutable,
     LaunchConfiguration,
     PathJoinSubstitution,
-    IfElseSubstitution,
 )
 from launch_ros.actions import Node
 from launch_ros.substitutions import FindPackageShare
@@ -168,18 +167,24 @@ def launch_setup(context, *args, **kwargs):
             "true",
         ],
     )
+    gz_launch_description_with_gui = IncludeLaunchDescription(
+        PythonLaunchDescriptionSource(
+            [FindPackageShare("ros_gz_sim"), "/launch/gz_sim.launch.py"]
+        ),
+        launch_arguments={
+            "gz_args": ["-r", "-v", "4", world_file]
+        }.items(),
+        condition=IfCondition(gazebo_gui)
+    )
 
-    gz_launch_description = IncludeLaunchDescription(
+    gz_launch_description_without_gui = IncludeLaunchDescription(
         PythonLaunchDescriptionSource(
             [FindPackageShare("ros_gz_sim"), "/launch/gz_sim.launch.py"]
         ),
         launch_arguments={
-            "gz_args": IfElseSubstitution(
-                gazebo_gui,
-                if_value=[" -r -v 4 ", world_file],
-                else_value=[" -s -r -v 4 ", world_file],
-            )
+            "gz_args": ["-s", "-r", "-v", "4", world_file]
         }.items(),
+        condition=UnlessCondition(gazebo_gui)
     )
 
     nodes_to_start = [
@@ -189,7 +194,8 @@ def launch_setup(context, *args, **kwargs):
         initial_joint_controller_spawner_stopped,
         initial_joint_controller_spawner_started,
         gz_spawn_entity,
-        gz_launch_description,
+        gz_launch_description_with_gui,
+        gz_launch_description_without_gui,
     ]
 
     return nodes_to_start