DAQ: Switch to raster panel from rotation panel if change is made to the drawn grid

This commit is contained in:
leonarski_f committed 2025-07-15 09:57:16 +02:00
1 parent 0fcdd13c5a
commit 88e639b070
3 files changed
+11 -1

No files matched your search

+1
View File
@@ -166,6 +166,7 @@ class MainWindow(QMainWindow):
self.beamline.beam_center.beam_center.connect(self.daq.beam_center)
self.beamline.beam_size.beam_size.connect(self.daq.beam_size_mm)
self.camera_image.load_image.connect(self.raster.load_image)
self.camera_image.switch_raster_grid.connect(self.data_collection.switch_to_raster)
if zmq_addr is not None:
self.camera_thread = SampleCameraThread(zmq_url=zmq_addr)
@@ -60,6 +60,10 @@ class DataCollectionSettings(QFrame):
self.file_path_panel.path_updated.connect(self.screening.update_filename)
self.__sample_id = None
@Slot()
def switch_to_raster(self):
self.__tab_widget.setCurrentIndex(0)
@Slot()
def cancel_button_clicked(self):
self.cancel.emit()
+6 -1
View File
@@ -51,6 +51,8 @@ class SampleCameraImageLabel(QGraphicsView):
autofocus = Signal(AutofocusSettings)
samcam_updated = Signal(SampleCameraSettings)
switch_raster_grid = Signal()
def __init__(
self,
geom: SampleGeometryModel,
@@ -132,15 +134,18 @@ class SampleCameraImageLabel(QGraphicsView):
if self.__raster_mgr.is_part_of_active_grid(self.start_point):
self.__state = SampleCameraImageState.MOVING_RASTER_GRID
def _update_grid(self):
pass
match self.__state:
case SampleCameraImageState.DRAWING_RASTER_GRID:
self.switch_raster_grid.emit()
self.__raster_mgr.update_active_grid(self.start_point, self.end_point)
case SampleCameraImageState.MOVING_RASTER_GRID:
self.switch_raster_grid.emit()
self.__raster_mgr.move_active_grid(self.end_point - self.start_point)
self.start_point = self.end_point
case SampleCameraImageState.RESIZE_RASTER_GRID:
self.switch_raster_grid.emit()
self.__raster_mgr.resize_active_grid(self.end_point)
def mouseMoveEvent(self, event):