Switch from _on_stack_load_done to _on_dataset_load_done

Author: samtygier-stfc

mantidimaging/gui/windows/main/presenter.py

@@ -159,19 +159,9 @@ def save_nexus_file(self) -> None:
                               busy=True)
 
     def load_image_stack(self, file_path: str) -> None:
-        start_async_task_view(self.view, self.model.load_images_into_mixed_dataset, self._on_stack_load_done,
+        start_async_task_view(self.view, self.model.load_images_into_mixed_dataset, self._on_dataset_load_done,
                               {'file_path': file_path})
 
-    def _on_stack_load_done(self, task: TaskWorkerThread) -> None:
-
-        if task.was_successful():
-            self.create_mixed_dataset_tree_view_items(task.result)
-            self.create_dataset_stack_visualisers(task.result)
-            self.view.model_changed.emit()
-            task.result = None
-        else:
-            self._handle_task_error(self.LOAD_ERROR_STRING, task)
-
     def _open_window_if_not_open(self) -> None:
         """
         Launches windows that requires loaded data if the CLI flags are set.
@@ -205,7 +195,8 @@ def _add_strict_dataset_to_view(self, dataset: StrictDataset) -> None:
         """
         self.update_dataset_tree()
         self.create_dataset_stack_visualisers(dataset)
-        self.add_alternative_180_if_required(dataset)
+        if dataset.sample:
+            self.add_alternative_180_if_required(dataset)
 
     def _handle_task_error(self, base_message: str, task: TaskWorkerThread) -> None:
         msg = base_message.format(task.error)

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

@@ -88,7 +88,7 @@ def test_failed_attempt_to_load_shows_error(self):
         self.assertFalse(task.was_successful())
 
         # Call the callback with a task that failed
-        self.presenter._on_stack_load_done(task)
+        self.presenter._on_dataset_load_done(task)
 
         # Expect error message
         self.view.show_error_dialog.assert_called_once_with(self.presenter.LOAD_ERROR_STRING.format(task.error))
@@ -122,7 +122,7 @@ def test_load_stack(self, start_async_mock: mock.Mock):
         self.presenter.load_image_stack(file_path)
 
         start_async_mock.assert_called_once_with(self.view, self.presenter.model.load_images_into_mixed_dataset,
-                                                 self.presenter._on_stack_load_done, {'file_path': file_path})
+                                                 self.presenter._on_dataset_load_done, {'file_path': file_path})
 
     def test_add_stack(self):
         images = generate_images()
@@ -508,14 +508,15 @@ def test_add_child_item_to_tree_view(self):
         self.view.create_child_tree_item.assert_called_once_with(dataset_item_mock, child_id, child_name)
 
     @mock.patch("mantidimaging.gui.windows.main.presenter.MainWindowPresenter.create_mixed_dataset_tree_view_items")
-    def test_on_stack_load_done_success(self, _):
+    @mock.patch("mantidimaging.gui.windows.main.presenter.MainWindowPresenter._open_window_if_not_open")
+    def test_on_stack_load_done_success(self, _, _1):
         task = mock.Mock()
         task.result = result_mock = mock.Mock()
         task.was_successful.return_value = True
         task.kwargs = {'file_path': "a/stack/path"}
         self.presenter.create_dataset_stack_visualisers = mock.Mock()
 
-        self.presenter._on_stack_load_done(task)
+        self.presenter._on_dataset_load_done(task)
         self.presenter.create_dataset_stack_visualisers.assert_called_once_with(result_mock)
         self.view.model_changed.emit.assert_called_once()