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

revert(tier4_calibration_rviz_plugin): readability-identifier-naming #1618

Merged
merged 1 commit into from
Aug 18, 2022
Merged

revert(tier4_calibration_rviz_plugin): readability-identifier-naming #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions common/tier4_calibration_rviz_plugin/src/accel_brake_map_calibrator_button_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ void AccelBrakeMapCalibratorButtonPanel::onInitialize()
update_suggest_sub_ = raw_node->create_subscription<std_msgs::msg::Bool>(
topic_edit_->text().toStdString(), 10,
std::bind(
&AccelBrakeMapCalibratorButtonPanel::callback_update_suggest, this, std::placeholders::_1));
&AccelBrakeMapCalibratorButtonPanel::callbackUpdateSuggest, this, std::placeholders::_1));

client_ = raw_node->create_client<tier4_vehicle_msgs::srv::UpdateAccelBrakeMap>(
"/accel_brake_map_calibrator/update_map_dir");
}

void AccelBrakeMapCalibratorButtonPanel::callback_update_suggest(
void AccelBrakeMapCalibratorButtonPanel::callbackUpdateSuggest(
const std_msgs::msg::Bool::ConstSharedPtr msg)
{
if (after_calib_) {
Expand All @@ -96,20 +96,20 @@ void AccelBrakeMapCalibratorButtonPanel::callback_update_suggest(
calibration_button_->setEnabled(true);
}

void AccelBrakeMapCalibratorButtonPanel::edit_topic()
void AccelBrakeMapCalibratorButtonPanel::editTopic()
{
update_suggest_sub_.reset();
rclcpp::Node::SharedPtr raw_node =
this->getDisplayContext()->getRosNodeAbstraction().lock()->get_raw_node();
update_suggest_sub_ = raw_node->create_subscription<std_msgs::msg::Bool>(
topic_edit_->text().toStdString(), 10,
std::bind(
&AccelBrakeMapCalibratorButtonPanel::callback_update_suggest, this, std::placeholders::_1));
&AccelBrakeMapCalibratorButtonPanel::callbackUpdateSuggest, this, std::placeholders::_1));
calibration_button_->setText("Wait for subscribe topic");
calibration_button_->setEnabled(false);
}

void AccelBrakeMapCalibratorButtonPanel::push_calibration_button()
void AccelBrakeMapCalibratorButtonPanel::pushCalibrationButton()
{
// lock button
calibration_button_->setEnabled(false);
Expand Down
6 changes: 3 additions & 3 deletions common/tier4_calibration_rviz_plugin/src/accel_brake_map_calibrator_button_panel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ class AccelBrakeMapCalibratorButtonPanel : public rviz_common::Panel
public:
explicit AccelBrakeMapCalibratorButtonPanel(QWidget * parent = nullptr);
void onInitialize() override;
void callback_update_suggest(const std_msgs::msg::Bool::ConstSharedPtr msg);
void callbackUpdateSuggest(const std_msgs::msg::Bool::ConstSharedPtr msg);

public Q_SLOTS: // NOLINT for Qt
void edit_topic();
void push_calibration_button();
void editTopic();
void pushCalibrationButton();

protected:
rclcpp::Subscription<std_msgs::msg::Bool>::SharedPtr update_suggest_sub_;
Expand Down