diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp index 47234be7dd805c57182ed70b83b0c64b0840af26..237498dcac4f964ee2de295f88b013a0907b5fb5 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp @@ -170,6 +170,9 @@ namespace armarx widget.updateWidgetLayout, + widget.skillDescription, + widget.skillDescription->parentWidget()->layout(), + this->mem_wrapper); /* diff --git a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp index 1279306950200e5b9747c10fe819b4f5a87ac12d..822787125ef61abd59ff96a68017f2c58abbdd1e 100644 --- a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp +++ b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp @@ -12,6 +12,9 @@ namespace armarx::skills::gui QSplitter* _skillDetailGroupBoxParentLayout, QHBoxLayout* _updateWidgetLayout, + QWidget* skillDescription, + QLayout* skillDescriptionParentLayout, + std::shared_ptr<SkillManagerWrapper> _memory) { Logging::setTag("SkillMemoryGui"); @@ -49,6 +52,11 @@ namespace armarx::skills::gui this->skillDetailGroupBox = new SkillDetailGroupBox(memory); armarx::gui::replaceWidget( _skillDetailGroupBox, this->skillDetailGroupBox, _skillDetailGroupBoxParentLayout); + + // aron + skillDescriptionWidget = new SkillDescriptionWidget(); + armarx::gui::replaceWidget( + skillDescription, this->skillDescriptionWidget, skillDescriptionParentLayout); } void diff --git a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h index b49123caeaf8165792aae15aa96197dae53ee82d..90d81b1cb15982fd7533fdb0a3450ab6ff6faa22 100644 --- a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h +++ b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h @@ -9,6 +9,7 @@ #include <ArmarXCore/core/logging/Logging.h> #include "./PeriodicUpdateWidget.h" +#include "./aron_tree_widget/widgets/SkillDescriptionWidget.h" #include "./executions/SkillExecutionTreeWidget.h" #include "./memory/SkillManagerWrapper.h" #include "./skill_details/SkillDetailsGroupBox.h" @@ -30,6 +31,9 @@ namespace armarx::skills::gui QSplitter* _skillDetailGroupBoxParentLayout, QHBoxLayout* _updateWidgetLayout, + QWidget* skillDescription, + QLayout* skillDescriptionParentLayout, + std::shared_ptr<SkillManagerWrapper> _memory); public slots: @@ -49,6 +53,8 @@ namespace armarx::skills::gui std::shared_ptr<SkillManagerWrapper> memory = nullptr; PeriodicUpdateWidget* updateWidget = nullptr; + + SkillDescriptionWidget* skillDescriptionWidget = nullptr; }; } // namespace armarx::skills::gui