simplify: remove MotionPlanningFrame::setPlanningGroupText()

Tobias-Fischer · Nov 29, 2018 · 7b7a8e8 · 7b7a8e8
1 parent 3ae8d9e
commit 7b7a8e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/...n_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_frame.h b/...n_planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_frame.h
@@ -231,7 +231,6 @@ private Q_SLOTS:
   void updateQueryStateHelper(robot_state::RobotState& state, const std::string& v);
   void fillStateSelectionOptions();
   void fillPlanningGroupOptions();
-  void setPlanningGroupText();
   void startStateTextChangedExec(const std::string& start_state);
   void goalStateTextChangedExec(const std::string& goal_state);
 

diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame.cpp
@@ -260,11 +260,6 @@ void MotionPlanningFrame::fillPlanningGroupOptions()
     ui_->planning_group_combo_box->addItem(QString::fromStdString(group_name));
 }
 
-void MotionPlanningFrame::setPlanningGroupText()
-{
-  ui_->planning_group_combo_box->setCurrentText(QString::fromStdString(planning_display_->getCurrentPlanningGroup()));
-}
-
 void MotionPlanningFrame::fillStateSelectionOptions()
 {
   const QSignalBlocker start_state_blocker(ui_->start_state_combo_box);
@@ -314,7 +309,6 @@ void MotionPlanningFrame::changePlanningGroupHelper()
   if (!planning_display_->getPlanningSceneMonitor())
     return;
 
-  planning_display_->addMainLoopJob(boost::bind(&MotionPlanningFrame::setPlanningGroupText, this));
   planning_display_->addMainLoopJob(boost::bind(&MotionPlanningFrame::fillStateSelectionOptions, this));
   planning_display_->addMainLoopJob(
       boost::bind(&MotionPlanningFrame::populateConstraintsList, this, std::vector<std::string>()));
@@ -323,6 +317,7 @@ void MotionPlanningFrame::changePlanningGroupHelper()
   std::string group = planning_display_->getCurrentPlanningGroup();
   planning_display_->addMainLoopJob(
       boost::bind(&MotionPlanningParamWidget::setGroupName, ui_->planner_param_treeview, group));
+  planning_display_->addMainLoopJob([=](){ui_->planning_group_combo_box->setCurrentText(QString::fromStdString(group));});
 
   if (!group.empty() && robot_model)
   {