From db172216cb628b4f2c6e217b622f811e5693d375 Mon Sep 17 00:00:00 2001
From: Christian Dreher <c.dreher@kit.edu>
Date: Thu, 13 Jun 2024 17:36:51 +0200
Subject: [PATCH] feat: Current state with desired interface
---
.../ArmarXGui/Widgets/EmergencyStopWidget.cpp | 10 ++++------
.../ArmarXGui/Widgets/EmergencyStopWidget.h | 1 -
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp b/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp
index 586ed0b6..0d2f71bc 100644
--- a/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp
+++ b/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp
@@ -53,18 +53,16 @@ namespace armarx
icon.addPixmap(iconNormal, QIcon::Normal, QIcon::Off);
icon.addPixmap(iconDark, QIcon::Normal, QIcon::On);
- layout = new QGridLayout(this->getWidget());
button = new QToolButton();
button->setCheckable(true);
button->setIcon(icon);
button->setIconSize(QSize(68, 28));
button->setToolTip(QString::fromStdString("Controls the EmergencyStop. When pressed the "
"EmergencyStop is active. Shortcut: Pause Key"));
- //button->setVisible(false);
- layout->addWidget(button, 0, 0);
- layout->setMargin(0);
- layout->setContentsMargins(0, 0, 0, 0);
- this->getWidget()->setLayout(layout);
+ button->setVisible(false);
+ QGridLayout* l = new QGridLayout(this->getWidget());
+ this->getWidget()->setLayout(l);
+ this->getWidget()->layout()->addWidget(button);
QShortcut* enableSS2Shortcut1 = new QShortcut(this->getWidget());
enableSS2Shortcut1->setContext(Qt::ApplicationShortcut);
diff --git a/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h b/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h
index 82727068..7b6573fb 100644
--- a/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h
+++ b/source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.h
@@ -75,7 +75,6 @@ namespace armarx
private:
ArmarXMainWindow* mainWindow;
- QGridLayout* layout;
QPixmap iconNormal;
QPixmap iconDark;
QToolButton* button;
--
GitLab