From 94074cc5120793eb7b816bff2a77bdb18b13b266 Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Wed, 20 Dec 2023 10:36:12 +0100
Subject: [PATCH] Removed "SkillDescriptionWidget" from gui
---
.../skill_details/SkillDetailsGroupBox.cpp | 28 ++-----------------
.../skill_details/SkillDetailsGroupBox.h | 10 -------
2 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
index 4489154ee..00e5944e7 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
@@ -2,24 +2,6 @@
namespace armarx::skills::gui
{
- void
- SkillDetailGroupBox::lock()
- {
- this->executeSkillButton->setDisabled(true);
- this->skillDetailsTreeWidget->setDisabled(true);
- this->descriptionWidget->setDisabled(true);
- this->profileMenuWidget->setDisabled(true);
- }
-
- void
- SkillDetailGroupBox::unlock()
- {
- this->executeSkillButton->setDisabled(false);
- this->skillDetailsTreeWidget->setDisabled(false);
- this->descriptionWidget->setDisabled(false);
- this->profileMenuWidget->setDisabled(false);
- }
-
void
SkillDetailGroupBox::updateSkillDetails(SkillID& _skillId)
{
@@ -58,7 +40,7 @@ namespace armarx::skills::gui
// ------------ update widgets ------------
- this->lock();
+ setDisabled(true);
// setup groupBox
this->setTitle(QString::fromStdString(skillId.toString()));
@@ -78,8 +60,7 @@ namespace armarx::skills::gui
// add new profiles for this skill
// TODO: Where stored?
-
- this->unlock();
+ setDisabled(false);
}
void
@@ -110,15 +91,12 @@ namespace armarx::skills::gui
this->executeSkillButton = new QPushButton();
this->profileMenuWidget = new ProfileMenuWidget(this->memory, this);
this->skillDetailsTreeWidget = new SkillDetailsTreeWidget(this->memory, this);
- this->descriptionWidget = new SkillDescriptionWidget();
- descriptionWidget->setMinimumSize(0, 0);
- layout = new QVBoxLayout();
+ this->layout = new QVBoxLayout();
// Layouting
this->setLayout(layout);
layout->addWidget(this->profileMenuWidget);
- layout->addWidget(this->descriptionWidget);
layout->addWidget(this->skillDetailsTreeWidget);
layout->addWidget(this->executeSkillButton);
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
index 7979cf631..9326e86f4 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
@@ -47,19 +47,9 @@ namespace armarx::skills::gui
void setupUi();
void connectSignals();
- /**
- * @brief locks this widget.
- */
- void lock();
- /**
- * @brief unlocks this widget.
- */
- void unlock();
-
QVBoxLayout* layout = nullptr;
QPushButton* executeSkillButton = nullptr;
SkillDetailsTreeWidget* skillDetailsTreeWidget = nullptr;
- SkillDescriptionWidget* descriptionWidget = nullptr;
ProfileMenuWidget* profileMenuWidget = nullptr;
};
--
GitLab