[tool] load parameters before initializing so they are available onIn…

…itialize
ros-visualization · Dec 16, 2020 · 462d717 · 462d717
1 parent 2fe6d33
commit 462d717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/rviz/tool_manager.cpp b/src/rviz/tool_manager.cpp
@@ -96,8 +96,7 @@ void ToolManager::load(const Config& config)
     QString class_id;
     if (tool_config.mapGetString("Class", &class_id))
     {
-      Tool* tool = addTool(class_id);
-      tool->load(tool_config);
+      Tool* tool = addTool(class_id, tool_config);
     }
   }
 }
@@ -220,7 +219,7 @@ void rviz::ToolManager::closeTool()
   setCurrentTool(getDefaultTool());
 }
 
-Tool* ToolManager::addTool(const QString& class_id)
+Tool* ToolManager::addTool(const QString& class_id, const Config& config)
 {
   QString error;
   bool failed = false;
@@ -234,6 +233,7 @@ Tool* ToolManager::addTool(const QString& class_id)
   tools_.append(tool);
   tool->setName(addSpaceToCamelCase(factory_->getClassName(class_id)));
   tool->setIcon(factory_->getIcon(class_id));
+  tool->load(config);
   tool->initialize(context_);
 
   if (tool->getShortcutKey() != '\0')

diff --git a/src/rviz/tool_manager.h b/src/rviz/tool_manager.h
@@ -64,7 +64,7 @@ class RVIZ_EXPORT ToolManager : public QObject
   }
 
   /** @brief Create a tool by class lookup name, add it to the list, and return it. */
-  Tool* addTool(const QString& tool_class_lookup_name);
+  Tool* addTool(const QString& tool_class_lookup_name, const Config& config = Config());
 
   /**
    * \brief Return the tool currently in use.