Unify datasets part 8 (#2346)

mantidimaging/core/data/dataset.py

@@ -184,6 +184,8 @@ def set_stack_by_type_name(self, file_type_name: str, image_stack: ImageStack) -
             self.add_recon(image_stack)
         elif file_type_name == "IMAGES":
             self.stacks.append(image_stack)
+        elif file_type_name == "SINOGRAMS":
+            self._sinograms = image_stack
         else:
             file_type = getattr(FILE_TYPES, file_type_name)
             self.set_stack(file_type, image_stack)
@@ -218,15 +220,14 @@ def _get_stack_data_type(stack_id: uuid.UUID, dataset: Dataset) -> str:
         return "Recon"
     if stack_id in [stack.id for stack in dataset._stacks]:
         return "Images"
-    if isinstance(dataset, StrictDataset):
-        if dataset.sample is not None and stack_id == dataset.sample.id:
-            return "Sample"
-        if dataset.flat_before is not None and stack_id == dataset.flat_before.id:
-            return "Flat Before"
-        if dataset.flat_after is not None and stack_id == dataset.flat_after.id:
-            return "Flat After"
-        if dataset.dark_before is not None and stack_id == dataset.dark_before.id:
-            return "Dark Before"
-        if dataset.dark_after is not None and stack_id == dataset.dark_after.id:
-            return "Dark After"
+    if dataset.sample is not None and stack_id == dataset.sample.id:
+        return "Sample"
+    if dataset.flat_before is not None and stack_id == dataset.flat_before.id:
+        return "Flat Before"
+    if dataset.flat_after is not None and stack_id == dataset.flat_after.id:
+        return "Flat After"
+    if dataset.dark_before is not None and stack_id == dataset.dark_before.id:
+        return "Dark Before"
+    if dataset.dark_after is not None and stack_id == dataset.dark_after.id:
+        return "Dark After"
     raise RuntimeError(f"No stack with ID {stack_id} found in dataset {dataset.id}")

mantidimaging/gui/windows/main/model.py

@@ -140,9 +140,6 @@ def raise_error_when_images_not_found(self, images_id: uuid.UUID) -> NoReturn:
     def raise_error_when_parent_dataset_not_found(self, images_id: uuid.UUID) -> NoReturn:
         raise RuntimeError(f"Failed to find dataset containing ImageStack with ID {images_id}")
 
-    def raise_error_when_parent_strict_dataset_not_found(self, images_id: uuid.UUID) -> NoReturn:
-        raise RuntimeError(f"Failed to find strict dataset containing ImageStack with ID {images_id}")
-
     def add_log_to_sample(self, images_id: uuid.UUID, log_file: Path) -> None:
         images = self.get_images_by_uuid(images_id)
         if images is None:
@@ -237,19 +234,6 @@ def get_parent_dataset(self, member_id: uuid.UUID) -> uuid.UUID:
                 return dataset.id
         self.raise_error_when_parent_dataset_not_found(member_id)
 
-    def add_recon_to_dataset(self, recon_data: ImageStack, stack_id: uuid.UUID) -> uuid.UUID:
-        """
-        Adds a recon to a dataset using recon data and an ID from one of the stacks in the dataset.
-        :param recon_data: The recon data.
-        :param stack_id: The ID of one of the member stacks.
-        :return: The ID of the parent dataset if found.
-        """
-        for dataset in self.datasets.values():
-            if stack_id in dataset:
-                dataset.recons.append(recon_data)
-                return dataset.id
-        self.raise_error_when_parent_strict_dataset_not_found(stack_id)
-
     @property
     def recon_list_ids(self) -> list[uuid.UUID]:
         return [dataset.recons.id for dataset in self.datasets.values()]

mantidimaging/gui/windows/main/presenter.py

@@ -91,7 +91,7 @@ def notify(self, signal: Notification, **baggage):
             elif signal == Notification.SHOW_ADD_STACK_DIALOG:
                 self._show_add_stack_to_dataset_dialog(**baggage)
             elif signal == Notification.DATASET_ADD:
-                self._add_images_to_existing_dataset()
+                self.handle_add_images_to_existing_dataset_from_dialog()
             elif signal == Notification.TAB_CLICKED:
                 self._on_tab_clicked(**baggage)
             elif signal == Notification.SHOW_MOVE_STACK_DIALOG:
@@ -235,11 +235,8 @@ def add_alternative_180_if_required(self, dataset: Dataset) -> None:
                                                                       dataset.sample.projection_angles().value)
             if diff <= THRESHOLD_180 or self.view.ask_to_use_closest_to_180(diff):
                 _180_arr = np.reshape(closest_projection, (1, ) + closest_projection.shape).copy()
-                dataset.proj180deg = ImageStack(_180_arr, name=f"{dataset.name}_180")
-
-                self.add_child_item_to_tree_view(dataset.id, dataset.proj180deg.id, "180")
-                sample_vis = self.get_stack_visualiser(dataset.sample.id)
-                self._create_and_tabify_stack_window(dataset.proj180deg, sample_vis)
+                proj180deg = ImageStack(_180_arr, name=f"{dataset.name}_180")
+                self.add_images_to_existing_dataset(dataset.id, proj180deg, "proj_180")
 
     def create_dataset_stack_visualisers(self, dataset: Dataset) -> StackVisualiserView:
         """
@@ -412,33 +409,8 @@ def add_180_deg_file_to_dataset(self, dataset_id: uuid.UUID, _180_deg_file: str)
         :param dataset_id: The ID of the dataset to update.
         :param _180_deg_file: The filename for the 180 file.
         """
-        existing_180_id = self.model.get_existing_180_id(dataset_id)
-        _180_deg = self.model.add_180_deg_to_dataset(dataset_id, _180_deg_file)
-        stack = self.create_single_tabbed_images_stack(_180_deg)
-        stack.raise_()
-
-        if existing_180_id is None:
-            self.add_child_item_to_tree_view(dataset_id, _180_deg.id, "180")
-        else:
-            self.replace_child_item_id(dataset_id, existing_180_id, _180_deg.id)
-            self._delete_stack_visualiser(existing_180_id)
-
-        self.view.model_changed.emit()
-
-    def replace_child_item_id(self, dataset_id: uuid.UUID, prev_id: uuid.UUID, new_id: uuid.UUID) -> None:
-        """
-        Replaces the ID in an existing child item.
-        :param dataset_id: The ID of the parent dataset.
-        :param prev_id: The previous ID of the tree view item.
-        :param new_id: The new ID that should be given to the tree view item.
-        """
-        dataset_item = self.view.get_dataset_tree_view_item(dataset_id)
-        for i in range(dataset_item.childCount()):
-            child = dataset_item.child(i)
-            if child.id == prev_id:
-                child._id = new_id
-                return
-        raise RuntimeError(f"Failed to get tree view item with ID {prev_id}")
+        proj180deg = self.model.add_180_deg_to_dataset(dataset_id, _180_deg_file)
+        self.add_images_to_existing_dataset(dataset_id, proj180deg, "proj_180")
 
     def add_projection_angles_to_sample(self, stack_id: uuid.UUID, proj_angles: ProjectionAngles) -> None:
         self.model.add_projection_angles_to_sample(stack_id, proj_angles)
@@ -532,31 +504,6 @@ def _remove_recon_item_from_tree_view(recon_group, uuid_remove: uuid.UUID) -> bo
                 return True
         return False
 
-    def add_child_item_to_tree_view(self, parent_id: uuid.UUID, child_id: uuid.UUID, child_name: str) -> None:
-        """
-        Adds a child item to the tree view.
-        :param parent_id: The ID of the parent dataset.
-        :param child_id: The ID of the corresponding ImageStack object.
-        :param child_name: The name that should appear in the tree view.
-        """
-        dataset_item = self.view.get_dataset_tree_view_item(parent_id)
-        self.view.create_child_tree_item(dataset_item, child_id, child_name)
-
-    def add_recon_item_to_tree_view(self, parent_id: uuid.UUID, child_id: uuid.UUID, name: str) -> None:
-        """
-        Adds a recon item to the tree view.
-        :param parent_id: The ID of the parent dataset.
-        :param child_id: The ID of the corresponding ImageStack object.
-        :param name: The name to display for the recon in the tree view.
-        """
-        dataset_item = self.view.get_dataset_tree_view_item(parent_id)
-
-        recon_group = self.view.get_recon_group(dataset_item)
-        if not recon_group:
-            recon_group = self.view.add_recon_group(dataset_item, self.model.get_recon_list_id(parent_id))
-
-        self.view.create_child_tree_item(recon_group, child_id, name)
-
     def add_stack_to_dictionary(self, stack: StackVisualiserView) -> None:
         self.stack_visualisers[stack.id] = stack
 
@@ -610,10 +557,8 @@ def _add_recon_to_dataset(self, recon_data: ImageStack, stack_id: uuid.UUID) ->
         :param recon_data: The recon data.
         :param stack_id: The ID of one of the stacks in the dataset that the recon data should be added to.
         """
-        parent_id = self.model.add_recon_to_dataset(recon_data, stack_id)
-        self.view.create_new_stack(recon_data)
-        self.add_recon_item_to_tree_view(parent_id, recon_data.id, recon_data.name)
-        self.view.model_changed.emit()
+        parent_id = self.model.get_parent_dataset(stack_id)
+        self.add_images_to_existing_dataset(parent_id, recon_data, "Recon")
 
     def add_sinograms_to_dataset_and_update_view(self, sino_stack: ImageStack, original_stack_id: uuid.UUID) -> None:
         """
@@ -622,26 +567,7 @@ def add_sinograms_to_dataset_and_update_view(self, sino_stack: ImageStack, origi
         :param original_stack_id: The ID of a stack in the dataset.
         """
         parent_id = self.model.get_parent_dataset(original_stack_id)
-        prev_sino = self.model.datasets[parent_id].sinograms
-        if prev_sino is not None:
-            self._delete_stack_visualiser(prev_sino.id)
-        self.model.datasets[parent_id].sinograms = sino_stack
-        self._add_sinograms_to_tree_view(sino_stack.id, parent_id)
-        self.create_single_tabbed_images_stack(sino_stack)
-        self.view.model_changed.emit()
-
-    def _add_sinograms_to_tree_view(self, sino_id: uuid.UUID, parent_id: uuid.UUID) -> None:
-        """
-        Adds a sinograms item to the tree view or updates the id of an existing one.
-        :param parent_id: The ID of the parent dataset.
-        :param sino_id: The ID of the corresponding ImageStack object.
-        """
-        dataset_item = self.view.get_dataset_tree_view_item(parent_id)
-        sinograms_item = self.view.get_sinograms_item(dataset_item)
-        if sinograms_item is None:
-            self.view.create_child_tree_item(dataset_item, sino_id, self.view.sino_text)
-        else:
-            sinograms_item._id = sino_id
+        self.add_images_to_existing_dataset(parent_id, sino_stack, "Sinograms")
 
     def _show_add_stack_to_dataset_dialog(self, container_id: uuid.UUID) -> None:
         """
@@ -665,38 +591,28 @@ def _show_move_stack_dialog(self, stack_id: uuid.UUID) -> None:
         stack_data_type = _get_stack_data_type(stack_id, dataset)
         self.view.show_move_stack_dialog(dataset_id, stack_id, dataset.name, stack_data_type)
 
-    def _add_images_to_existing_dataset(self) -> None:
+    def handle_add_images_to_existing_dataset_from_dialog(self) -> None:
         """
         Adds / replaces images to an existing dataset. Updates the tree view and deletes the previous stack if
         necessary.
         """
         assert self.view.add_to_dataset_dialog is not None
 
         dataset_id = self.view.add_to_dataset_dialog.dataset_id
-        dataset = self.get_dataset(dataset_id)
-        assert dataset is not None
-
         new_images = self.view.add_to_dataset_dialog.presenter.images
         images_type = self.view.add_to_dataset_dialog.images_type
 
-        dataset.set_stack_by_type_name(images_type, new_images)
+        self.add_images_to_existing_dataset(dataset_id, new_images, images_type)
 
+    def add_images_to_existing_dataset(self, dataset_id: uuid.UUID, new_images: ImageStack, images_type: str):
+        dataset = self.get_dataset(dataset_id)
+        assert dataset is not None
+        dataset.set_stack_by_type_name(images_type, new_images)
         self.create_single_tabbed_images_stack(new_images)
         self.update_dataset_tree()
         self._close_unused_visualisers()
         self.view.model_changed.emit()
 
-    def _add_images_to_existing_strict_dataset(self, dataset: Dataset, new_images: ImageStack, stack_type: str) -> None:
-        """
-        Adds or replaces images in a StrictDataset and updates the tree view if required.
-        :param dataset: The StrictDataset to change.
-        :param new_images: The new images to add.
-        """
-        image_attr = stack_type.replace(" ", "_").lower()
-        new_images.name = self._create_strict_dataset_stack_name(stack_type, dataset.name)
-        setattr(dataset, image_attr, new_images)
-        self.update_dataset_tree()
-
     def _close_unused_visualisers(self):
         visualisers = set(self.stack_visualisers.keys())
         stacks = {stack.id for stack in self.get_all_stacks()}
@@ -723,9 +639,10 @@ def _move_stack(self, origin_dataset_id: uuid.UUID, stack_id: uuid.UUID, destina
                 f"Unable to find destination dataset with ID {destination_dataset_id} when attempting to move stack")
 
         stack_to_move = self.get_stack(stack_id)
+        stack_to_move.name = self._create_strict_dataset_stack_name(destination_stack_type, destination_dataset.name)
+
         origin_dataset.delete_stack(stack_id)
-        self._add_images_to_existing_strict_dataset(destination_dataset, stack_to_move, destination_stack_type)
-        self._close_unused_visualisers()
+        self.add_images_to_existing_dataset(destination_dataset_id, stack_to_move, destination_stack_type)
 
     @staticmethod
     def _create_strict_dataset_stack_name(stack_type: str, dataset_name: str) -> str:

mantidimaging/gui/windows/main/test/model_test.py

@@ -22,8 +22,6 @@ class MainWindowModelTest(unittest.TestCase):
 
     def setUp(self):
         self.model = MainWindowModel()
-        self.model_class_name = f"{self.model.__module__}.{self.model.__class__.__name__}"
-        self.stack_list_property = f"{self.model_class_name}.stack_list"
 
     def _add_mock_image(self):
         dataset_mock = mock.Mock()
@@ -416,17 +414,6 @@ def test_image_ids(self):
             self.model.add_dataset_to_model(ds)
         self.assertListEqual(all_ids, self.model.image_ids)
 
-    def test_add_recon_to_dataset(self):
-        sample = generate_images()
-        sample_id = sample.id
-        ds = StrictDataset(sample=sample)
-
-        recon = generate_images()
-        self.model.add_dataset_to_model(ds)
-        parent_id = self.model.add_recon_to_dataset(recon, sample_id)
-        self.assertIn(recon, ds.all)
-        assert parent_id == ds.id
-
     def test_proj180s(self):
 
         ds1 = StrictDataset(sample=generate_images())
@@ -443,10 +430,6 @@ def test_proj180s(self):
 
         self.assertListEqual(self.model.proj180s, proj180s)
 
-    def test_exception_when_dataset_for_recons_not_found(self):
-        with self.assertRaises(RuntimeError):
-            self.model.add_recon_to_dataset(generate_images(), "bad-id")
-
     def test_get_parent_strict_dataset_success(self):
         ds = StrictDataset(sample=generate_images())
         self.model.add_dataset_to_model(ds)