From 8614acc786706075551773ebdccbc3592d7b3a07 Mon Sep 17 00:00:00 2001 From: Taekjin LEE Date: Thu, 27 Jun 2024 15:38:15 +0900 Subject: [PATCH] refactor(radar_tracks_msgs_converter)!: fix namespace and directory structure (#7653) * refactor: radar_tracks_msgs_converter library and node Signed-off-by: Taekjin LEE * refactor: rename node.hpp to radar_tracks_msgs_converter_node.hpp Signed-off-by: Taekjin LEE * refactor: fix the node name Signed-off-by: Taekjin LEE * refactor: update include statement for radar_tracks_msgs_converter_node.hpp Signed-off-by: Taekjin LEE * refactor: remove unused dependencies Signed-off-by: Taekjin LEE * refactor: move header file to src Signed-off-by: Taekjin LEE --------- Signed-off-by: Taekjin LEE --- perception/radar_tracks_msgs_converter/CMakeLists.txt | 8 ++++---- perception/radar_tracks_msgs_converter/package.xml | 2 -- .../radar_tracks_msgs_converter_node.cpp | 8 ++++---- .../radar_tracks_msgs_converter_node.hpp | 10 +++++----- 4 files changed, 13 insertions(+), 15 deletions(-) rename perception/radar_tracks_msgs_converter/src/{radar_tracks_msgs_converter_node => }/radar_tracks_msgs_converter_node.cpp (98%) rename perception/radar_tracks_msgs_converter/{include/radar_tracks_msgs_converter => src}/radar_tracks_msgs_converter_node.hpp (93%) diff --git a/perception/radar_tracks_msgs_converter/CMakeLists.txt b/perception/radar_tracks_msgs_converter/CMakeLists.txt index 766fb4b939904..4ff3be1fa45a4 100644 --- a/perception/radar_tracks_msgs_converter/CMakeLists.txt +++ b/perception/radar_tracks_msgs_converter/CMakeLists.txt @@ -5,12 +5,12 @@ find_package(autoware_cmake REQUIRED) autoware_package() ## Targets -ament_auto_add_library(radar_tracks_msgs_converter_node_component SHARED - src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp +ament_auto_add_library(${PROJECT_NAME} SHARED + src/radar_tracks_msgs_converter_node.cpp ) -rclcpp_components_register_node(radar_tracks_msgs_converter_node_component - PLUGIN "radar_tracks_msgs_converter::RadarTracksMsgsConverterNode" +rclcpp_components_register_node(${PROJECT_NAME} + PLUGIN "autoware::radar_tracks_msgs_converter::RadarTracksMsgsConverterNode" EXECUTABLE radar_tracks_msgs_converter_node ) diff --git a/perception/radar_tracks_msgs_converter/package.xml b/perception/radar_tracks_msgs_converter/package.xml index ad0257dbbd726..534c9a20fa0df 100644 --- a/perception/radar_tracks_msgs_converter/package.xml +++ b/perception/radar_tracks_msgs_converter/package.xml @@ -17,14 +17,12 @@ autoware_perception_msgs autoware_universe_utils - geometry_msgs nav_msgs radar_msgs rclcpp rclcpp_components tf2 tf2_geometry_msgs - tf2_ros ament_lint_auto autoware_lint_common diff --git a/perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp b/perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node.cpp similarity index 98% rename from perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp rename to perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node.cpp index 36f4d3cd3da90..5d45595733c4a 100644 --- a/perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp +++ b/perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "radar_tracks_msgs_converter/radar_tracks_msgs_converter_node.hpp" +#include "radar_tracks_msgs_converter_node.hpp" #include "autoware/universe_utils/geometry/geometry.hpp" #include "autoware/universe_utils/math/unit_conversion.hpp" @@ -56,7 +56,7 @@ bool update_param( } } // namespace -namespace radar_tracks_msgs_converter +namespace autoware::radar_tracks_msgs_converter { enum class RadarTrackObjectID { @@ -407,7 +407,7 @@ uint8_t RadarTracksMsgsConverterNode::convertClassification(const uint16_t class } } -} // namespace radar_tracks_msgs_converter +} // namespace autoware::radar_tracks_msgs_converter #include "rclcpp_components/register_node_macro.hpp" -RCLCPP_COMPONENTS_REGISTER_NODE(radar_tracks_msgs_converter::RadarTracksMsgsConverterNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::radar_tracks_msgs_converter::RadarTracksMsgsConverterNode) diff --git a/perception/radar_tracks_msgs_converter/include/radar_tracks_msgs_converter/radar_tracks_msgs_converter_node.hpp b/perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node.hpp similarity index 93% rename from perception/radar_tracks_msgs_converter/include/radar_tracks_msgs_converter/radar_tracks_msgs_converter_node.hpp rename to perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node.hpp index 30d02c90b0594..36528711cc403 100644 --- a/perception/radar_tracks_msgs_converter/include/radar_tracks_msgs_converter/radar_tracks_msgs_converter_node.hpp +++ b/perception/radar_tracks_msgs_converter/src/radar_tracks_msgs_converter_node.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef RADAR_TRACKS_MSGS_CONVERTER__RADAR_TRACKS_MSGS_CONVERTER_NODE_HPP_ -#define RADAR_TRACKS_MSGS_CONVERTER__RADAR_TRACKS_MSGS_CONVERTER_NODE_HPP_ +#ifndef RADAR_TRACKS_MSGS_CONVERTER_NODE_HPP_ +#define RADAR_TRACKS_MSGS_CONVERTER_NODE_HPP_ #include "autoware/universe_utils/ros/transform_listener.hpp" #include "rclcpp/rclcpp.hpp" @@ -32,7 +32,7 @@ #include #include -namespace radar_tracks_msgs_converter +namespace autoware::radar_tracks_msgs_converter { using autoware_perception_msgs::msg::DetectedObject; using autoware_perception_msgs::msg::DetectedObjectKinematics; @@ -114,6 +114,6 @@ class RadarTracksMsgsConverterNode : public rclcpp::Node uint8_t convertClassification(const uint16_t classification); }; -} // namespace radar_tracks_msgs_converter +} // namespace autoware::radar_tracks_msgs_converter -#endif // RADAR_TRACKS_MSGS_CONVERTER__RADAR_TRACKS_MSGS_CONVERTER_NODE_HPP_ +#endif // RADAR_TRACKS_MSGS_CONVERTER_NODE_HPP_