From 6c920c8fd46a01a6e4926815f4ee78b3171f0e86 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 11 Jun 2025 09:59:02 +0200 Subject: [PATCH] GUI: Sample camera image has no raster parameters (always starts empty) --- gui/src/aaregui/main_window.py | 5 +---- gui/src/aaregui/widgets/camera_image.py | 7 ++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gui/src/aaregui/main_window.py b/gui/src/aaregui/main_window.py index 7971037c..7ef2256b 100644 --- a/gui/src/aaregui/main_window.py +++ b/gui/src/aaregui/main_window.py @@ -55,14 +55,11 @@ class MainWindow(QMainWindow): beam_size_mm=Coordinate(x=1, y=1), aerotech_meas=Coordinate() ) - rasters = [] self.data_collection = DataCollectionSettings(s=geom, parent=top_widget) top_widget_layout.addWidget(self.data_collection) - self.camera_image = SampleCameraImageLabel( - geom=geom, rasters=rasters, parent=top_widget, default_image=default_image - ) + self.camera_image = SampleCameraImageLabel(geom=geom, parent=top_widget, default_image=default_image) top_widget_layout.addWidget(self.camera_image) diff --git a/gui/src/aaregui/widgets/camera_image.py b/gui/src/aaregui/widgets/camera_image.py index d55578df..f7806469 100644 --- a/gui/src/aaregui/widgets/camera_image.py +++ b/gui/src/aaregui/widgets/camera_image.py @@ -41,16 +41,12 @@ class SampleCameraImageLabel(QGraphicsView): def __init__( self, geom: SampleGeometryModel, - rasters: List[RasterGridRequest], default_image: str | None, parent=None, ): super().__init__(parent) - if rasters is None: - self.__raster = [] - else: - self.__raster = rasters + self.__raster = [] self.__geom = geom self.__bookmarks: SmargonBookmarkList = SmargonBookmarkList() @@ -457,6 +453,7 @@ class SampleCameraImageLabel(QGraphicsView): ), grid_size_mm=grid_mm, omega_deg=self.__geom.omega_deg, + exp_time_s=1.0 ) self.active_grid = self.drawn_grid else: