From 7d2cdeca68fc06415b663d8d7baeaa899400c350 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Thu, 11 Sep 2025 14:42:15 +0200 Subject: [PATCH] DAQ/GUI - JFJoch: fixed bug where image viewer wasnt taking the path, by changing to the http address --- gui/src/aaregui/scan_logic/raster_grid_manager.py | 5 +++-- gui/src/aaregui/scan_logic/rotation_scan_manager.py | 2 +- gui/src/aaregui/threads/jfjoch_viewer.py | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/src/aaregui/scan_logic/raster_grid_manager.py b/gui/src/aaregui/scan_logic/raster_grid_manager.py index 7277f927..979bd826 100644 --- a/gui/src/aaregui/scan_logic/raster_grid_manager.py +++ b/gui/src/aaregui/scan_logic/raster_grid_manager.py @@ -239,7 +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(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): @@ -421,7 +422,7 @@ class RasterGridManager(QObject): self.__active_grid.n_x = 0 self.__active_grid.n_y = 0 if last_raster is not None and last_raster.result.file_prefix is not None: - self.image_selected.emit(last_raster.result.file_prefix, 0) + self.image_selected.emit("http://sls-gpu-001:8080",0) #last_raster.result.file_prefix, 0) self.completed_grid_updated.emit() @Slot(int, bool) diff --git a/gui/src/aaregui/scan_logic/rotation_scan_manager.py b/gui/src/aaregui/scan_logic/rotation_scan_manager.py index 9cba6262..5167d0fb 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(r.result.file_prefix) + self.file_ready.emit("http://sls-gpu-001:8080")#r.result.file_prefix) diff --git a/gui/src/aaregui/threads/jfjoch_viewer.py b/gui/src/aaregui/threads/jfjoch_viewer.py index 55caaab3..c4a98d55 100644 --- a/gui/src/aaregui/threads/jfjoch_viewer.py +++ b/gui/src/aaregui/threads/jfjoch_viewer.py @@ -43,7 +43,6 @@ class JFJochDBusClient(QObject): @Slot(int) def load_image(self, name: str, number: int): - path = "/sls/mx/data/" + name + "_master.h5" #path = "/sls/mx/data/" + name + "_master.h5" path=name print(f"load {path}")