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
Merge requests
!512
Skill-Gui Stability and QOL
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Skill-Gui Stability and QOL
feature/skill-gui-stability
into
master
Overview
10
Commits
19
Pipelines
16
Changes
10
3 unresolved threads
Hide all comments
Merged
Peter Albrecht
requested to merge
feature/skill-gui-stability
into
master
3 months ago
Overview
10
Commits
19
Pipelines
16
Changes
8
3 unresolved threads
Hide all comments
Expand
Fix the skill details widget not resetting correctly when the provider dies
Add a dialog box asking the user whether to reset the parameters when they attempt so
Edited
2 months ago
by
Peter Albrecht
0
0
Merge request reports
Compare
version 6
version 15
0c52ffca
1 month ago
version 14
340a11ce
1 month ago
version 13
f2ce4e1b
1 month ago
version 12
d7284572
1 month ago
version 11
cfc57ba7
1 month ago
version 10
c8999b29
1 month ago
version 9
46879760
1 month ago
version 8
e0914bf4
1 month ago
version 7
deaee88b
1 month ago
version 6
ca7ac9fd
1 month ago
version 5
9abdac88
2 months ago
version 4
929c7586
2 months ago
version 3
801dcdda
3 months ago
version 2
d0dad673
3 months ago
version 1
499ac8c2
3 months ago
master (base)
and
version 15
latest version
ff74530c
19 commits,
1 month ago
version 15
0c52ffca
18 commits,
1 month ago
version 14
340a11ce
17 commits,
1 month ago
version 13
f2ce4e1b
16 commits,
1 month ago
version 12
d7284572
15 commits,
1 month ago
version 11
cfc57ba7
14 commits,
1 month ago
version 10
c8999b29
13 commits,
1 month ago
version 9
46879760
12 commits,
1 month ago
version 8
e0914bf4
11 commits,
1 month ago
version 7
deaee88b
10 commits,
1 month ago
version 6
ca7ac9fd
9 commits,
1 month ago
version 5
9abdac88
8 commits,
2 months ago
version 4
929c7586
7 commits,
2 months ago
version 3
801dcdda
6 commits,
3 months ago
version 2
d0dad673
5 commits,
3 months ago
version 1
499ac8c2
4 commits,
3 months ago
Show latest version
8 files
+
137
−
25
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
8
Search (e.g. *.vue) (Ctrl+P)
source/RobotAPI/libraries/skills_gui/memory/SkillManagerWrapper.cpp
+
8
−
10
Options
@@ -243,30 +243,30 @@ namespace armarx::skills::gui
emit
updateAvailable
(
filterUpdate
(
snapshot
));
}
std
::
vector
<
Parameters
>
SkillManagerWrapper
::
getParameterHistoryForSkill
(
const
skills
::
SkillID
&
sid
)
const
std
::
vector
<
Parameters
>
SkillManagerWrapper
::
getParameterHistoryForSkill
(
const
skills
::
SkillID
&
sid
)
{
if
(
not
this
->
skillParameterHistory
.
contains
(
sid
))
if
(
not
this
->
skillParameter
Execution
History
.
contains
(
sid
))
{
return
{};
}
return
this
->
skillParameterHistory
[
sid
];
return
this
->
skillParameter
Execution
History
[
sid
];
}
void
SkillManagerWrapper
::
addParametersToHistory
(
const
skills
::
SkillID
&
sid
,
const
Parameters
&
params
)
{
if
(
not
this
->
skillParameterHistory
.
contains
(
sid
))
if
(
not
this
->
skillParameter
Execution
History
.
contains
(
sid
))
{
// no history exists for this skill. Assign new
this
->
skillParameterHistory
.
insert
({
sid
,
{
params
}});
this
->
skillParameter
Execution
History
.
insert
({
sid
,
{
params
}});
}
else
{
// history already exists. Append to list
this
->
skillParameterHistory
[
sid
].
emplace_back
(
params
);
this
->
skillParameter
Execution
History
[
sid
].
emplace_back
(
params
);
}
}
std
::
optional
<
Parameters
>
SkillManagerWrapper
::
getLatestParametersForSkill
(
const
skills
::
SkillID
&
sid
)
const
std
::
optional
<
Parameters
>
SkillManagerWrapper
::
getLatestParametersForSkill
(
const
skills
::
SkillID
&
sid
)
{
auto
parameterList
=
getParameterHistoryForSkill
(
sid
);
if
(
parameterList
.
empty
())
@@ -426,10 +426,8 @@ namespace armarx::skills::gui
ARMARX_CHECK
(
skillId
.
isFullySpecified
());
// sanity check
this
->
addParametersToHistory
(
skillId
,
params
);
ARMARX_INFO
<<
"Saved skill parameters to history..."
;
ARMARX_IMPORTANT
<<
"Executing skill from GUI: "
<<
skillId
<<
"."
;
try
{
std
::
scoped_lock
l
(
mutex_memory
);
Loading