Skip to content
Snippets Groups Projects

Fix rogue emergency stop button

Merged Christian Dreher requested to merge fix/emergency_stop_button into master
1 file
+ 5
6
Compare changes
  • Side-by-side
  • Inline
@@ -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