Remove MainWindowView.strict_dataset_list

Author: samtygier-stfc

mantidimaging/gui/windows/main/nexus_save_dialog.py

@@ -3,11 +3,12 @@
 from __future__ import annotations
 import os
 import uuid
+from collections.abc import Iterable
 
 from PyQt5.QtWidgets import QDialogButtonBox, QFileDialog, QRadioButton
 
+from mantidimaging.core.data.dataset import Dataset
 from mantidimaging.gui.mvp_base import BaseDialogView
-from mantidimaging.gui.windows.main.presenter import DatasetId
 
 NXS_EXT = ".nxs"
 
@@ -18,7 +19,7 @@ class NexusSaveDialog(BaseDialogView):
     floatRadioButton: QRadioButton
     intRadioButton: QRadioButton
 
-    def __init__(self, parent, dataset_list: list[DatasetId]):
+    def __init__(self, parent, dataset_list: Iterable[Dataset]):
         super().__init__(parent, 'gui/ui/nexus_save_dialog.ui')
 
         self.browseButton.clicked.connect(self._set_save_path)
@@ -32,9 +33,10 @@ def __init__(self, parent, dataset_list: list[DatasetId]):
 
         self.selected_dataset = None
 
-    def _create_dataset_lists(self, dataset_list):
+    def _create_dataset_lists(self, dataset_list: Iterable[Dataset]):
         if dataset_list:
-            self.dataset_uuids, dataset_names = zip(*dataset_list, strict=True)
+            self.dataset_uuids = [ds.id for ds in dataset_list]
+            dataset_names = [ds.name for ds in dataset_list]
             self.datasetNames.addItems(dataset_names)
 
     def accept(self) -> None:

mantidimaging/gui/windows/main/presenter.py

@@ -40,11 +40,6 @@ class StackId(NamedTuple):
     name: str
 
 
-class DatasetId(NamedTuple):
-    id: uuid.UUID
-    name: str
-
-
 logger = getLogger(__name__)
 
 
@@ -419,14 +414,6 @@ def stack_visualiser_list(self) -> list[StackId]:
     def datasets(self) -> Iterable[Dataset]:
         return self.model.datasets.values()
 
-    @property
-    def strict_dataset_list(self) -> list[DatasetId]:
-        datasets = [
-            DatasetId(dataset.id, dataset.name) for dataset in self.model.datasets.values()
-            if isinstance(dataset, StrictDataset)
-        ]
-        return sorted(datasets, key=lambda x: x.name)
-
     @property
     def all_dataset_ids(self) -> Iterable[uuid.UUID]:
         return self.model.datasets.keys()

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

@@ -5,7 +5,6 @@
 from unittest import mock
 
 from mantidimaging.gui.windows.main.nexus_save_dialog import NexusSaveDialog
-from mantidimaging.gui.windows.main.presenter import DatasetId
 from mantidimaging.test_helpers import start_qapplication
 
 
@@ -62,11 +61,13 @@ def test_save_enabled(self):
     def test_dataset_lists_creation(self):
         dataset_id = "dataset-id"
         dataset_name = "dataset-name"
+        ds = mock.Mock(id=dataset_id)
+        ds.name = dataset_name
         self.nexus_save_dialog.datasetNames = mock.Mock()
-        self.nexus_save_dialog._create_dataset_lists([DatasetId(dataset_id, dataset_name)])
+        self.nexus_save_dialog._create_dataset_lists([ds])
 
-        self.assertEqual(self.nexus_save_dialog.dataset_uuids, (dataset_id, ))
-        self.nexus_save_dialog.datasetNames.addItems.assert_called_once_with((dataset_name, ))
+        self.assertEqual(self.nexus_save_dialog.dataset_uuids, [dataset_id])
+        self.nexus_save_dialog.datasetNames.addItems.assert_called_once_with([dataset_name])
 
     @mock.patch("mantidimaging.gui.windows.main.nexus_save_dialog.QFileDialog.getSaveFileName")
     def test_set_save_path_adds_extension(self, get_save_file_name_mock):

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

@@ -497,8 +497,8 @@ def test_dataset_list(self):
 
         self.model.datasets = {"id1": dataset_1, "id2": dataset_2, "id3": mixed_dataset}
 
-        dataset_list = self.presenter.strict_dataset_list
-        assert len(dataset_list) == 2
+        dataset_list = list(self.presenter.datasets)
+        assert len(dataset_list) == 3
 
     def test_add_child_item_to_tree_view(self):
         dataset_item_mock = self.view.get_dataset_tree_view_item.return_value

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

@@ -449,7 +449,7 @@ def test_show_image_save_dialog(self, image_save_dialog_mock):
     @mock.patch("mantidimaging.gui.windows.main.view.NexusSaveDialog")
     def test_show_nexus_save_dialog(self, nexus_save_dialog_mock):
         self.view.show_nexus_save_dialog()
-        nexus_save_dialog_mock.assert_called_once_with(self.view, self.view.strict_dataset_list)
+        nexus_save_dialog_mock.assert_called_once_with(self.view, self.view.presenter.datasets)
         nexus_save_dialog_mock.return_value.show.assert_called_once()
 
     def test_execute_add_to_dataset_calls_notify(self):

mantidimaging/gui/windows/main/view.py

@@ -29,7 +29,7 @@
 from mantidimaging.gui.windows.add_images_to_dataset_dialog.view import AddImagesToDatasetDialog
 from mantidimaging.gui.windows.image_load_dialog import ImageLoadDialog
 from mantidimaging.gui.windows.main.nexus_save_dialog import NexusSaveDialog
-from mantidimaging.gui.windows.main.presenter import MainWindowPresenter, Notification, DatasetId, StackId
+from mantidimaging.gui.windows.main.presenter import MainWindowPresenter, Notification, StackId
 from mantidimaging.gui.windows.main.presenter import Notification as PresNotification
 from mantidimaging.gui.windows.main.image_save_dialog import ImageSaveDialog
 from mantidimaging.gui.windows.move_stack_dialog.view import MoveStackDialog
@@ -424,7 +424,7 @@ def show_image_save_dialog(self) -> None:
         self.image_save_dialog.show()
 
     def show_nexus_save_dialog(self) -> None:
-        self.nexus_save_dialog = NexusSaveDialog(self, self.strict_dataset_list)
+        self.nexus_save_dialog = NexusSaveDialog(self, self.presenter.datasets)
         self.nexus_save_dialog.show()
 
     def show_settings_window(self) -> None:
@@ -484,10 +484,6 @@ def show_live_viewer(self, live_data_path: Path) -> None:
     def stack_list(self) -> list[StackId]:
         return self.presenter.stack_visualiser_list
 
-    @property
-    def strict_dataset_list(self) -> list[DatasetId]:
-        return self.presenter.strict_dataset_list
-
     @property
     def stack_names(self) -> list[str]:
         return self.presenter.stack_visualiser_names