GUI: Grid scan WIP

gui/src/aaregui/panels/data_collection_settings.py

@@ -38,16 +38,14 @@ class DataCollectionSettings(QFrame):
         self.file_path_panel = FilePathPanel(self)
         v_layout.addWidget(self.file_path_panel)
 
-        v_layout.addWidget(TitleLabel("Grid scan"))
+        tab_widget = QTabWidget()
 
         self.raster = RasterDataCollectionPanel(parent=self, raster_mgr=raster_mgr, diffraction=diffraction)
-
-        v_layout.addWidget(self.raster)
-
-        v_layout.addWidget(TitleLabel("Data collection"))
+        tab_widget.addTab(self.raster, "Raster scan")
 
         self.screening = RotationDataCollectionPanel(parent=self, diffraction=diffraction)
-        v_layout.addWidget(self.screening)
+        tab_widget.addTab(self.screening, "Rotation")
+        v_layout.addWidget(tab_widget)
 
         v_layout.addStretch()
 

gui/src/aaregui/scan_logic/raster_grid_manager.py

@@ -94,7 +94,8 @@ class RasterGridManager(QObject):
             n_x= 0,
             n_y= 0,
             smargon = self.__geom.smargon,
-            grid_size_mm=Coordinate(x=0.02, y=0.02),
+            grid_size_mm=Coordinate(x= 0.8 * self.__beam_size_mm.x,
+                                    y= 0.8 * self.__beam_size_mm.y),
             omega_deg=self.__geom.omega_deg,
             exp_time_s=0.02,
             transmission=1.0,