diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp index f32e98a2dff424dc5bf9dc63abf3ecdf6e20a19c..aaee78b023bd2585ac4284bda5e23701ecfa3676 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp @@ -51,7 +51,6 @@ #include "aronTreeWidget/Data.h" #include "aronTreeWidget/modal/text/AronTreeWidgetTextInputModalController.h" -#include "aronTreeWidget/visitors/AronTreeWidgetConverter.h" #include "aronTreeWidget/visitors/AronTreeWidgetCreator.h" #include "aronTreeWidget/visitors/AronTreeWidgetModalCreator.h" #include "aronTreeWidget/widgets/SkillDescriptionWidget.h" diff --git a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp index b9f841f70cd378dbb09bf91a4c8beb131da55c56..878b44b6d08f22f6a7ad17f2adb22c4fb75a6b0f 100644 --- a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp +++ b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.cpp @@ -58,10 +58,6 @@ namespace armarx::skills::gui _skillGroupBoxParentLayout->insertWidget(0, this->skillDetailGroupBox); _skillGroupBoxParentLayout->insertWidget(0, this->skillGroupBox); - // aron - skillDescriptionWidget = new SkillDescriptionWidget(); - this->skillDetailGroupBox->addDescriptionWidget(skillDescriptionWidget); - setupUi(); } diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp index a440ef341294ec2a8fdcebbb8c4fd95ac08e4768..5943a85ac3686f69d0b55fa6f53cba166d31ab77 100644 --- a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp +++ b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp @@ -1,5 +1,9 @@ #include "ProfileMenuWidget.h" +#include <QHBoxLayout> +#include <QLabel> +#include <QVBoxLayout> + namespace armarx::skills::gui { @@ -7,16 +11,30 @@ namespace armarx::skills::gui ProfileMenuWidget::setupUi() { setArgsFromClipboard = new QPushButton(); - copyArgsToClioboard = new QPushButton(); + copyArgsToClipboard = new QPushButton(); resetArgsToProfile = new QPushButton(); profileSelector = new QComboBox(); + // layouting + QVBoxLayout* mainLayout = new QVBoxLayout(); + QHBoxLayout* topLayout = new QHBoxLayout(); + + mainLayout->addLayout(topLayout); + mainLayout->addWidget(profileSelector); + + topLayout->addWidget(setArgsFromClipboard); + topLayout->addWidget(copyArgsToClipboard); + // this is not good. We should probably use a QSpacerItem here... + topLayout->addWidget(new QLabel()); + topLayout->addWidget(resetArgsToProfile); + + this->setLayout(mainLayout); + // Text - setArgsFromClipboard->setText(QString::fromStdString("Set args from clipboard")); - copyArgsToClioboard->setText(QString::fromStdString("Copy args to clipboard")); - resetArgsToProfile->setText(QString::fromStdString("Reset args to profile")); - profileSelector->setCurrentText( - QString::fromStdString("<No Profile selected. Using root>")); + setArgsFromClipboard->setText(QString::fromStdString(SET_ARGS_BUTTON_TEXT)); + copyArgsToClipboard->setText(QString::fromStdString(COPY_ARGS_BUTTON_TEXT)); + resetArgsToProfile->setText(QString::fromStdString(RESET_ARGS_BUTTON_TEXT)); + profileSelector->setCurrentText(QString::fromStdString(DEFAULT_PROFILE_TEXT)); } diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h index bfd5ecc1748f79eb03932bada6b1e4e9b7865217..26f6a490a0007ebb4ebce3a533d406e5146f4f3f 100644 --- a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h +++ b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h @@ -13,6 +13,11 @@ namespace armarx::skills::gui { Q_OBJECT public: + static const constexpr char* SET_ARGS_BUTTON_TEXT = "Set Args from Clipboard"; + static const constexpr char* COPY_ARGS_BUTTON_TEXT = "Copy Args to Clipboard"; + static const constexpr char* RESET_ARGS_BUTTON_TEXT = "Reset Args to Profile"; + static const constexpr char* DEFAULT_PROFILE_TEXT = "<No Profile selected. Using root>"; + ProfileMenuWidget(std::shared_ptr<SkillManagerWrapper> _memory, QWidget* parent = nullptr) : QWidget(parent), MemoryCommunicatorBase(_memory) { @@ -23,7 +28,7 @@ namespace armarx::skills::gui void setupUi(); QPushButton* setArgsFromClipboard = nullptr; - QPushButton* copyArgsToClioboard = nullptr; + QPushButton* copyArgsToClipboard = nullptr; QPushButton* resetArgsToProfile = nullptr; QComboBox* profileSelector = nullptr; }; diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp index 9ab21f2f86e9849ae986ce79491689afe5cc89dd..733be87143cb26768378fdb314e3eb70d4b6e2ae 100644 --- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp +++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp @@ -4,25 +4,23 @@ namespace armarx::skills::gui { - void - SkillDetailGroupBox::addDescriptionWidget(SkillDescriptionWidget* widget) - { - this->layout->insertWidget(1, widget); - } - void SkillDetailGroupBox::setupUi() { + this->setTitle(QString::fromStdString(GROUP_BOX_TITLE)); + // construct all sub widgets this->executeSkillButton = new QPushButton(); this->profileMenuWidget = new ProfileMenuWidget(this->memory, this); this->skillDetailsTreeWidget = new SkillDetailsTreeWidget(this->memory, this); + this->descriptionWidget = new SkillDescriptionWidget(); 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 6dc1767bfda3cdf6ec73ee5c821060fb6fe8b0c7..ef258f32b9816c3ec4858c4fce4f863183f29cf2 100644 --- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h +++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h @@ -16,7 +16,8 @@ namespace armarx::skills::gui class SkillDetailGroupBox : public QGroupBox, public MemoryCommunicatorBase { public: - static const constexpr char* EXECUTE_SKILL_BUTTON_TEXT = "Execute skill"; + static const constexpr char* EXECUTE_SKILL_BUTTON_TEXT = "Request Execution"; + static const constexpr char* GROUP_BOX_TITLE = "Skill Description"; SkillDetailGroupBox(std::shared_ptr<SkillManagerWrapper> _memory, QWidget* parent = nullptr) : @@ -25,13 +26,12 @@ namespace armarx::skills::gui setupUi(); } - void addDescriptionWidget(SkillDescriptionWidget* widget); - private: void setupUi(); QVBoxLayout* layout = nullptr; QPushButton* executeSkillButton = nullptr; SkillDetailsTreeWidget* skillDetailsTreeWidget = nullptr; + SkillDescriptionWidget* descriptionWidget = nullptr; ProfileMenuWidget* profileMenuWidget = nullptr; }; } // namespace armarx::skills::gui