From e135876766cf775c37f36e84654e6232bc986249 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Sun, 22 Jun 2025 14:29:34 +0200 Subject: [PATCH] GUI: Add more raster analysis methods --- gui/src/aaregui/panels/raster_data_collection.py | 2 ++ gui/src/aaregui/scan_logic/raster_grid_manager.py | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/gui/src/aaregui/panels/raster_data_collection.py index 09a575e3..7ca55335 100644 --- a/gui/src/aaregui/panels/raster_data_collection.py +++ b/gui/src/aaregui/panels/raster_data_collection.py @@ -80,9 +80,11 @@ class RasterDataCollectionPanel(ScanSettingsPanel): self.metric_combo.addItem("Background estimate", RasterGridMetric.BKG) self.metric_combo.addItem("Spot count", RasterGridMetric.SPOTS) + self.metric_combo.addItem("Spot count (res > 5A)", RasterGridMetric.SPOTS_LOW_RES) self.metric_combo.addItem("Indexing result", RasterGridMetric.INDEXING) self.metric_combo.addItem("Mosaicity", RasterGridMetric.MOS) self.metric_combo.addItem("B-factor", RasterGridMetric.BFACTOR) + self.metric_combo.addItem("Resolution (ML est.)", RasterGridMetric.RES) self.metric_combo.currentIndexChanged.connect(self.metric_changed) diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/gui/src/aaregui/scan_logic/raster_grid_manager.py index 897906b9..4bf84cba 100644 --- a/gui/src/aaregui/scan_logic/raster_grid_manager.py +++ b/gui/src/aaregui/scan_logic/raster_grid_manager.py @@ -16,11 +16,8 @@ class RasterGridMetric(Enum): INDEXING = 2 MOS = 3 BFACTOR = 4 - -class GridPointInfo: - filename: str - det_img: int - bkg_estimate: float + SPOTS_LOW_RES = 5 + RES = 6 def float_to_viridis_brush(value: float, alpha: int = 127) -> QBrush: """ @@ -80,7 +77,7 @@ class RasterGridManager(QObject): self.__geom = geom - self.__metric = RasterGridMetric.SPOTS + self.__metric = RasterGridMetric.BKG self.__start_point : QPointF = QPointF(0, 0) self.__active_grid : RasterGridRequest = RasterGridRequest( @@ -281,6 +278,10 @@ class RasterGridManager(QObject): v = [obj.mos for obj in i.result.images] case RasterGridMetric.BFACTOR: v = [obj.b for obj in i.result.images] + case RasterGridMetric.SPOTS_LOW_RES: + v = [obj.spots_low_res for obj in i.result.images] + case RasterGridMetric.RES: + v = [obj.res for obj in i.result.images] self._draw_grid(painter, i.request, v, alpha) def _draw_grid(self, painter: QPainter, grid: RasterGridRequest, values: List[float] | List[int] | None = None,