DAQ/GUI: Add relative omega movement - to be tested

This commit is contained in:
2026-01-15 12:57:36 +01:00
parent e62cd5277e
commit 18014e2d7c
5 changed files with 24 additions and 4 deletions
+1
View File
@@ -229,6 +229,7 @@ class MainWindow(QMainWindow):
self.raster.omega.connect(self.daq.set_omega)
self.raster.smargon.connect(self.daq.move_smargon)
self.beamline.omega_panel.set_omega_rel.connect(self.daq.set_omega_rel)
self.beamline.omega_panel.set_omega.connect(self.daq.set_omega)
self.sample_camera.set_omega.connect(self.daq.set_omega)
self.beamline.zoom_panel.zoom.connect(self.daq.zoom)
+2 -1
View File
@@ -21,6 +21,7 @@ class OmegaEntryWidget(QWidget):
class OmegaPanel(QWidget):
set_omega = Signal(float)
set_omega_rel = Signal(float)
def __init__(self, parent=None):
super().__init__(parent)
@@ -57,7 +58,7 @@ class OmegaPanel(QWidget):
@Slot(dict)
def omega_button_pressed(self, payload: dict):
if "rel" in payload:
self.set_omega.emit(self.__omega + payload["rel"])
self.set_omega_rel.emit(payload["rel"])
elif "abs" in payload:
self.set_omega.emit(payload["abs"])
+4
View File
@@ -186,6 +186,10 @@ class DAQWorker(QObject):
def set_omega(self, f: float):
self.generic_put(f"beamline/omega?val={f:.3f}")
@Slot(float)
def set_omega_rel(self, f: float):
self.generic_put(f"beamline/omega_rel?val={f:.3f}")
@Slot(float)
def zoom(self, f: float):
self.generic_put(f"beamline/zoom?val={f:.3f}")