diff --git a/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp b/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp index bec357e6054091c294bc04c8dbad0ae6aee900d5..30b26364853dd4d96fb159847edb575b372ae833 100644 --- a/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp +++ b/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp @@ -12,6 +12,13 @@ namespace armarx::skills::gui emit searchRequest(search); } + void + SkillGroupBox::filterAndFetch() + { + memory->updateFromMemory(); + handleSearch(); + } + void SkillGroupBox::connectGui(std::string observerName) { @@ -55,7 +62,12 @@ namespace armarx::skills::gui // text this->searchBar->setPlaceholderText(QString::fromStdString("Search ...")); - this->acceptSearchButton->setText(QString::fromStdString("Search")); + this->acceptSearchButton->setText(QString::fromStdString("Update and Search")); + + // some further information to explain the search bar + this->searchBar->setToolTip( + QString::fromStdString("Accepting the search (with Enter) searches all currently known " + "skills. This is not the same as 'Update & Search'!")); connectSignals(); } @@ -64,7 +76,7 @@ namespace armarx::skills::gui SkillGroupBox::connectSignals() { connect( - this->acceptSearchButton, &QPushButton::clicked, this, &SkillGroupBox::handleSearch); + this->acceptSearchButton, &QPushButton::clicked, this, &SkillGroupBox::filterAndFetch); connect(this->searchBar, &QLineEdit::editingFinished, this, &SkillGroupBox::handleSearch); connect(this, &SkillGroupBox::searchRequest, diff --git a/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h b/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h index 11604f2a24710b35faf10b129c2e9c63f35d8051..7089f01b0e0103592b6eda7ff4f8d5d3571ca915 100644 --- a/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h +++ b/source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h @@ -50,6 +50,11 @@ namespace armarx::skills::gui */ void handleSearch(); + /** + * @brief Applies the update, and requests an update from memory. + */ + void filterAndFetch(); + private: void setupUi(); void connectSignals();