DAQ/GUI: Go to ABR meas position

daq/src/aaredaq/daq.py

@@ -159,7 +159,15 @@ class AareDAQ:
         self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
         try:
             self.__cfg.abr_meas_pos = self.__devs.abr_pos
-            print(self.__cfg.abr_meas_pos.y)
+            self.__cfg.state_busy = False
+        except:
+            self.__cfg.state_busy = False
+            raise
+
+    def goto_abr_meas_pos(self):
+        self.__cfg.set_busy(BeamlineStateEnum.SampleAlignment)
+        try:
+            self.__devs.abr_pos = self.__cfg.abr_meas_pos
             self.__cfg.state_busy = False
         except:
             self.__cfg.state_busy = False

daq/src/aaredaq/server.py

@@ -97,6 +97,11 @@ async def save_abr_meas_pos(token: str = Depends(oauth2_scheme)):
     daq.save_abr_meas_pos()
     return "OK"
 
+@app.post("/beamline/goto_abr_meas_pos")
+async def goto_abr_meas_pos(token: str = Depends(oauth2_scheme)):
+    auth.check_jwt_rw(cfg, auth.parse_token(token))
+    daq.goto_abr_meas_pos()
+    return "OK"
 
 @app.post("/beam_mark/add")
 async def mark_beam_center(x: float, y: float, token: str = Depends(oauth2_scheme)):

gui/src/aaregui/main_window.py

@@ -155,6 +155,7 @@ class MainWindow(QMainWindow):
         self.beamline.illumination_panel.light.connect(self.daq.light)
         self.beamline.abr_tweak.abr_tweak.connect(self.daq.abr_tweak)
         self.beamline.abr_tweak.abr_save.connect(self.daq.abr_save)
+        self.beamline.abr_tweak.abr_goto_meas.connect(self.daq.abr_goto_meas)
 
         self.beamline.beam_mark.beam_mark_clear.connect(self.daq.beam_mark_clear)
         self.camera_image.update_beam_center.connect(self.daq.beam_mark_add)

gui/src/aaregui/panels/abr_tweak_panel.py

@@ -11,6 +11,7 @@ from aaregui.widgets.title_label import TitleLabel
 
 class AbrTweakButtons(QWidget):
     abr_tweak = Signal(Coordinate)
+    abr_goto_meas = Signal()
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -101,6 +102,14 @@ class AbrTweakWidget(QWidget):
         grid_layout.addWidget(save_button, 3, 0, 1, 3)
         save_button.pressed.connect(self.save_button_pressed)
 
+        goto_button = QPushButton("Go to meas.")
+        grid_layout.addWidget(goto_button, 4, 0, 1, 3)
+        save_button.pressed.connect(self.goto_button_pressed)
+
+    @Slot()
+    def goto_button_pressed(self):
+        self.__abr_buttons.abr_goto_meas.emit()
+
     @Slot(Coordinate)
     def abr_button_pressed(self, c: Coordinate):
         self.abr_tweak.emit(c)

gui/src/aaregui/threads/daq_worker.py

@@ -279,6 +279,10 @@ class DAQWorker(QObject):
     def abr_save(self):
         self.generic_post("beamline/save_abr_meas_pos")
 
+    @Slot()
+    def abr_goto_meas(self):
+        self.generic_post("beamline/goto_abr_meas_pos")
+
     @Slot(float, float)
     def beam_mark_add(self, x: float, y: float):
         self.generic_post(f"beam_mark/add?x={x}&y={y}")