From 7ee95747b8b0c9228cee984717ca3629b93be85c Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Sun, 14 Sep 2025 11:50:11 +0200 Subject: [PATCH] AareGUI: Use files with the viewer --- gui/src/aaregui/scan_logic/raster_grid_manager.py | 4 ++-- gui/src/aaregui/scan_logic/rotation_scan_manager.py | 2 +- gui/src/aaregui/threads/jfjoch_viewer.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/gui/src/aaregui/scan_logic/raster_grid_manager.py index 979bd826..fe7f2ef8 100644 --- a/gui/src/aaregui/scan_logic/raster_grid_manager.py +++ b/gui/src/aaregui/scan_logic/raster_grid_manager.py @@ -239,8 +239,8 @@ class RasterGridManager(QObject): self.__loaded_image_prefix = grid.result.file_prefix self.__loaded_image_index = grid.result.images[cell].number print(f"Load {grid.result.file_prefix} {grid.result.images[cell].number}") - #self.image_selected.emit(grid.result.file_prefix, grid.result.images[cell].number) - self.image_selected.emit("http://sls-gpu-001:8080", grid.result.images[cell].number) + self.image_selected.emit(grid.result.file_prefix, grid.result.images[cell].number) + #self.image_selected.emit("http://sls-gpu-001:8080", grid.result.images[cell].number) def is_part_of_active_grid(self, point: QPointF) -> bool: if not self._is_grid_visible(self.__active_grid): diff --git a/gui/src/aaregui/scan_logic/rotation_scan_manager.py b/gui/src/aaregui/scan_logic/rotation_scan_manager.py index 5167d0fb..9cba6262 100644 --- a/gui/src/aaregui/scan_logic/rotation_scan_manager.py +++ b/gui/src/aaregui/scan_logic/rotation_scan_manager.py @@ -9,5 +9,5 @@ class RotationScanManager(QObject): @Slot(CompletedRotationScan) def scan_completed(self, r: CompletedRotationScan): if r.result.file_prefix is not None: - self.file_ready.emit("http://sls-gpu-001:8080")#r.result.file_prefix) + self.file_ready.emit(r.result.file_prefix) diff --git a/gui/src/aaregui/threads/jfjoch_viewer.py b/gui/src/aaregui/threads/jfjoch_viewer.py index c4a98d55..bb7f569e 100644 --- a/gui/src/aaregui/threads/jfjoch_viewer.py +++ b/gui/src/aaregui/threads/jfjoch_viewer.py @@ -43,10 +43,11 @@ class JFJochDBusClient(QObject): @Slot(int) def load_image(self, name: str, number: int): - #path = "/sls/mx/data/" + name + "_master.h5" - path=name - print(f"load {path}") - print(f"load image {number}") + if name.startswith("http://"): + path = name + else: + path = "/sls/mx/data/" + name + "_master.h5" + print(f"Load dataset: {name} image: {number}") if self._ensure_interface(): reply = self.__interface.call("LoadFile", path, number, 1)