Merge pull request moveit#482 from Jntzko/renameDisplay

Renaming of display doesn't change panel name
zeta1999 · Apr 7, 2017 · 42dfcae · 42dfcae
2 parents 1e82706 + a535746
commit 42dfcae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.h b/...planning_rviz_plugin/include/moveit/motion_planning_rviz_plugin/motion_planning_display.h
@@ -93,6 +93,8 @@ class MotionPlanningDisplay : public PlanningSceneDisplay
   virtual void update(float wall_dt, float ros_dt);
   virtual void reset();
 
+  void setName(const QString& name);
+
   robot_state::RobotStateConstPtr getQueryStartState() const
   {
     return query_start_state_->getState();

diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_display.cpp
@@ -228,7 +228,7 @@ void MotionPlanningDisplay::onInitialize()
 
   if (window_context)
   {
-    frame_dock_ = window_context->addPane("Motion Planning", frame_);
+    frame_dock_ = window_context->addPane(getName(), frame_);
     connect(frame_dock_, SIGNAL(visibilityChanged(bool)), this, SLOT(motionPanelVisibilityChange(bool)));
     frame_dock_->setIcon(getIcon());
   }
@@ -305,6 +305,13 @@ void MotionPlanningDisplay::reset()
   query_robot_goal_->setVisible(query_goal_state_property_->getBool());
 }
 
+void MotionPlanningDisplay::setName(const QString& name)
+{
+  BoolProperty::setName(name);
+  frame_dock_->setWindowTitle(name);
+  frame_dock_->setObjectName(name);
+}
+
 void MotionPlanningDisplay::backgroundJobUpdate(moveit::tools::BackgroundProcessing::JobEvent, const std::string&)
 {
   addMainLoopJob(boost::bind(&MotionPlanningDisplay::updateBackgroundJobProgressBar, this));