DaskImageDataStack allows images to be added and removed dynamically

Author: MikeSullivan7

mantidimaging/gui/windows/live_viewer/model.py

@@ -14,8 +14,6 @@
 import dask_image.imread
 from astropy.io import fits
 
-from mantidimaging.core.utility import ExecutionProfiler
-
 if TYPE_CHECKING:
     from os import stat_result
     from mantidimaging.gui.windows.live_viewer.view import LiveViewerWindowPresenter
@@ -75,14 +73,9 @@ def get_computed_image(self, index: int):
             return None
         try:
             self.get_delayed_image(index).compute()
-            print(f"+++++++++++++++++++++++++++++++++++ get_computed_image {index=} ++++++++++++++++++++++++++++++")
-            print(f"+++++++++++++++++++++++++++++++++++ get_computed_image {self.get_delayed_image(index)=} ++++++++++++++++++++++++++++++")
-            print(
-                f"+++++++++++++++++++++++++++++++++++ get_computed_image {self.get_image_data(index).image_path=} ++++++++++++++++++++++++++++++")
         except dask_image.imread.pims.api.UnknownFormatError:
-            print(f"+++++++++++++++++++++++++++++++++++ get_computed_image FAILED {self.get_image_data(index).image_path=}++++++++++++++++++++++++++++++")
             self.remove_image_data_by_index(index)
-            self.get_computed_image(index-1)
+            self.get_computed_image(index - 1)
         except AttributeError:
             return None
         return self.get_delayed_image(index).compute()
@@ -101,9 +94,7 @@ def remove_image_data_by_path(self, image_path: Path) -> None:
 
     def remove_image_data_by_index(self, index_to_remove: int) -> None:
         self.image_list.pop(index_to_remove)
-        print(f"KKKKKKKKKKKKK {self.delayed_stack=} KKKKKKKKKKKKKKKKKKKK")
         self.delayed_stack = dask.array.delete(self.delayed_stack, index_to_remove, 0)
-        print(f"VVVVVVVVVVVVVVVVVVVVV {self.delayed_stack=} VVVVVVVVVVVVVVVVVVVVVV")
         if index_to_remove == self.selected_index and self.selected_index > 0:
             self.selected_index = self.selected_index - 1
         if not self.image_list:
@@ -129,15 +120,13 @@ def add_images_to_delayed_stack(self, new_image_list: list[Image_Data]) -> None:
             return
         image_paths = [image.image_path for image in self.image_list]
         images_to_add = [image for image in new_image_list if image.image_path not in image_paths]
-        print(f"============== {images_to_add=} ======================")
         if self.delayed_stack is None or dask.array.isnan(self.delayed_stack.shape).any():
             self.delayed_stack = self.create_delayed_stack_from_image_data(new_image_list)
         else:
             if images_to_add:
-                self.delayed_stack = dask.array.concatenate([self.delayed_stack, self.get_delayed_arrays(images_to_add)])
+                self.delayed_stack = dask.array.concatenate(
+                    [self.delayed_stack, self.get_delayed_arrays(images_to_add)])
         self.image_list.extend(images_to_add)
-            # self.delayed_stack = dask.array.stack([self.delayed_stack, self.create_delayed_stack_from_image_data(image_list)])
-            # self.delayed_stack = dask.array.unique(self.delayed_stack)
 
     def delete_all_data(self):
         self.image_list = []
@@ -265,10 +254,6 @@ def _handle_image_changed_in_list(self, image_files: list[Image_Data],
 
         :param image_files: list of image files
         """
-        print(f"++++++++++++++++ _handle_image_changed_in_list +++++++++++++++++++++")
-        print(f"\n{[image.image_path for image in self.image_stack.image_list]=}\n")
-        print(f"\n{[image.image_path for image in dask_image_stack.image_list]=}\n")
-        print(f"\n{[image.image_path for image in image_files]=}\n")
         self.images = image_files
         self.image_stack = dask_image_stack
         # if dask_image_stack.image_list:
@@ -277,12 +262,7 @@ def _handle_image_changed_in_list(self, image_files: list[Image_Data],
         self.presenter.update_image_stack(self.image_stack)
 
     def handle_image_modified(self, image_path: Path):
-        print(f"++++++++++++++++ handle_image_modified +++++++++++++++++++++")
-        print(f"\n{[image.image_path for image in self.image_stack.image_list]=}\n")
-        print(f"\n{image_path=}\n")
         self.image_stack.remove_image_data_by_path(image_path)
-        print(f"\n{[image.image_path for image in self.image_stack.image_list]=}\n")
-        #print(f"\n{[self.image_stack.delayed_stack.shape]=}\n")
         self.presenter.update_image_modified(image_path)
         self.presenter.update_image_stack(self.image_stack)
 
@@ -428,17 +408,6 @@ def _handle_directory_change(self) -> None:
         if len(images) == 0:
             self.image_stack.delete_all_data()
         self.image_stack.add_images_to_delayed_stack(images)
-        print(f"\n ================== {len(self.image_stack.image_list)=} =========================\n")
-        #print(f"\n ================== {self.image_stack.delayed_stack.shape=} =========================\n")
-        if len(images) % 50 == 0:
-            with ExecutionProfiler(msg=f"create delayed array and compute mean for {len(images)} images"):
-
-                print(f"\n ================== {self.image_stack.delayed_stack=} =========================\n")
-                print(f"\n ================== {self.image_stack.image_list=} =========================\n")
-                print(f"\n ================== {len(self.image_stack.image_list)=} =========================\n")
-                if self.image_stack.image_list:
-                    arrmean = dask.array.mean(self.image_stack.delayed_stack, axis=(1, 2))
-                    print(arrmean.compute())
 
         self.update_recent_watcher(images[-1:])
         self.image_changed.emit(images, self.image_stack)

mantidimaging/gui/windows/live_viewer/presenter.py

@@ -81,7 +81,6 @@ def update_image_list(self, images_list: list[Image_Data]) -> None:
         self.view.set_image_index(len(images_list) - 1)
 
     def select_image(self, index: int) -> None:
-        print(f"OOOOOOOOOOOOO select_image: {index=}, {self.model.images=} 0000000000000000")
         if not self.model.images:
             self.update_image_list([])
             return
@@ -99,11 +98,9 @@ def display_image(self, image_data_obj: Image_Data, delayed_image_stack: DaskIma
         """
         Display image in the view after validating contents
         """
-        print(f"\n+++++++++++++++ display_image {delayed_image_stack=} ++++++++++++++++\n")
-        print(f"\n+++++++++++++++ display_image {delayed_image_stack.delayed_stack=} ++++++++++++++++\n")
-        #print(f"\n+++++++++++++++ display_image {delayed_image_stack.delayed_stack.shape=} ++++++++++++++++\n")
         try:
-            if delayed_image_stack is None or delayed_image_stack.delayed_stack is None or not delayed_image_stack.create_delayed_array:
+            if (delayed_image_stack is None or delayed_image_stack.delayed_stack is None
+                    or not delayed_image_stack.create_delayed_array):
                 image_data = self.load_image_from_path(image_data_obj.image_path)
             else:
                 try:
@@ -131,7 +128,6 @@ def load_image_from_delayed_stack(delayed_image_stack: DaskImageDataStack | None
         """
         Load a delayed stack from a DaskImageDataStack and compute
         """
-        delayed_image = None
         if delayed_image_stack is not None:
             image_data = delayed_image_stack.get_selected_computed_image()
         else: