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(logger_level_reconfigure_plugin): use node interface and some cosmetic updates #5204

Merged
Merged
Show file tree
Hide file tree
Changes from 7 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 @@ -24,4 +24,5 @@ pluginlib_export_plugin_description_file(rviz_common plugins/plugin_description.
ament_auto_package(
INSTALL_TO_SHARE
plugins
config
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# logger_config.yaml

# ============================================================
# planning
# ============================================================

behavior_path_planner:
- node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner
logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_path_planner
- node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner
logger_name: tier4_autoware_utils

behavior_path_planner_avoidance:
- node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner
logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_path_planner.avoidance

behavior_velocity_planner:
- node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner
logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_velocity_planner
- node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner
logger_name: tier4_autoware_utils

behavior_velocity_planner_intersection:
- node_name: /planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner
logger_name: planning.scenario_planning.lane_driving.behavior_planning.behavior_velocity_planner.intersection

motion_obstacle_avoidance:
- node_name: /planning/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner
logger_name: planning.scenario_planning.lane_driving.motion_planning.obstacle_avoidance_planner
- node_name: /planning/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner
logger_name: tier4_autoware_utils

motion_velocity_smoother:
- node_name: /planning/scenario_planning/motion_velocity_smoother
logger_name: planning.scenario_planning.motion_velocity_smoother
- node_name: /planning/scenario_planning/motion_velocity_smoother
logger_name: tier4_autoware_utils

# ============================================================
# control
# ============================================================

lateral_controller:
- node_name: /control/trajectory_follower/controller_node_exe
logger_name: control.trajectory_follower.controller_node_exe.lateral_controller
- node_name: /control/trajectory_follower/controller_node_exe
logger_name: tier4_autoware_utils

longitudinal_controller:
- node_name: /control/trajectory_follower/controller_node_exe
logger_name: control.trajectory_follower.controller_node_exe.longitudinal_controller
- node_name: /control/trajectory_follower/controller_node_exe
logger_name: tier4_autoware_utils

vehicle_cmd_gate:
- node_name: /control/vehicle_cmd_gate
logger_name: control.vehicle_cmd_gate
- node_name: /control/vehicle_cmd_gate
logger_name: tier4_autoware_utils
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ class LoggingLevelConfigureRvizPlugin : public rviz_common::Panel
QMap<QString, QButtonGroup *> buttonGroups_;
rclcpp::Node::SharedPtr raw_node_;

// logger_node_map_[target_name] = {container_name, logger_name}
std::map<QString, std::vector<std::pair<QString, QString>>> logger_node_map_;
// node_logger_map_[button_name] = {node_name, logger_name}
std::map<QString, std::vector<std::pair<QString, QString>>> node_logger_map_;

// client_map_[container_name] = service_client
// client_map_[node_name] = service_client
std::unordered_map<QString, rclcpp::Client<logging_demo::srv::ConfigLogger>::SharedPtr>
client_map_;

// button_map_[target_name][logging_level] = Q_button_pointer
// button_map_[button_name][logging_level] = Q_button_pointer
std::unordered_map<QString, std::unordered_map<QString, QPushButton *>> button_map_;

QStringList getContainerList();
QStringList getNodeList();
int getMaxModuleNameWidth(QLabel * containerLabel);
void setLoggerNodeMap();
void attachLoggingComponent();

private Q_SLOTS:
void onButtonClick(QPushButton * button, const QString & name, const QString & level);
void updateButtonColors(const QString & target_module_name, QPushButton * active_button);
void updateButtonColors(
const QString & target_module_name, QPushButton * active_button, const QString & level);
void changeLogLevel(const QString & container, const QString & level);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<depend>rviz_common</depend>
<depend>rviz_default_plugins</depend>
<depend>rviz_rendering</depend>
<depend>yaml-cpp</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
Loading