From 2d4acf868de5ce6f17eb1d3263cdbe7694ca2086 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 8 Jul 2025 13:21:16 +0200 Subject: [PATCH] GUI: Display spots ice/spots indexed --- gui/src/aaregui/panels/raster_data_collection.py | 4 +++- gui/src/aaregui/scan_logic/raster_grid_manager.py | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/gui/src/aaregui/panels/raster_data_collection.py index 53955d6f..30e0c701 100644 --- a/gui/src/aaregui/panels/raster_data_collection.py +++ b/gui/src/aaregui/panels/raster_data_collection.py @@ -80,7 +80,9 @@ class RasterDataCollectionPanel(ScanSettingsPanel): self._layout.addWidget(QLabel("Metric", parent=self), 7, 0) self.metric_combo.addItem("Spot count", RasterGridMetric.SPOTS) - self.metric_combo.addItem("Spot count (res > 5A)", RasterGridMetric.SPOTS_LOW_RES) + self.metric_combo.addItem("Spot count (low res.)", RasterGridMetric.SPOTS_LOW_RES) + self.metric_combo.addItem("Spot count (indexed)", RasterGridMetric.SPOTS_INDEXED) + self.metric_combo.addItem("Spot count (ice)", RasterGridMetric.SPOTS_ICE) self.metric_combo.addItem("Background estimate", RasterGridMetric.BKG) self.metric_combo.addItem("Indexing result", RasterGridMetric.INDEXING) self.metric_combo.addItem("Mosaicity", RasterGridMetric.MOS) diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/gui/src/aaregui/scan_logic/raster_grid_manager.py index 5c734fe8..872f5117 100644 --- a/gui/src/aaregui/scan_logic/raster_grid_manager.py +++ b/gui/src/aaregui/scan_logic/raster_grid_manager.py @@ -21,6 +21,8 @@ class RasterGridMetric(Enum): BFACTOR = 4 SPOTS_LOW_RES = 5 RES = 6 + SPOTS_ICE = 7 + SPOTS_INDEXED = 8 def float_to_viridis_brush(value: float, alpha: int = 127) -> QBrush: """ @@ -318,6 +320,10 @@ class RasterGridManager(QObject): v = [obj.spots_low_res for obj in i.result.images] case RasterGridMetric.RES: v = [obj.res for obj in i.result.images] + case RasterGridMetric.SPOTS_ICE: + v = [obj.spots_ice for obj in i.result.images] + case RasterGridMetric.SPOTS_INDEXED: + v = [obj.spots_indexed 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,