DAQ: WIP

gui/src/aaregui/main_window.py

@@ -137,9 +137,6 @@ class MainWindow(QMainWindow):
         self.daq.raster_scan_completed.connect(self.raster.grid_scan_completed)
 
         self.beamline.samcam.changed.connect(self.daq.samcam_settings)
-        self.beamline.state_panel.sample_exchange.clicked.connect(self.daq.sample_exchange)
-        self.beamline.state_panel.sample_alignment.clicked.connect(self.daq.sample_alignment)
-        self.beamline.state_panel.dewar_exchange.clicked.connect(self.daq.dewar_exchange)
         self.beamline.loopctr.background.clicked.connect(self.daq.alc_background)
         self.beamline.loopctr.find_tip.clicked.connect(self.daq.center_loop)
         self.camera_image.smargon.connect(self.daq.move_smargon)

gui/src/aaregui/panels/beamline_controls.py

@@ -37,9 +37,6 @@ class BeamlineControls(QFrame):
         self.loopctr = LoopCenteringPanel(self)
         self.v_layout.addWidget(self.loopctr)
 
-        self.state_panel = BeamlineStatePanel(self)
-        self.v_layout.addWidget(self.state_panel)
-
         self.samcam = SamcamPanel(self)
         self.v_layout.addWidget(self.samcam)
 

gui/src/aaregui/panels/zoom_panel.py

@@ -1,6 +1,7 @@
 from PySide6.QtCore import Slot, Signal
 from PySide6.QtWidgets import QWidget, QGridLayout
 
+from aaredaqlib.models import DAQStatusModel
 from aaregui.widgets.button_with_payload import ButtonWithPayload
 from aaregui.widgets.title_label import TitleLabel
 
@@ -11,6 +12,8 @@ class ZoomPanel(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)
 
+        self.__zoom = 1.0
+
         grid_layout = QGridLayout(self)
         zoom_settings = [
             {"name": "1x", "value": 1},
@@ -31,3 +34,9 @@ class ZoomPanel(QWidget):
     @Slot(dict)
     def set_zoom(self, payload: dict):
         self.zoom.emit(payload["zoom"])
+
+
+    @Slot(DAQStatusModel)
+    def update_daq_status(self, status: DAQStatusModel):
+        self.__zoom = status.geom.zoom_factor
+