Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tier4_xxx_rviz_plugin): use StringStamped in autoware_internal_debug_msgs #181

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@

#endif

#include <tier4_debug_msgs/msg/string_stamped.hpp>
#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>

namespace rviz_plugins
{
class StringStampedOverlayDisplay
: public rviz_common::RosTopicDisplay<tier4_debug_msgs::msg::StringStamped>
: public rviz_common::RosTopicDisplay<autoware_internal_debug_msgs::msg::StringStamped>

{
Q_OBJECT
Expand All @@ -84,7 +84,8 @@ private Q_SLOTS:

protected:
void update(float wall_dt, float ros_dt) override;
void processMessage(const tier4_debug_msgs::msg::StringStamped::ConstSharedPtr msg_ptr) override;
void processMessage(
const autoware_internal_debug_msgs::msg::StringStamped::ConstSharedPtr msg_ptr) override;
jsk_rviz_plugins::OverlayObject::Ptr overlay_;
rviz_common::properties::ColorProperty * property_text_color_;
rviz_common::properties::IntProperty * property_left_;
Expand All @@ -100,7 +101,7 @@ private Q_SLOTS:
static constexpr int hand_width_ = 4;

std::mutex mutex_;
tier4_debug_msgs::msg::StringStamped::ConstSharedPtr last_msg_ptr_;
autoware_internal_debug_msgs::msg::StringStamped::ConstSharedPtr last_msg_ptr_;
};
} // namespace rviz_plugins

Expand Down
1 change: 1 addition & 0 deletions common/tier4_debug_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_internal_debug_msgs</depend>
<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
<depend>libqt5-widgets</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<class name="rviz_plugins/StringStampedOverlayDisplay"
type="rviz_plugins::StringStampedOverlayDisplay"
base_class_type="rviz_common::Display">
<description>Display drivable area of tier4_debug_msgs::msg::StringStamped</description>
<description>Display drivable area of autoware_internal_debug_msgs::msg::StringStamped</description>
</class>
</library>
2 changes: 1 addition & 1 deletion common/tier4_debug_rviz_plugin/src/string_stamped.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void StringStampedOverlayDisplay::update(float wall_dt, float ros_dt)
}

void StringStampedOverlayDisplay::processMessage(
const tier4_debug_msgs::msg::StringStamped::ConstSharedPtr msg_ptr)
const autoware_internal_debug_msgs::msg::StringStamped::ConstSharedPtr msg_ptr)
{
if (!isEnabled()) {
return;
Expand Down
2 changes: 1 addition & 1 deletion common/tier4_string_viewer_rviz_plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Purpose

This plugin displays the ROS message whose topic type is `tier4_debug_msgs::msg::StringStamped` in rviz.
This plugin displays the ROS message whose topic type is `autoware_internal_debug_msgs::msg::StringStamped` in rviz.

## Assumptions / Known limits

Expand Down
2 changes: 1 addition & 1 deletion common/tier4_string_viewer_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_internal_debug_msgs</depend>
<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
<depend>libqt5-widgets</depend>
<depend>qtbase5-dev</depend>
<depend>rclcpp</depend>
<depend>rviz_common</depend>
<depend>tier4_debug_msgs</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
#include <rviz_common/ros_integration/ros_node_abstraction_iface.hpp>
#include <rviz_common/ros_topic_display.hpp>

#include <tier4_debug_msgs/msg/string_stamped.hpp>
#include <autoware_internal_debug_msgs/msg/string_stamped.hpp>

namespace tier4_string_viewer_rviz_plugin
{

using tier4_debug_msgs::msg::StringStamped;
using autoware_internal_debug_msgs::msg::StringStamped;

class QLineEdit;

Expand Down
Loading