From 2351582b7c73c78a9bdac36bb2f504cd010c63aa Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Tue, 6 Feb 2024 11:27:31 +0100
Subject: [PATCH] Use StatusLabel in ArmarXGui
---
.../libraries/skills_gui/CMakeLists.txt | 3 +-
.../libraries/skills_gui/SkillMemoryGui.h | 3 +-
.../libraries/skills_gui/StatusLabel.cpp | 52 -------------------
.../libraries/skills_gui/StatusLabel.h | 35 -------------
4 files changed, 2 insertions(+), 91 deletions(-)
delete mode 100644 source/RobotAPI/libraries/skills_gui/StatusLabel.cpp
delete mode 100644 source/RobotAPI/libraries/skills_gui/StatusLabel.h
diff --git a/source/RobotAPI/libraries/skills_gui/CMakeLists.txt b/source/RobotAPI/libraries/skills_gui/CMakeLists.txt
index a1e53c1a2..2d2e9b57d 100644
--- a/source/RobotAPI/libraries/skills_gui/CMakeLists.txt
+++ b/source/RobotAPI/libraries/skills_gui/CMakeLists.txt
@@ -63,7 +63,7 @@ set(SOURCES
SkillMemoryGui.cpp
gui_utils.cpp
- StatusLabel.cpp
+
)
set(HEADERS
aron_tree_widget/visitors/AronTreeWidgetCreator.h
@@ -105,7 +105,6 @@ set(HEADERS
SkillMemoryGui.h
gui_utils.h
- StatusLabel.h
)
armarx_gui_library("${LIB_NAME}" "${SOURCES}" "${GUI_MOC_HDRS}" "${GUI_UIS}" "" "${LIBRARIES}")
diff --git a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h
index 64361f811..648f7cee8 100644
--- a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h
+++ b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h
@@ -10,8 +10,7 @@
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXGui/libraries/ArmarXGuiBase/widgets/PeriodicUpdateWidget.h>
-
-#include "RobotAPI/libraries/skills_gui/StatusLabel.h"
+#include <ArmarXGui/libraries/ArmarXGuiBase/widgets/StatusLabel.h>
#include "./aron_tree_widget/widgets/SkillDescriptionWidget.h"
#include "./executions/SkillExecutionTreeWidget.h"
diff --git a/source/RobotAPI/libraries/skills_gui/StatusLabel.cpp b/source/RobotAPI/libraries/skills_gui/StatusLabel.cpp
deleted file mode 100644
index 6b65f166a..000000000
--- a/source/RobotAPI/libraries/skills_gui/StatusLabel.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "StatusLabel.h"
-
-#include <QHBoxLayout>
-
-namespace armarx::skills::gui
-{
-
- StatusLabel::StatusLabel()
- {
- this->label = new QLabel("");
- this->resetButton = new QPushButton("");
- this->setupUi();
- }
-
- void
- StatusLabel::handleMessage(const std::string& message, std::string const& error)
- {
- this->label->setText(QString::fromStdString(message));
- this->resetButton->setHidden(false);
- label->setToolTip(QString::fromStdString(error));
- }
-
- void
- StatusLabel::resetLabel()
- {
- this->label->setText(QString::fromStdString(""));
- this->resetButton->setHidden(true);
- }
-
- void
- StatusLabel::setupUi()
- {
- QHBoxLayout* layout = new QHBoxLayout();
- layout->addWidget(resetButton);
- layout->addWidget(label);
- this->setLayout(layout);
- layout->setStretch(1, 2);
- label->setStyleSheet("QLabel { color : red; }");
- this->resetButton->setHidden(true);
-
- label->setMinimumHeight(35);
- label->setMaximumHeight(35);
-
- QPixmap pixmap(":/icons/delete.ico");
- QIcon ButtonIcon(pixmap);
- resetButton->setIcon(ButtonIcon);
- resetButton->setIconSize(pixmap.rect().size() / 2);
-
- connect(this->resetButton, &QPushButton::clicked, this, &StatusLabel::resetLabel);
- }
-
-} // namespace armarx::skills::gui
diff --git a/source/RobotAPI/libraries/skills_gui/StatusLabel.h b/source/RobotAPI/libraries/skills_gui/StatusLabel.h
deleted file mode 100644
index b8e0f91e4..000000000
--- a/source/RobotAPI/libraries/skills_gui/StatusLabel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <QLabel>
-#include <QPushButton>
-
-namespace armarx::skills::gui
-{
- class StatusLabel : public QWidget
- {
- public:
- /**
- * @brief Constructor for StatusLabel
- */
- StatusLabel();
-
- public slots:
- /**
- * @brief Display a message to indicate an update.
- */
- void handleMessage(std::string const& message, std::string const& error);
-
- private slots:
- /**
- * @brief Reset the label to default state.
- */
- void resetLabel();
-
- private:
- void setupUi();
-
- // contents
- QLabel* label = nullptr;
- QPushButton* resetButton = nullptr;
- };
-} // namespace armarx::skills::gui
--
GitLab