mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

Daq_worker - updating error message text for users if devices disconnect

Browse Source
This commit is contained in:
appleb_m
2026-03-24 12:44:14 +01:00
parent 3b440cd1fa
commit af4cd798d4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/gui/threads/daq_worker.py
+8 -8
View File
@@ -226,28 +226,28 @@ class DAQWorker(QObject):
if len(disconnected) == 3:
return (
"all-devices-down",
"TELL, Smargon, and Aerotech connection errors, please inform your local contact.",
"TELL, Smargon, and Aerotech disconnected.",
True,
)
if len(disconnected) == 2:
return (
"+".join(sorted(d.lower() for d in disconnected)) + "-down",
f"{disconnected[0]} and {disconnected[1]} connection errors, please inform your local contact.",
f"{disconnected[0]} and {disconnected[1]} disconnected.",
True,
)
device = disconnected[0]
return (
f"{device.lower()}-down",
f"{device} connection error, please inform your local contact.",
f"{device} disconnected.",
True,
)
if restored:
if len(restored) == 3:
return (None, "TELL, Smargon, and Aerotech connections restored.", False)
return (None, "TELL, Smargon, and Aerotech reconnected.", False)
if len(restored) == 2:
return (None, f"{restored[0]} and {restored[1]} connections restored.", False)
return (None, f"{restored[0]} connection restored.", False)
return (None, f"{restored[0]} and {restored[1]} reconnected.", False)
return (None, f"{restored[0]} reconnected.", False)
return (None, None, False)
@@ -259,7 +259,7 @@ class DAQWorker(QObject):
self.update.emit(parsed_response)
if self._server_connected is False:
self._emit_status_if_changed(None, "Server connection restored.", False)
self._emit_status_if_changed(None, "Server reconnected.", False)
self._server_connected = True
self._last_server_error = None
@@ -320,7 +320,7 @@ class DAQWorker(QObject):
if self._server_connected is not False:
self._emit_status_if_changed(
"server-down",
"Server connection lost. Trying to reconnect...",
"Server disconnected. Reconnecting...",
True,
)