GUI: Sample camera image has no raster parameters (always starts empty)
This commit is contained in:
1 parent
1b025809aa
commit
6c920c8fd4
2 files changed
+3
-9
No files matched your search
@@ -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)
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user