DAQ: sample setter now clears manual sample. removed sample_clear. Manual sample must still be unmounted by hand.

gui/src/aaregui/scan_logic/raster_grid_manager.py

@@ -5,7 +5,7 @@ from enum import Enum
 from PySide6.QtCore import QObject, Signal, Slot, QPointF
 from PySide6.QtGui import QPainter, QPen, QColor, QBrush
 from PySide6.QtCore import Qt, QRect
-from typing import List, Optional, Tuple
+from typing import List, Tuple
 
 from aaredaqlib.coordinate import Coordinate, SmargonCoordinate
 from aaredaqlib.models import DAQStatusModel

gui/src/aaregui/threads/daq_worker.py

@@ -336,10 +336,6 @@ class DAQWorker(QObject):
     def sample_manual(self, s: SampleShortInfo):
         self.generic_post(f"sample/manual", s.model_dump_json())
 
-    @Slot()
-    def sample_clear(self):
-        self.generic_post("sample/clear")
-
     @Slot()
     def cancel(self):
         self.generic_post("scan/cancel")

gui/src/aaregui/widgets/camera_image.py

@@ -25,7 +25,6 @@ from PySide6.QtWidgets import (
 from aaredaqlib.models import DAQStatusModel, AutofocusSettings, SampleCameraSettings, BeamlineStateEnum
 from aaregui.models.bookmark import SmargonBookmarkList
 from aaredaqlib.coordinate import Coordinate, SmargonCoordinate
-from aaredaqlib.raster_grid import RasterGridRequest
 from aaredaqlib.sample_geometry import SampleGeometryModel
 from aaregui.scan_logic.raster_grid_manager import RasterGridManager
 
@@ -290,7 +289,7 @@ class SampleCameraImageLabel(QGraphicsView):
             ratio = 0.1
 
         if ratio >= 1.0:
-            # Don't enable scaling when gain in ratio is < 5% (to avoid back-and-forth
+            # Don't enable scaling when gain in ratio is < 5% (to avoid back-and-forth)
             self.setTransform(QTransform())
         else:
             matrix = QTransform()