Skip to content

Commit

Permalink
refactor(tier4_state_rviz_plugin): apply clang-tidy for readability-i…
Browse files Browse the repository at this point in the history 
…dentifier-naming (autowarefoundation#1595)

* refactor(tier4_state_rviz_plugin): apply clang-tidy for readability-identifier-naming

Signed-off-by: h-ohta <[email protected]>

* ci(pre-commit): autofix

Signed-off-by: h-ohta <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
@h-ohta @pre-commit-ci
h-ohta and pre-commit-ci[bot] authored Aug 17, 2022
1 parent d20e079 commit 5772020
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 30 deletions.
39 changes: 20 additions & 19 deletions common/tier4_state_rviz_plugin/src/autoware_state_panel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <memory>
#include <string>

inline std::string Bool2String(const bool var) { return var ? "True" : "False"; }
inline std::string bool_to_string(const bool var) { return var ? "True" : "False"; }

using std::placeholders::_1;

Expand Down Expand Up @@ -128,25 +128,26 @@ void AutowareStatePanel::onInitialize()
raw_node_ = this->getDisplayContext()->getRosNodeAbstraction().lock()->get_raw_node();

sub_gate_mode_ = raw_node_->create_subscription<tier4_control_msgs::msg::GateMode>(
"/control/current_gate_mode", 10, std::bind(&AutowareStatePanel::onGateMode, this, _1));
"/control/current_gate_mode", 10, std::bind(&AutowareStatePanel::on_gate_mode, this, _1));

sub_selector_mode_ =
raw_node_->create_subscription<tier4_control_msgs::msg::ExternalCommandSelectorMode>(
"/control/external_cmd_selector/current_selector_mode", 10,
std::bind(&AutowareStatePanel::onSelectorMode, this, _1));
std::bind(&AutowareStatePanel::on_selector_mode, this, _1));

sub_autoware_state_ =
raw_node_->create_subscription<autoware_auto_system_msgs::msg::AutowareState>(
"/autoware/state", 10, std::bind(&AutowareStatePanel::onAutowareState, this, _1));
"/autoware/state", 10, std::bind(&AutowareStatePanel::on_autoware_state, this, _1));

sub_gear_ = raw_node_->create_subscription<autoware_auto_vehicle_msgs::msg::GearReport>(
"/vehicle/status/gear_status", 10, std::bind(&AutowareStatePanel::onShift, this, _1));
"/vehicle/status/gear_status", 10, std::bind(&AutowareStatePanel::on_shift, this, _1));

sub_engage_ = raw_node_->create_subscription<tier4_external_api_msgs::msg::EngageStatus>(
"/api/external/get/engage", 10, std::bind(&AutowareStatePanel::onEngageStatus, this, _1));
"/api/external/get/engage", 10, std::bind(&AutowareStatePanel::on_engage_status, this, _1));

sub_emergency_ = raw_node_->create_subscription<tier4_external_api_msgs::msg::Emergency>(
"/api/autoware/get/emergency", 10, std::bind(&AutowareStatePanel::onEmergencyStatus, this, _1));
"/api/autoware/get/emergency", 10,
std::bind(&AutowareStatePanel::on_emergency_status, this, _1));

client_engage_ = raw_node_->create_client<tier4_external_api_msgs::srv::Engage>(
"/api/external/set/engage", rmw_qos_profile_services_default);
Expand All @@ -166,7 +167,7 @@ void AutowareStatePanel::onInitialize()
rclcpp::QoS{1}.transient_local());
}

void AutowareStatePanel::onGateMode(const tier4_control_msgs::msg::GateMode::ConstSharedPtr msg)
void AutowareStatePanel::on_gate_mode(const tier4_control_msgs::msg::GateMode::ConstSharedPtr msg)
{
switch (msg->data) {
case tier4_control_msgs::msg::GateMode::AUTO:
Expand All @@ -186,7 +187,7 @@ void AutowareStatePanel::onGateMode(const tier4_control_msgs::msg::GateMode::Con
}
}

void AutowareStatePanel::onSelectorMode(
void AutowareStatePanel::on_selector_mode(
const tier4_control_msgs::msg::ExternalCommandSelectorMode::ConstSharedPtr msg)
{
switch (msg->data) {
Expand All @@ -212,7 +213,7 @@ void AutowareStatePanel::onSelectorMode(
}
}

void AutowareStatePanel::onAutowareState(
void AutowareStatePanel::on_autoware_state(
const autoware_auto_system_msgs::msg::AutowareState::ConstSharedPtr msg)
{
if (msg->state == autoware_auto_system_msgs::msg::AutowareState::INITIALIZING) {
Expand All @@ -239,7 +240,7 @@ void AutowareStatePanel::onAutowareState(
}
}

void AutowareStatePanel::onShift(
void AutowareStatePanel::on_shift(
const autoware_auto_vehicle_msgs::msg::GearReport::ConstSharedPtr msg)
{
switch (msg->report) {
Expand All @@ -258,14 +259,14 @@ void AutowareStatePanel::onShift(
}
}

void AutowareStatePanel::onEngageStatus(
void AutowareStatePanel::on_engage_status(
const tier4_external_api_msgs::msg::EngageStatus::ConstSharedPtr msg)
{
current_engage_ = msg->engage;
engage_status_label_ptr_->setText(QString::fromStdString(Bool2String(current_engage_)));
engage_status_label_ptr_->setText(QString::fromStdString(bool_to_string(current_engage_)));
}

void AutowareStatePanel::onEmergencyStatus(
void AutowareStatePanel::on_emergency_status(
const tier4_external_api_msgs::msg::Emergency::ConstSharedPtr msg)
{
current_emergency_ = msg->emergency;
Expand All @@ -278,14 +279,14 @@ void AutowareStatePanel::onEmergencyStatus(
}
}

void AutowareStatePanel::onClickVelocityLimit()
void AutowareStatePanel::on_click_velocity_limit()
{
auto velocity_limit = std::make_shared<tier4_planning_msgs::msg::VelocityLimit>();
velocity_limit->max_velocity = pub_velocity_limit_input_->value() / 3.6;
pub_velocity_limit_->publish(*velocity_limit);
}

void AutowareStatePanel::onClickAutowareEngage()
void AutowareStatePanel::on_click_autoware_engage()
{
using tier4_external_api_msgs::srv::Engage;

Expand All @@ -306,7 +307,7 @@ void AutowareStatePanel::onClickAutowareEngage()
});
}

void AutowareStatePanel::onClickEmergencyButton()
void AutowareStatePanel::on_click_emergency_button()
{
using tier4_external_api_msgs::msg::ResponseStatus;
using tier4_external_api_msgs::srv::SetEmergency;
Expand All @@ -327,7 +328,7 @@ void AutowareStatePanel::onClickEmergencyButton()
}
});
}
void AutowareStatePanel::onClickGateMode()
void AutowareStatePanel::on_click_gate_mode()
{
const auto data = gate_mode_label_ptr_->text().toStdString() == "AUTO"
? tier4_control_msgs::msg::GateMode::EXTERNAL
Expand All @@ -337,7 +338,7 @@ void AutowareStatePanel::onClickGateMode()
tier4_control_msgs::build<tier4_control_msgs::msg::GateMode>().data(data));
}

void AutowareStatePanel::onClickPathChangeApproval()
void AutowareStatePanel::on_click_path_change_approval()
{
pub_path_change_approval_->publish(
tier4_planning_msgs::build<tier4_planning_msgs::msg::Approval>()
Expand Down
22 changes: 11 additions & 11 deletions common/tier4_state_rviz_plugin/src/autoware_state_panel.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ class AutowareStatePanel : public rviz_common::Panel
void onInitialize() override;

public Q_SLOTS: // NOLINT for Qt
void onClickAutowareEngage();
void onClickVelocityLimit();
void onClickGateMode();
void onClickPathChangeApproval();
void onClickEmergencyButton();
void on_click_autoware_engage();
void on_click_velocity_limit();
void on_click_gate_mode();
void on_click_path_change_approval();
void on_click_emergency_button();

protected:
void onGateMode(const tier4_control_msgs::msg::GateMode::ConstSharedPtr msg);
void onSelectorMode(
void on_gate_mode(const tier4_control_msgs::msg::GateMode::ConstSharedPtr msg);
void on_selector_mode(
const tier4_control_msgs::msg::ExternalCommandSelectorMode::ConstSharedPtr msg);
void onAutowareState(const autoware_auto_system_msgs::msg::AutowareState::ConstSharedPtr msg);
void onShift(const autoware_auto_vehicle_msgs::msg::GearReport::ConstSharedPtr msg);
void onEmergencyStatus(const tier4_external_api_msgs::msg::Emergency::ConstSharedPtr msg);
void onEngageStatus(const tier4_external_api_msgs::msg::EngageStatus::ConstSharedPtr msg);
void on_autoware_state(const autoware_auto_system_msgs::msg::AutowareState::ConstSharedPtr msg);
void on_shift(const autoware_auto_vehicle_msgs::msg::GearReport::ConstSharedPtr msg);
void on_emergency_status(const tier4_external_api_msgs::msg::Emergency::ConstSharedPtr msg);
void on_engage_status(const tier4_external_api_msgs::msg::EngageStatus::ConstSharedPtr msg);

rclcpp::Node::SharedPtr raw_node_;
rclcpp::Subscription<tier4_control_msgs::msg::GateMode>::SharedPtr sub_gate_mode_;
Expand Down

0 comments on commit 5772020

Please sign in to comment.