rviz plugin: define constants for tab titles

zeta1999 · Mar 20, 2017 · 3da42bc · 3da42bc
1 parent 4e1e2fe
commit 3da42bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 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
@@ -84,6 +84,14 @@ class MotionPlanningDisplay;
 
 const std::string OBJECT_RECOGNITION_ACTION = "/recognize_objects";
 
+static const std::string TAB_CONTEXT = "Context";
+static const std::string TAB_PLANNING = "Planning";
+static const std::string TAB_MANIPULATION = "Manipulation";
+static const std::string TAB_OBJECTS = "Scene Objects";
+static const std::string TAB_SCENES = "Stored Scenes";
+static const std::string TAB_STATES = "Stored States";
+static const std::string TAB_STATUS = "Status";
+
 class MotionPlanningFrame : public QWidget
 {
   friend class MotionPlanningDisplay;

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
@@ -454,9 +454,9 @@ void MotionPlanningFrame::disable()
 
 void MotionPlanningFrame::tabChanged(int index)
 {
-  if (scene_marker_ && ui_->tabWidget->tabText(index) != "Scene Objects")
+  if (scene_marker_ && ui_->tabWidget->tabText(index).toStdString() != TAB_OBJECTS)
     scene_marker_.reset();
-  else if (ui_->tabWidget->tabText(index) == "Scene Objects")
+  else if (ui_->tabWidget->tabText(index).toStdString() == TAB_OBJECTS)
     selectedCollisionObjectChanged();
 }
 

diff --git a/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame_objects.cpp b/moveit_ros/visualization/motion_planning_rviz_plugin/src/motion_planning_frame_objects.cpp
@@ -268,7 +268,7 @@ void MotionPlanningFrame::selectedCollisionObjectChanged()
         else
           ui_->object_status->setText("ERROR: '" + sel[0]->text() + "' should be a collision object but it is not");
       }
-      if (update_scene_marker && ui_->tabWidget->tabText(ui_->tabWidget->currentIndex()) == "Scene Objects")
+      if (update_scene_marker && ui_->tabWidget->tabText(ui_->tabWidget->currentIndex()).toStdString() == TAB_OBJECTS)
       {
         createSceneInteractiveMarker();
       }