Multiple Live Viewers can be opened simultaneously (#2398)

docs/release_notes/next/feature-2361-multiple-live-viewers

@@ -0,0 +1 @@
+#2361: Multiple Live Viewers can now be opened and pointed to different directories simultaneously

mantidimaging/eyes_tests/live_viewer_window_test.py

@@ -54,7 +54,7 @@ def _make_simple_dir(self, directory: Path):
     @mock.patch("time.time", return_value=4000.0)
     def test_live_view_opens_without_data(self, _mock_time, _mock_image_watcher):
         self.imaging.show_live_viewer(self.live_directory)
-        self.check_target(widget=self.imaging.live_viewer)
+        self.check_target(widget=self.imaging.live_viewer_list[-1])
 
     @mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
     @mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
@@ -64,8 +64,8 @@ def test_live_view_opens_with_data(self, _mock_time, _mock_image_watcher, mock_l
         image_list = [Image_Data(path) for path in file_list]
         mock_load_image.return_value = self._generate_image()
         self.imaging.show_live_viewer(self.live_directory)
-        self.imaging.live_viewer.presenter.model._handle_image_changed_in_list(image_list)
-        self.check_target(widget=self.imaging.live_viewer)
+        self.imaging.live_viewer_list[-1].presenter.model._handle_image_changed_in_list(image_list)
+        self.check_target(widget=self.imaging.live_viewer_list[-1])
 
     @mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
     @mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
@@ -75,8 +75,8 @@ def test_live_view_opens_with_bad_data(self, _mock_time, _mock_image_watcher, mo
         image_list = [Image_Data(path) for path in file_list]
         mock_load_image.side_effect = ValueError
         self.imaging.show_live_viewer(self.live_directory)
-        self.imaging.live_viewer.presenter.model._handle_image_changed_in_list(image_list)
-        self.check_target(widget=self.imaging.live_viewer)
+        self.imaging.live_viewer_list[-1].presenter.model._handle_image_changed_in_list(image_list)
+        self.check_target(widget=self.imaging.live_viewer_list[-1])
 
     @mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
     @mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
@@ -86,6 +86,6 @@ def test_rotate_operation_rotates_image(self, _mock_time, _mock_image_watcher, m
         image_list = [Image_Data(path) for path in file_list]
         mock_load_image.return_value = self._generate_image()
         self.imaging.show_live_viewer(self.live_directory)
-        self.imaging.live_viewer.presenter.model._handle_image_changed_in_list(image_list)
-        self.imaging.live_viewer.rotate_angles_group.actions()[1].trigger()
-        self.check_target(widget=self.imaging.live_viewer)
+        self.imaging.live_viewer_list[-1].presenter.model._handle_image_changed_in_list(image_list)
+        self.imaging.live_viewer_list[-1].rotate_angles_group.actions()[1].trigger()
+        self.check_target(widget=self.imaging.live_viewer_list[-1])

mantidimaging/gui/windows/live_viewer/presenter.py

@@ -46,7 +46,8 @@ def __init__(self, view: LiveViewerWindowView, main_window: MainWindowView):
 
     def close(self) -> None:
         """Close the window."""
-        self.model.close()
+        if self.model is not None:
+            self.model.close()
         self.model = None  # type: ignore # Presenter instance to be destroyed -type can be inconsistent
         self.view = None  # type: ignore # Presenter instance to be destroyed -type can be inconsistent
 

mantidimaging/gui/windows/live_viewer/view.py

@@ -28,9 +28,9 @@ class LiveViewerWindowView(BaseMainWindowView):
 
     def __init__(self, main_window: MainWindowView, live_dir_path: Path) -> None:
         super().__init__(None, 'gui/ui/live_viewer_window.ui')
-        self.setWindowTitle("Mantid Imaging - Live Viewer")
         self.main_window = main_window
         self.path = live_dir_path
+        self.setWindowTitle(f"Mantid Imaging - Live Viewer - {str(self.path)}")
         self.presenter = LiveViewerWindowPresenter(self, main_window)
         self.live_viewer = LiveViewWidget()
         self.imageLayout.addWidget(self.live_viewer)
@@ -88,7 +88,7 @@ def set_image_index(self, index: int) -> None:
 
     def closeEvent(self, e) -> None:
         """Close the window and remove it from the main window list"""
-        self.main_window.live_viewer = None
+        self.main_window.live_viewer_list.remove(self)
         self.presenter.close()
         self.live_viewer.handle_deleted()
         super().closeEvent(e)

mantidimaging/gui/windows/main/view.py

@@ -101,7 +101,7 @@ class MainWindowView(BaseMainWindowView):
     filters: FiltersWindowView | None = None
     recon: ReconstructWindowView | None = None
     spectrum_viewer: SpectrumViewerWindowView | None = None
-    live_viewer: LiveViewerWindowView | None = None
+    live_viewer_list: list[LiveViewerWindowView] = []
     settings_window: SettingsWindowView | None = None
 
     image_load_dialog: ImageLoadDialog | None = None
@@ -474,13 +474,9 @@ def live_view_choose_directory(self) -> None:
             self.show_live_viewer(Path(live_data_directory))
 
     def show_live_viewer(self, live_data_path: Path) -> None:
-        if not self.live_viewer:
-            self.live_viewer = LiveViewerWindowView(self, live_data_path)
-            self.live_viewer.show()
-        else:
-            self.live_viewer.activateWindow()
-            self.live_viewer.raise_()
-            self.live_viewer.show()
+        live_viewer = LiveViewerWindowView(self, live_data_path)
+        self.live_viewer_list.append(live_viewer)
+        self.live_viewer_list[-1].show()
 
     @property
     def stack_list(self) -> list[StackId]:
@@ -569,8 +565,8 @@ def closeEvent(self, event) -> None:
             # Close additional windows which do not have the MainWindow as parent
             if self.recon:
                 self.recon.close()
-            if self.live_viewer:
-                self.live_viewer.close()
+            while self.live_viewer_list:
+                self.live_viewer_list[-1].close()
             if self.spectrum_viewer:
                 self.spectrum_viewer.close()
             if self.filters: