DAQ: JFJoch viewer - modification to DBus, always provide file name to LoadImage

gui/src/aaregui/main_window.py

@@ -237,7 +237,6 @@ class MainWindow(QMainWindow):
 
         self.status_bar.close_shutter.connect(self.daq.close_shutter)
         self.status_bar.open_shutter.connect(self.daq.open_shutter)
-        self.raster.file_ready.connect(self.viewer.load_file)
         self.rotation.file_ready.connect(self.viewer.load_file)
         self.raster.image_selected.connect(self.viewer.load_image)
 

gui/src/aaregui/scan_logic/raster_grid_manager.py

@@ -80,8 +80,7 @@ class RasterGridManager(QObject):
     grid_scan_size_changed = Signal(int, int, float, float)
     completed_grid_updated = Signal()
 
-    file_ready = Signal(str)
-    image_selected = Signal(int)
+    image_selected = Signal(str, int)
 
     omega = Signal(float)
     smargon = Signal(SmargonCoordinate)
@@ -238,8 +237,7 @@ 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.file_ready.emit(grid.result.file_prefix)
-                        self.image_selected.emit(grid.result.images[cell].number)
+                        self.image_selected.emit(grid.result.file_prefix, grid.result.images[cell].number)
 
     def is_part_of_active_grid(self, point: QPointF) -> bool:
         if not self._is_grid_visible(self.__active_grid):
@@ -419,7 +417,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.file_ready.emit(last_raster.result.file_prefix)
+            self.image_selected.emit(last_raster.result.file_prefix, 0)
         self.completed_grid_updated.emit()
 
     @Slot(int, bool)

gui/src/aaregui/threads/jfjoch_viewer.py

@@ -38,12 +38,14 @@ class JFJochDBusClient(QObject):
         path = "/sls/mx/data/" + name + "_master.h5"
         print(f"load {path}")
         if self._ensure_interface():
-            reply = self.__interface.call("LoadFile", path)
+            reply = self.__interface.call("LoadFile", path, 0, 1)
 
     @Slot(int)
-    def load_image(self, number: int):
+    def load_image(self, name: str, number: int):
+        path = "/sls/mx/data/" + name + "_master.h5"
+        print(f"load {path}")
         print(f"load image {number}")
         if self._ensure_interface():
-            reply = self.__interface.call("LoadImage", number, 1)
+            reply = self.__interface.call("LoadFile", path, number, 1)