Skip to content

Commit 9d71cce

Browse files
authored
fix(multi_object_tracker): revert mot node implementation to composable node components (#7117)
* Revert "chore(multi_object_tracker): change node and glog implementation (#6780)" This reverts commit 81c432e. Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * fix: follow executable naming rule Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * fix: update executable name Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> --------- Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent 7b51a43 commit 9d71cce

File tree

4 files changed

+12
-41
lines changed

4 files changed

+12
-41
lines changed

perception/multi_object_tracker/CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,18 @@ set(MULTI_OBJECT_TRACKER_SRC
4444
src/tracker/model/pass_through_tracker.cpp
4545
)
4646

47-
ament_auto_add_library(multi_object_tracker_node SHARED
47+
ament_auto_add_library(${PROJECT_NAME} SHARED
4848
${MULTI_OBJECT_TRACKER_SRC}
4949
)
5050

51-
target_link_libraries(multi_object_tracker_node
51+
target_link_libraries(${PROJECT_NAME}
5252
Eigen3::Eigen
5353
glog::glog
5454
)
5555

56-
ament_auto_add_executable(${PROJECT_NAME}
57-
src/multi_object_tracker_node.cpp
56+
rclcpp_components_register_node(${PROJECT_NAME}
57+
PLUGIN "multi_object_tracker::MultiObjectTracker"
58+
EXECUTABLE ${PROJECT_NAME}_node
5859
)
5960

6061
ament_auto_package(INSTALL_TO_SHARE

perception/multi_object_tracker/launch/multi_object_tracker.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<arg name="data_association_matrix_path" default="$(find-pkg-share multi_object_tracker)/config/data_association_matrix.param.yaml"/>
77
<arg name="input_channels_path" default="$(find-pkg-share multi_object_tracker)/config/input_channels.param.yaml"/>
88

9-
<node pkg="multi_object_tracker" exec="multi_object_tracker" name="multi_object_tracker" output="screen">
9+
<node pkg="multi_object_tracker" exec="multi_object_tracker_node" name="multi_object_tracker" output="screen">
1010
<param name="selected_input_channels" value="$(var selected_input_channels)"/>
1111
<remap from="output" to="$(var output)"/>
1212
<param from="$(var tracker_setting_path)"/>

perception/multi_object_tracker/src/multi_object_tracker_core.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ MultiObjectTracker::MultiObjectTracker(const rclcpp::NodeOptions & node_options)
7575
tf_listener_(tf_buffer_),
7676
last_published_time_(this->now())
7777
{
78+
// glog for debug
79+
if (!google::IsGoogleLoggingInitialized()) {
80+
google::InitGoogleLogging("multi_object_tracker");
81+
google::InstallFailureSignalHandler();
82+
}
83+
7884
// Get parameters
7985
double publish_rate = declare_parameter<double>("publish_rate"); // [hz]
8086
world_frame_id_ = declare_parameter<std::string>("world_frame_id");

perception/multi_object_tracker/src/multi_object_tracker_node.cpp

-36
This file was deleted.

0 commit comments

Comments
 (0)