Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
c27230b6
Commit
c27230b6
authored
1 year ago
by
albrecpe
Browse files
Options
Downloads
Patches
Plain Diff
Change search button to filter and search
parent
7639b169
Branches
feature/skillMemoryGUI
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!442
Fix: skill gui live search
Pipeline
#18374
passed
1 year ago
Stage: build-and-test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp
+14
-2
14 additions, 2 deletions
...ce/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp
source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h
+5
-0
5 additions, 0 deletions
source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h
with
19 additions
and
2 deletions
source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp
+
14
−
2
View file @
c27230b6
...
...
@@ -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
::
handleSear
ch
);
this
->
acceptSearchButton
,
&
QPushButton
::
clicked
,
this
,
&
SkillGroupBox
::
filterAndFet
ch
);
connect
(
this
->
searchBar
,
&
QLineEdit
::
editingFinished
,
this
,
&
SkillGroupBox
::
handleSearch
);
connect
(
this
,
&
SkillGroupBox
::
searchRequest
,
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.h
+
5
−
0
View file @
c27230b6
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment