From b2793d61f1ba4f962b561f24babeef98a30e15d6 Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome <43976834+mitsudome-r@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:50:11 +0900 Subject: [PATCH] feat(tier4_debug_rviz_plugin)!: replace tier4_debug_msgs with tier4_internal_debug_msgs (#202) Signed-off-by: Ryohsuke Mitsudome --- common/tier4_debug_rviz_plugin/README.md | 2 +- .../float32_multi_array_stamped_pie_chart.hpp | 6 +++--- common/tier4_debug_rviz_plugin/package.xml | 1 - .../plugins/plugin_description.xml | 2 +- .../src/float32_multi_array_stamped_pie_chart.cpp | 14 ++++++++------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common/tier4_debug_rviz_plugin/README.md b/common/tier4_debug_rviz_plugin/README.md index 91898161..df23bdb1 100644 --- a/common/tier4_debug_rviz_plugin/README.md +++ b/common/tier4_debug_rviz_plugin/README.md @@ -7,6 +7,6 @@ Note that jsk_overlay_utils.cpp and jsk_overlay_utils.hpp are BSD license. ### Float32MultiArrayStampedPieChart -Pie chart from `tier4_debug_msgs::msg::Float32MultiArrayStamped`. +Pie chart from `autoware_internal_debug_msgs::msg::Float32MultiArrayStamped`. ![float32_multi_array_stamped_pie_chart](./images/float32_multi_array_stamped_pie_chart.png) diff --git a/common/tier4_debug_rviz_plugin/include/tier4_debug_rviz_plugin/float32_multi_array_stamped_pie_chart.hpp b/common/tier4_debug_rviz_plugin/include/tier4_debug_rviz_plugin/float32_multi_array_stamped_pie_chart.hpp index c8267c70..a5013dec 100644 --- a/common/tier4_debug_rviz_plugin/include/tier4_debug_rviz_plugin/float32_multi_array_stamped_pie_chart.hpp +++ b/common/tier4_debug_rviz_plugin/include/tier4_debug_rviz_plugin/float32_multi_array_stamped_pie_chart.hpp @@ -60,7 +60,7 @@ #include #include -#include +#include #include @@ -87,7 +87,7 @@ class Float32MultiArrayStampedPieChartDisplay : public rviz_common::Display virtual void onDisable(); virtual void onInitialize(); virtual void processMessage( - const tier4_debug_msgs::msg::Float32MultiArrayStamped::ConstSharedPtr msg); + const autoware_internal_debug_msgs::msg::Float32MultiArrayStamped::ConstSharedPtr msg); virtual void drawPlot(double val); virtual void update(float wall_dt, float ros_dt); // properties @@ -114,7 +114,7 @@ class Float32MultiArrayStampedPieChartDisplay : public rviz_common::Display rviz_common::properties::FloatProperty * med_color_threshold_property_; rviz_common::properties::BoolProperty * clockwise_rotate_property_; - rclcpp::Subscription::SharedPtr sub_; + rclcpp::Subscription::SharedPtr sub_; int left_; int top_; uint16_t texture_size_; diff --git a/common/tier4_debug_rviz_plugin/package.xml b/common/tier4_debug_rviz_plugin/package.xml index 7e15e1a3..788ad33d 100644 --- a/common/tier4_debug_rviz_plugin/package.xml +++ b/common/tier4_debug_rviz_plugin/package.xml @@ -19,7 +19,6 @@ rviz_common rviz_default_plugins rviz_rendering - tier4_debug_msgs ament_lint_auto autoware_lint_common diff --git a/common/tier4_debug_rviz_plugin/plugins/plugin_description.xml b/common/tier4_debug_rviz_plugin/plugins/plugin_description.xml index 72864327..57205a43 100644 --- a/common/tier4_debug_rviz_plugin/plugins/plugin_description.xml +++ b/common/tier4_debug_rviz_plugin/plugins/plugin_description.xml @@ -2,7 +2,7 @@ - Display drivable area of tier4_debug_msgs::msg::Float32MultiArrayStamped + Display drivable area of autoware_internal_debug_msgs::msg::Float32MultiArrayStamped lock(mutex_); @@ -297,10 +298,11 @@ void Float32MultiArrayStampedPieChartDisplay::subscribe() if (topic_name.length() > 0 && topic_name != "/") { rclcpp::Node::SharedPtr raw_node = context_->getRosNodeAbstraction().lock()->get_raw_node(); - sub_ = raw_node->create_subscription( - topic_name, 1, - std::bind( - &Float32MultiArrayStampedPieChartDisplay::processMessage, this, std::placeholders::_1)); + sub_ = + raw_node->create_subscription( + topic_name, 1, + std::bind( + &Float32MultiArrayStampedPieChartDisplay::processMessage, this, std::placeholders::_1)); } }