From a8e7a8d23e2a0d9a2af1993c9a6af3ab858cd584 Mon Sep 17 00:00:00 2001 From: Yuki TAKAGI <141538661+yuki-takagi-66@users.noreply.github.com> Date: Wed, 11 Dec 2024 18:16:23 +0900 Subject: [PATCH] refactor(obstacle_cruise_planner)!: refactor rviz and terminal info (#1264) Signed-off-by: yuki-takagi-66 --- autoware_launch/rviz/autoware.rviz | 64 ++++++++++-------- autoware_launch/rviz/perception.rviz | 64 ++++++++++-------- autoware_launch/rviz/planning_bev.rviz | 69 +++++++++++--------- autoware_launch/rviz/planning_tpv.rviz | 68 +++++++++++-------- autoware_launch/rviz/scenario_simulator.rviz | 53 ++++++++------- 5 files changed, 182 insertions(+), 136 deletions(-) diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz index c53d5d62e6..aa633edcaf 100644 --- a/autoware_launch/rviz/autoware.rviz +++ b/autoware_launch/rviz/autoware.rviz @@ -2068,7 +2068,7 @@ Visualization Manager: Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true - Name: VirtualWall (ObstacleCruise) + Name: VirtualWall (ObstacleCruise Stop) Namespaces: {} Topic: @@ -2076,7 +2076,31 @@ Visualization Manager: Durability Policy: Volatile History Policy: Keep Last Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/stop + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise Cruise) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/cruise + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise SlowDown) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/slow_down Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true @@ -2199,30 +2223,6 @@ Visualization Manager: Value: false - Class: rviz_common/Group Displays: - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: CruiseVirtualWall - Namespaces: - {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/cruise/virtual_wall - Value: true - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: SlowDownVirtualWall - Namespaces: - {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/slow_down/virtual_wall - Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true Name: DebugMarker @@ -3690,6 +3690,18 @@ Visualization Manager: Reliability Policy: Reliable Value: /planning/debug/objects_of_interest/no_stopping_area Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: ObstacleCruise + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/debug/objects_of_interest/obstacle_cruise_planner + Value: true Enabled: true Name: Objects Of Interest Enabled: true diff --git a/autoware_launch/rviz/perception.rviz b/autoware_launch/rviz/perception.rviz index 79d0eff13e..635d3c9fb0 100644 --- a/autoware_launch/rviz/perception.rviz +++ b/autoware_launch/rviz/perception.rviz @@ -2685,7 +2685,7 @@ Visualization Manager: Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true - Name: VirtualWall (ObstacleCruise) + Name: VirtualWall (ObstacleCruise Stop) Namespaces: {} Topic: @@ -2693,7 +2693,31 @@ Visualization Manager: Durability Policy: Volatile History Policy: Keep Last Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/stop + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise Cruise) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/cruise + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise SlowDown) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/slow_down Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true @@ -2816,30 +2840,6 @@ Visualization Manager: Value: false - Class: rviz_common/Group Displays: - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: CruiseVirtualWall - Namespaces: - {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/cruise/virtual_wall - Value: true - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: SlowDownVirtualWall - Namespaces: - {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/slow_down/virtual_wall - Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true Name: DebugMarker @@ -4435,6 +4435,18 @@ Visualization Manager: Reliability Policy: Reliable Value: /planning/debug/objects_of_interest/no_stopping_area Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: ObstacleCruise + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/debug/objects_of_interest/obstacle_cruise_planner + Value: true Enabled: true Name: Objects Of Interest Enabled: false diff --git a/autoware_launch/rviz/planning_bev.rviz b/autoware_launch/rviz/planning_bev.rviz index 533b601ccf..84b4ec1779 100644 --- a/autoware_launch/rviz/planning_bev.rviz +++ b/autoware_launch/rviz/planning_bev.rviz @@ -2521,16 +2521,39 @@ Visualization Manager: Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true - Name: VirtualWall (ObstacleCruise) + Name: VirtualWall (ObstacleCruise Stop) Namespaces: - stop_factor_text: true - stop_virtual_wall: true + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/stop + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise Cruise) + Namespaces: + {} Topic: Depth: 5 Durability Policy: Volatile History Policy: Keep Last Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/cruise + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise SlowDown) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/slow_down Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true @@ -2653,32 +2676,6 @@ Visualization Manager: Value: false - Class: rviz_common/Group Displays: - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: CruiseVirtualWall - Namespaces: - slow_down_factor_text: true - slow_down_virtual_wall: true - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/cruise/virtual_wall - Value: true - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: SlowDownVirtualWall - Namespaces: - slow_down_factor_text: true - slow_down_virtual_wall: true - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/slow_down/virtual_wall - Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true Name: DebugMarker @@ -4240,6 +4237,18 @@ Visualization Manager: Reliability Policy: Reliable Value: /planning/debug/objects_of_interest/no_stopping_area Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: ObstacleCruise + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/debug/objects_of_interest/obstacle_cruise_planner + Value: true Enabled: true Name: Objects Of Interest Enabled: true diff --git a/autoware_launch/rviz/planning_tpv.rviz b/autoware_launch/rviz/planning_tpv.rviz index 6b11e3e570..0b88e6724d 100644 --- a/autoware_launch/rviz/planning_tpv.rviz +++ b/autoware_launch/rviz/planning_tpv.rviz @@ -2733,16 +2733,39 @@ Visualization Manager: Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true - Name: VirtualWall (ObstacleCruise) + Name: VirtualWall (ObstacleCruise Stop) Namespaces: - stop_factor_text: true - stop_virtual_wall: true + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/stop + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise Cruise) + Namespaces: + {} Topic: Depth: 5 Durability Policy: Volatile History Policy: Keep Last Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/cruise + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise SlowDown) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/slow_down Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true @@ -2865,31 +2888,6 @@ Visualization Manager: Value: false - Class: rviz_common/Group Displays: - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: CruiseVirtualWall - Namespaces: - slow_down_factor_text: true - slow_down_virtual_wall: true - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/cruise/virtual_wall - Value: true - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: SlowDownVirtualWall - Namespaces: - {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/slow_down/virtual_wall - Value: true - Class: rviz_default_plugins/MarkerArray Enabled: false Name: DebugMarker @@ -4452,6 +4450,18 @@ Visualization Manager: Reliability Policy: Reliable Value: /planning/debug/objects_of_interest/no_stopping_area Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: ObstacleCruise + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/debug/objects_of_interest/obstacle_cruise_planner + Value: true Enabled: true Name: Objects Of Interest Enabled: true diff --git a/autoware_launch/rviz/scenario_simulator.rviz b/autoware_launch/rviz/scenario_simulator.rviz index d0b57f225b..2c4af14446 100644 --- a/autoware_launch/rviz/scenario_simulator.rviz +++ b/autoware_launch/rviz/scenario_simulator.rviz @@ -2492,14 +2492,39 @@ Visualization Manager: Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true - Name: VirtualWall (ObstacleCruise) - Namespaces: {} + Name: VirtualWall (ObstacleCruise Stop) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/stop + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise Cruise) + Namespaces: + {} Topic: Depth: 5 Durability Policy: Volatile History Policy: Keep Last Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/cruise + Value: true + - Class: rviz_default_plugins/MarkerArray + Enabled: true + Name: VirtualWall (ObstacleCruise SlowDown) + Namespaces: + {} + Topic: + Depth: 5 + Durability Policy: Volatile + History Policy: Keep Last + Reliability Policy: Reliable + Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/virtual_wall/slow_down Value: true Enabled: true Name: VirtualWall @@ -2572,28 +2597,6 @@ Visualization Manager: Value: false - Class: rviz_common/Group Displays: - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: CruiseVirtualWall - Namespaces: {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/cruise/virtual_wall - Value: true - - Class: rviz_default_plugins/MarkerArray - Enabled: true - Name: SlowDownVirtualWall - Namespaces: {} - Topic: - Depth: 5 - Durability Policy: Volatile - History Policy: Keep Last - Reliability Policy: Reliable - Value: /planning/scenario_planning/lane_driving/motion_planning/obstacle_cruise_planner/debug/slow_down/virtual_wall - Value: true - Class: rviz_default_plugins/MarkerArray Enabled: true Name: DebugMarker