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

xo6da: added secondary beamline camera.

Browse Source
This commit is contained in:
appleb_m
2026-06-09 09:52:30 +02:00
parent dcbd945053
commit 7c3629529e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/common/config/x06da.yaml
+3 -2
View File
@@ -5,8 +5,9 @@ gui:
sample_camera_zmq_url: "tcp://sls-gpu-003:9093"
prediction_zmq_url: "tcp://sls-gpu-003:9093"
beamline_camera_url: "x06da-axis-1.psi.ch"
gonio_camera_url: "axis-accc8ed2972e.psi.ch"
gonio_camera_id: "3"
secondary_beamline_camera_url: "axis-accc8e9a2995.psi.ch"
gonio_camera_url: "axis-server-es.psi.ch"
gonio_camera_id: "1"
daq:
daq_url: "http://mx-x06da-queue-01.psi.ch:5210"
src/aare/gui/main_window.py
+6
View File
@@ -268,6 +268,12 @@ class MainWindow(QMainWindow):
self.video_tab.addTab(self.beamline_view_panel, "Beamline view")
self.video_tab.addTab(self.beamline_combined_panel, "Beamline combined view")
if cfg_get("gui.cameras.secondary_beamline_camera_url", None):
self.secondary_beamline_view = VideoGraphicsView()
self.secondary_beamline_view_panel = AxisVideoPanel("Secondary view", self.secondary_beamline_view, parent=top_widget)
self.secondary_beamline_view_panel.refresh_requested.connect(self.refresh_axis_cameras)
self.video_tab.addTab(self.secondary_beamline_view_panel, "Secondary view")
top_widget_layout.addWidget(self.video_tab)
self._start_axis_camera_threads()