From c3b64d7256712678f703cdbfc7b700dccd682044 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 20 May 2025 18:16:09 +0200 Subject: [PATCH] Fix ZMQ addr --- gui/src/aaregui/main.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gui/src/aaregui/main.py b/gui/src/aaregui/main.py index 3de9cdd3..d0f6216a 100644 --- a/gui/src/aaregui/main.py +++ b/gui/src/aaregui/main.py @@ -24,16 +24,16 @@ if __name__ == "__main__": match mx_beamline(): case MXBeamline.X06DA: default_url = "http://x06da-queue-01.psi.ch:5210" - zmq_addr = "tcp://129.129.110.12:9089" + default_zmq_addr = "tcp://129.129.110.12:9089" case MXBeamline.X10SA: default_url = "http://x10aa-queue-01.psi.ch:5210" - zmq_addr = None + default_zmq_addr = "" case MXBeamline.X06SA: default_url = "http://x06sa-queue-01.psi.ch:5210" - zmq_addr = None + default_zmq_addr = "" case _: default_url = "http://localhost:5210" - zmq_addr = None + default_zmq_addr = "" # Add custom options as needed urlOption = QCommandLineOption(["u", "aaredaq-url"], @@ -48,13 +48,18 @@ if __name__ == "__main__": cameraZeroMQ = QCommandLineOption(["s", "sample-camera-zmq"], "Sample camera ZeroMQ URL", - "sample-camera-zmq") + "sample-camera-zmq", + default_zmq_addr) parser.addOption(cameraZeroMQ) parser.process(app) base_url = parser.value(urlOption) + zmq_addr = parser.value(cameraZeroMQ) + if zmq_addr == "": + zmq_addr = None + if parser.isSet(defaultImage): default_image = parser.value(defaultImage) else: