From a8dd1cba9b1e1fdbfe3665d32c79be94feee6382 Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Thu, 14 Dec 2023 18:08:48 +0100
Subject: [PATCH] Added aron tree widget
---
.../SkillManagerMonitorWidgetController.cpp | 3 +++
source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp | 8 ++++++++
source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h | 6 ++++++
3 files changed, 17 insertions(+)
diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
index 47234be7d..237498dca 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 127930695..822787125 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 b49123cae..90d81b1cb 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
--
GitLab