Skip to content
Snippets Groups Projects
Commit a8dd1cba authored by Peter Albrecht's avatar Peter Albrecht
Browse files

Added aron tree widget

parent de3f32b8
No related branches found
No related tags found
1 merge request!406Refactor skill memory GUI
Pipeline #16670 failed
......@@ -170,6 +170,9 @@ namespace armarx
widget.updateWidgetLayout,
widget.skillDescription,
widget.skillDescription->parentWidget()->layout(),
this->mem_wrapper);
/*
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment