AddImagesToDatasetDialog treat all datasets the same

Author: samtygier-stfc

mantidimaging/gui/windows/add_images_to_dataset_dialog/test/view_test.py

@@ -22,7 +22,7 @@ def setUp(self) -> None:
             self.main_window = MainWindowView()
         self.dataset_id = uuid.uuid4()
         self.dataset_name = "dataset-name"
-        self.view = AddImagesToDatasetDialog(self.main_window, self.dataset_id, True, self.dataset_name)
+        self.view = AddImagesToDatasetDialog(self.main_window, self.dataset_id, self.dataset_name)
         self.view.presenter = self.presenter = mock.MagicMock()
 
     def test_on_accepted(self):

mantidimaging/gui/windows/add_images_to_dataset_dialog/view.py

@@ -15,18 +15,15 @@ class AddImagesToDatasetDialog(BaseDialogView):
     filePathLineEdit: QLineEdit
     datasetNameText: QLabel
 
-    def __init__(self, parent, dataset_id: uuid.UUID, strict_dataset: bool, dataset_name: str):
+    def __init__(self, parent, dataset_id: uuid.UUID, dataset_name: str):
         super().__init__(parent, 'gui/ui/add_to_dataset.ui')
 
         self.parent_view = parent
         self.presenter = AddImagesToDatasetPresenter(self)
         self._dataset_id = dataset_id
 
-        if strict_dataset:
-            self.imageTypeComboBox.addItems(
-                ["Sample", "Flat Before", "Flat After", "Dark Before", "Dark After", "Recon"])
-        else:
-            self.imageTypeComboBox.addItems(["Images", "Recon"])
+        self.imageTypeComboBox.addItems(
+            ["Sample", "Flat Before", "Flat After", "Dark Before", "Dark After", "Recon", "Images"])
 
         self.datasetNameText.setText(dataset_name)
         self.chooseFileButton.clicked.connect(self.choose_file_path)

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

@@ -11,7 +11,7 @@
 import numpy as np
 from PyQt5.QtWidgets import QDialog
 
-from mantidimaging.core.data.dataset import StrictDataset, MixedDataset, Dataset
+from mantidimaging.core.data.dataset import Dataset
 from mantidimaging.core.utility.data_containers import ProjectionAngles
 from mantidimaging.gui.windows.main import MainWindowView
 from mantidimaging.gui.windows.main.presenter import Notification as PresNotification, Notification
@@ -465,27 +465,16 @@ def test_add_images_to_existing_dataset_sends_container_id(self):
         self.view._add_images_to_existing_dataset()
         self.presenter.notify.assert_called_once_with(PresNotification.SHOW_ADD_STACK_DIALOG, container_id=dataset_id)
 
-    def test_show_add_stack_to_existing_dataset_dialog_with_strict_dataset(self):
-        mock_strict_dataset = mock.Mock(spec=StrictDataset)
+    def test_show_add_stack_to_existing_dataset_dialog_with_dataset(self):
+        mock_strict_dataset = mock.Mock(spec=Dataset)
         mock_strict_dataset.id = strict_dataset_id = "strict-dataset-id"
         mock_strict_dataset.name = strict_dataset_name = "strict-dataset-name"
         self.presenter.get_dataset.return_value = mock_strict_dataset
 
         with mock.patch("mantidimaging.gui.windows.main.view.AddImagesToDatasetDialog") as add_images_mock:
             self.view.show_add_stack_to_existing_dataset_dialog(strict_dataset_id)
 
-        add_images_mock.assert_called_once_with(self.view, strict_dataset_id, True, strict_dataset_name)
-
-    def test_show_add_stack_to_existing_dataset_dialog_with_mixed_dataset(self):
-        mock_mixed_dataset = mock.Mock(spec=MixedDataset)
-        mock_mixed_dataset.name = mixed_dataset_name = "mixed-dataset-name"
-        mixed_dataset_id = "mixed-dataset-id"
-        self.presenter.get_dataset.return_value = mock_mixed_dataset
-
-        with mock.patch("mantidimaging.gui.windows.main.view.AddImagesToDatasetDialog") as add_images_mock:
-            self.view.show_add_stack_to_existing_dataset_dialog(mixed_dataset_id)
-
-        add_images_mock.assert_called_once_with(self.view, mixed_dataset_id, False, mixed_dataset_name)
+        add_images_mock.assert_called_once_with(self.view, strict_dataset_id, strict_dataset_name)
 
     def test_tab_bar_clicked(self):
         mock_stack = mock.Mock()

mantidimaging/gui/windows/main/view.py

@@ -17,7 +17,6 @@
     QTreeWidgetItem, QTreeWidget
 
 from mantidimaging.core.data import ImageStack
-from mantidimaging.core.data.dataset import StrictDataset
 from mantidimaging.core.io.utility import find_first_file_that_is_possibly_a_sample
 from mantidimaging.core.utility import finder
 from mantidimaging.core.utility.command_line_arguments import CommandLineArguments
@@ -766,8 +765,7 @@ def show_add_stack_to_existing_dataset_dialog(self, dataset_id: uuid.UUID) -> No
         dataset = self.presenter.get_dataset(dataset_id)
         if dataset is None:
             raise RuntimeError(f"Unable to find dataset with ID {dataset_id}")
-        self.add_to_dataset_dialog = AddImagesToDatasetDialog(self, dataset_id, isinstance(dataset, StrictDataset),
-                                                              dataset.name)
+        self.add_to_dataset_dialog = AddImagesToDatasetDialog(self, dataset_id, dataset.name)
         self.add_to_dataset_dialog.show()
 
     def _on_tab_bar_clicked(self, stack: StackVisualiserView) -> None: