Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ArmarXGui
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
ArmarXGui
Merge requests
!99
Fix rogue emergency stop button
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix rogue emergency stop button
fix/emergency_stop_button
into
master
Overview
0
Commits
12
Pipelines
10
Changes
1
Merged
Christian Dreher
requested to merge
fix/emergency_stop_button
into
master
9 months ago
Overview
0
Commits
12
Pipelines
10
Changes
1
Expand
But gui segfaults on startup
0
0
Merge request reports
Viewing commit
b33a6a53
Prev
Next
Show latest version
1 file
+
5
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
b33a6a53
fix: Improve error handling
· b33a6a53
Christian Dreher
authored
9 months ago
source/ArmarXGui/applications/ArmarXGui/Widgets/EmergencyStopWidget.cpp
+
5
−
6
Options
@@ -110,21 +110,20 @@ namespace armarx
ARMARX_INFO
<<
"SS2 widget connected."
;
emergencyStopMasterPrx
=
getProxy
<
EmergencyStopMasterInterfacePrx
>
(
EMERGENCY_STOP_PROXY
);
QMetaObject
::
invokeMethod
(
button
,
"setVisible"
,
Qt
::
QueuedConnection
,
Q_ARG
(
bool
,
true
));
EmergencyStopState
state
=
EmergencyStopState
::
eEmergencyStopActive
;
try
{
QMetaObject
::
invokeMethod
(
this
,
"setChecked"
,
Qt
::
QueuedConnection
,
Q_ARG
(
EmergencyStopState
,
emergencyStopMasterPrx
->
getEmergencyStopState
()));
state
=
emergencyStopMasterPrx
->
getEmergencyStopState
();
}
catch
(
Ice
::
Exception
const
&
e
)
{
ARMARX_ERROR
<<
"Could not query SS2 state."
<<
deactivateSpam
(
2
);
setChecked
(
EmergencyStopState
::
eEmergencyStopActive
);
}
QMetaObject
::
invokeMethod
(
this
,
"setChecked"
,
Qt
::
QueuedConnection
,
Q_ARG
(
EmergencyStopState
,
state
));
emit
startPeriodicStateUpdate
();
}
Loading