1616
1717#include " automatic_goal_panel.hpp"
1818
19- #include < autoware/universe_utils/ros /marker_helper.hpp>
19+ #include < autoware_utils_visualization /marker_helper.hpp>
2020
2121#include < string>
2222#include < utility>
@@ -442,26 +442,26 @@ void AutowareAutomaticGoalPanel::updateGoalIcon(const unsigned goal_index, const
442442
443443void AutowareAutomaticGoalPanel::publishMarkers ()
444444{
445- using autoware::universe_utils::createDefaultMarker ;
446- using autoware::universe_utils::createMarkerColor ;
447- using autoware::universe_utils::createMarkerScale ;
445+ using autoware_utils_visualization::create_default_marker ;
446+ using autoware_utils_visualization::create_marker_color ;
447+ using autoware_utils_visualization::create_marker_scale ;
448448
449449 MarkerArray text_array;
450450 MarkerArray arrow_array;
451451 // Clear existing
452452 {
453- auto marker = createDefaultMarker (
453+ auto marker = create_default_marker (
454454 " map" , rclcpp::Clock{RCL_ROS_TIME}.now (), " names" , 0L , Marker::CUBE,
455- createMarkerScale (1.0 , 1.0 , 1.0 ), createMarkerColor (1.0 , 1.0 , 1.0 , 0.999 ));
455+ create_marker_scale (1.0 , 1.0 , 1.0 ), create_marker_color (1.0 , 1.0 , 1.0 , 0.999 ));
456456 marker.action = visualization_msgs::msg::Marker::DELETEALL;
457457 text_array.markers .push_back (marker);
458458 pub_marker_->publish (text_array);
459459 }
460460
461461 {
462- auto marker = createDefaultMarker (
462+ auto marker = create_default_marker (
463463 " map" , rclcpp::Clock{RCL_ROS_TIME}.now (), " poses" , 0L , Marker::CUBE,
464- createMarkerScale (1.0 , 1.0 , 1.0 ), createMarkerColor (1.0 , 1.0 , 1.0 , 0.999 ));
464+ create_marker_scale (1.0 , 1.0 , 1.0 ), create_marker_color (1.0 , 1.0 , 1.0 , 0.999 ));
465465 arrow_array.markers .push_back (marker);
466466 pub_marker_->publish (arrow_array);
467467 }
@@ -470,9 +470,9 @@ void AutowareAutomaticGoalPanel::publishMarkers()
470470 arrow_array.markers .clear ();
471471
472472 const auto push_arrow_marker = [&](const auto & pose, const auto & color, const size_t id) {
473- auto marker = createDefaultMarker (
473+ auto marker = create_default_marker (
474474 " map" , rclcpp::Clock{RCL_ROS_TIME}.now (), " poses" , id, Marker::ARROW,
475- createMarkerScale (1.6 , 0.5 , 0.5 ), color);
475+ create_marker_scale (1.6 , 0.5 , 0.5 ), color);
476476 marker.action = visualization_msgs::msg::Marker::ADD;
477477 marker.pose = pose;
478478 marker.lifetime = rclcpp::Duration (0 , 0 );
@@ -481,9 +481,9 @@ void AutowareAutomaticGoalPanel::publishMarkers()
481481 };
482482
483483 const auto push_text_marker = [&](const auto & pose, const auto & text, const size_t id) {
484- auto marker = createDefaultMarker (
484+ auto marker = create_default_marker (
485485 " map" , rclcpp::Clock{RCL_ROS_TIME}.now (), " names" , id, Marker::TEXT_VIEW_FACING,
486- createMarkerScale (1.6 , 1.6 , 1.6 ), createMarkerColor (1.0 , 1.0 , 1.0 , 0.999 ));
486+ create_marker_scale (1.6 , 1.6 , 1.6 ), create_marker_color (1.0 , 1.0 , 1.0 , 0.999 ));
487487 marker.action = visualization_msgs::msg::Marker::ADD;
488488 marker.pose = pose;
489489 marker.lifetime = rclcpp::Duration (0 , 0 );
@@ -497,13 +497,13 @@ void AutowareAutomaticGoalPanel::publishMarkers()
497497 for (size_t i = 0 ; i < goals_list_.size (); ++i) {
498498 {
499499 const auto pose = goals_list_.at (i).goal_pose_ptr ->pose ;
500- push_arrow_marker (pose, createMarkerColor (0.0 , 1.0 , 0.0 , 0.999 ), id++);
500+ push_arrow_marker (pose, create_marker_color (0.0 , 1.0 , 0.0 , 0.999 ), id++);
501501 push_text_marker (pose, " Goal:" + std::to_string (i), id++);
502502 }
503503
504504 for (size_t j = 0 ; j < goals_list_.at (i).checkpoint_pose_ptrs .size (); ++j) {
505505 const auto pose = goals_list_.at (i).checkpoint_pose_ptrs .at (j)->pose ;
506- push_arrow_marker (pose, createMarkerColor (1.0 , 1.0 , 0.0 , 0.999 ), id++);
506+ push_arrow_marker (pose, create_marker_color (1.0 , 1.0 , 0.0 , 0.999 ), id++);
507507 push_text_marker (
508508 pose, " Checkpoint:" + std::to_string (i) + " [Goal:" + std::to_string (j) + " ]" , id++);
509509 }
0 commit comments