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
!401
Urgent Skill Manipulation Features in SkillMemoryGUI
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Urgent Skill Manipulation Features in SkillMemoryGUI
feature/skillMemoryGUI
into
master
Overview
11
Commits
31
Pipelines
14
Changes
2
Merged
Peter Albrecht
requested to merge
feature/skillMemoryGUI
into
master
1 year ago
Overview
2
Commits
31
Pipelines
14
Changes
2
Expand
Software orga documentation
Todos:
Revert last changes regarding skill execution signature
(Temporarily) remove "Re-run [..]", as it doesn't work after merge
Add "Stop all" button
Change top layout: move all update related widgets to the left, Stop All-Button to the right
Change context menu text: Stop Skill -> Stop Execution
Remove or fix search bar: it shouldn't freeze the GUI!
Implement sorting
Fix layout ???
Clean up changes before merge (see
comment
)
Merge master into branch
Edited
1 year ago
by
Peter Albrecht
0
0
Merge request reports
Viewing commit
181c3aa0
Prev
Next
Show latest version
2 files
+
13
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
181c3aa0
Connected stop action to stopSkill
· 181c3aa0
Peter Albrecht
authored
1 year ago
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
+
12
−
1
Options
@@ -35,8 +35,10 @@
#include
"aronTreeWidget/modal/text/AronTreeWidgetTextInputModalController.h"
// debug
#include
<QAction>
#include
<QClipboard>
#include
<QDoubleSpinBox>
#include
<QMenu>
#include
<RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h>
#include
<RobotAPI/libraries/skills/core/SkillExecutionRequest.h>
@@ -83,7 +85,15 @@ namespace armarx
void
SkillManagerMonitorWidgetController
::
prepareMenu
(
const
QPoint
&
pos
)
{
ARMARX_IMPORTANT
<<
"Function not implemented!"
;
QMenu
*
menu
=
new
QMenu
();
// TODO: gray out option if skill has finished
QAction
*
stopSkillAction
=
new
QAction
(
"Stop Skill"
,
this
);
menu
->
addAction
(
stopSkillAction
);
connect
(
stopSkillAction
,
&
QAction
::
triggered
,
this
,
&
SkillManagerMonitorWidgetController
::
stopSkill
);
menu
->
popup
(
widget
.
treeWidgetSkillExecutions
->
viewport
()
->
mapToGlobal
(
pos
));
}
SkillExecutionInfoTreeWidgetItem
*
@@ -477,6 +487,7 @@ namespace armarx
void
SkillManagerMonitorWidgetController
::
stopSkill
()
{
ARMARX_IMPORTANT
<<
"Stop skill triggered"
;
// std::scoped_lock l(updateMutex);
// if (selectedSkill.skillId.fullySpecified())
// {
Loading