GUI: check beamline state when you start data collection in raster

This commit is contained in:
appleb_m committed 2025-12-22 09:41:07 +01:00
1 parent 1fa421c5cf
commit 51e309a2aa
2 files changed
+12 -3

No files matched your search

@@ -1,9 +1,9 @@
from PySide6.QtCore import Signal, Slot, Qt
from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QSizePolicy, QSpacerItem, QPushButton, QHBoxLayout, \
QComboBox, QSlider
QComboBox, QSlider, QMessageBox
from aaredaqlib.diffraction_geometry import DiffractionGeometry
from aaredaqlib.models import DAQStatusModel
from aaredaqlib.models import DAQStatusModel, BeamlineStateEnum
from aaregui.panels.scan_settings_panel import ScanSettingsPanel
from aaregui.scan_logic.raster_grid_manager import RasterGridManager, RasterGridMetric
from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit
@@ -173,6 +173,7 @@ class RasterDataCollectionPanel(ScanSettingsPanel):
self._previous_sample_was_none_raster = True
elif s.sample is not None:
self._previous_sample_was_none_raster = False
self.__beamline_state = s.state
def update_grid_scan_size(self):
self.width_enter.update_value(self.__size_x)
@@ -218,10 +219,18 @@ class RasterDataCollectionPanel(ScanSettingsPanel):
@Slot()
def _on_evaluate_clicked(self):
if self.__beamline_state != BeamlineStateEnum.SampleAlignment:
logger.error(f"Beamline state {self.__beamline_state} is not Sample Alignment")
QMessageBox.critical(None, "Error", "Beamline state is not Sample Alignment")
return
if self.check_before_run(scan_kind = "raster"):
self.evaluate_grid.emit()
@Slot()
def _on_evaluate_auto_clicked(self):
if self.__beamline_state != BeamlineStateEnum.SampleAlignment:
logger.error(f"Beamline state {self.__beamline_state} is not Sample Alignment")
QMessageBox.critical(None, "Error", "Beamline state is not Sample Alignment")
return
if self.check_before_run(scan_kind = "raster"):
self.evaluate_grid_auto.emit()
@@ -9,5 +9,5 @@ class RotationScanManager(QObject):
@Slot(CompletedRotationScan)
def scan_completed(self, r: CompletedRotationScan):
if r.result.file_prefix is not None:
self.file_ready.emit("http://sls-gpu-001:8080")
#self.file_ready.emit(r.result.file_prefix, 0)
self.file_ready.emit("http://sls-gpu-001:8080", 0)