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.

Sign up for GitHub

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

refactor(simple_object_merger)!: fix namespace and directory structure #7700

Merged
merged 4 commits into from
Jun 27, 2024
Merged

refactor(simple_object_merger)!: fix namespace and directory structure #7700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
885d9b6
refactor(simple_object_merger): refactor library and node names
technolojin Jun 24, 2024
8db9b57
refactor: fix the node name
technolojin Jun 25, 2024
f347234
refactor: rename simple_object_merger library and node to follow auto…
technolojin Jun 25, 2024
f6bf208
refactor: move node header to src
technolojin Jun 26, 2024
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
8 changes: 4 additions & 4 deletions perception/simple_object_merger/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
autoware_package()

# Targets
ament_auto_add_library(simple_object_merger_node_component SHARED
src/simple_object_merger_node/simple_object_merger_node.cpp
ament_auto_add_library(${PROJECT_NAME} SHARED
src/simple_object_merger_node.cpp
)

rclcpp_components_register_node(simple_object_merger_node_component
PLUGIN "simple_object_merger::SimpleObjectMergerNode"
rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::simple_object_merger::SimpleObjectMergerNode"
EXECUTABLE simple_object_merger_node
)

Expand Down
8 changes: 4 additions & 4 deletions ...merger_node/simple_object_merger_node.cpp → ..._merger/src/simple_object_merger_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "simple_object_merger/simple_object_merger_node.hpp"
#include "simple_object_merger_node.hpp"

#include <geometry_msgs/msg/pose_stamped.hpp>

Expand Down Expand Up @@ -65,7 +65,7 @@

} // namespace

namespace simple_object_merger
namespace autoware::simple_object_merger
{
using namespace std::literals;
using std::chrono::duration;
Expand Down Expand Up @@ -193,7 +193,7 @@
pub_objects_->publish(output_objects);
}

} // namespace simple_object_merger
} // namespace autoware::simple_object_merger

#include "rclcpp_components/register_node_macro.hpp"
RCLCPP_COMPONENTS_REGISTER_NODE(simple_object_merger::SimpleObjectMergerNode)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::simple_object_merger::SimpleObjectMergerNode)

Check warning on line 199 in perception/simple_object_merger/src/simple_object_merger_node.cpp

View check run for this annotation

Codecov / codecov/patch

perception/simple_object_merger/src/simple_object_merger_node.cpp#L199 

Added line #L199 was not covered by tests
10 changes: 5 additions & 5 deletions ...ject_merger/simple_object_merger_node.hpp → ..._merger/src/simple_object_merger_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef SIMPLE_OBJECT_MERGER__SIMPLE_OBJECT_MERGER_NODE_HPP_
#define SIMPLE_OBJECT_MERGER__SIMPLE_OBJECT_MERGER_NODE_HPP_
#ifndef SIMPLE_OBJECT_MERGER_NODE_HPP_
#define SIMPLE_OBJECT_MERGER_NODE_HPP_

#include "autoware/universe_utils/ros/transform_listener.hpp"
#include "rclcpp/rclcpp.hpp"
Expand All @@ -25,7 +25,7 @@
#include <string>
#include <vector>

namespace simple_object_merger
namespace autoware::simple_object_merger
{
using autoware_perception_msgs::msg::DetectedObject;
using autoware_perception_msgs::msg::DetectedObjects;
Expand Down Expand Up @@ -76,6 +76,6 @@ class SimpleObjectMergerNode : public rclcpp::Node
size_t input_topic_size;
};

} // namespace simple_object_merger
} // namespace autoware::simple_object_merger

#endif // SIMPLE_OBJECT_MERGER__SIMPLE_OBJECT_MERGER_NODE_HPP_
#endif // SIMPLE_OBJECT_MERGER_NODE_HPP_
Loading