fixed issue with spectrum label not resetting on stack change

mantidimaging/gui/windows/spectrum_viewer/presenter.py

@@ -68,7 +68,7 @@ def handle_stack_changed(self) -> None:
                 norm_stack = None
             self.model.set_normalise_stack(norm_stack)
         self.reset_units_menu()
-        self.model.set_relevant_tof_units()
+        self.handle_tof_unit_change()
         self.show_new_sample()
         self.redraw_all_rois()
 
@@ -93,7 +93,7 @@ def handle_sample_change(self, uuid: UUID | None) -> None:
 
         self.model.set_stack(self.main_window.get_stack(uuid))
         self.reset_units_menu()
-        self.model.set_relevant_tof_units()
+        self.handle_tof_unit_change()
         normalise_uuid = self.view.get_normalise_stack()
         if normalise_uuid is not None:
             try:
@@ -109,17 +109,17 @@ def handle_sample_change(self, uuid: UUID | None) -> None:
         self.view.on_visibility_change()
 
     def reset_units_menu(self):
-        if self.model.tof_data is None:
-            self.view.tof_mode_select_group.setEnabled(False)
-        else:
-            self.view.tof_mode_select_group.setEnabled(True)
         self.model.tof_mode = ToFUnitMode.IMAGE_NUMBER
         for action in self.view.tof_mode_select_group.actions():
             with QSignalBlocker(action):
                 if action.objectName() == 'Image Index':
                     action.setChecked(True)
                 else:
                     action.setChecked(False)
+        if self.model.tof_data is None:
+            self.view.tof_mode_select_group.setEnabled(False)
+        else:
+            self.view.tof_mode_select_group.setEnabled(True)
 
     def handle_normalise_stack_change(self, normalise_uuid: UUID | None) -> None:
         if normalise_uuid == self.current_norm_stack_uuid:

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

@@ -35,6 +35,7 @@ def setUp(self) -> None:
         self.view.exportButtonRITS = mock.create_autospec(QPushButton)
         self.view.addBtn = mock.create_autospec(QPushButton)
         self.view.tof_mode_select_group = mock.create_autospec(QActionGroup)
+        self.view.allowed_modes = mock.create_autospec(dict)
         self.presenter = SpectrumViewerWindowPresenter(self.view, self.main_window)
 
     def test_get_dataset_id_for_stack_no_stack_id(self):
@@ -54,6 +55,7 @@ def test_handle_sample_change_has_flat_before(self):
         self.presenter.main_window.get_stack = mock.Mock(return_value=generate_images())
         self.presenter.show_new_sample = mock.Mock()
         self.view.try_to_select_relevant_normalise_stack = mock.Mock()
+        self.presenter.handle_tof_unit_change = mock.Mock()
 
         self.presenter.handle_sample_change(uuid.uuid4())
         self.view.try_to_select_relevant_normalise_stack.assert_called_once_with('Flat_before')
@@ -68,6 +70,7 @@ def test_handle_sample_change_has_flat_after(self):
         self.presenter.show_new_sample = mock.Mock()
         self.view.try_to_select_relevant_normalise_stack = mock.Mock()
 
+        self.presenter.handle_tof_unit_change = mock.Mock()
         self.presenter.handle_sample_change(uuid.uuid4())
         self.view.try_to_select_relevant_normalise_stack.assert_called_once_with('Flat_after')
         self.presenter.show_new_sample.assert_called_once()
@@ -89,6 +92,7 @@ def test_handle_sample_change_dataset_unchanged(self):
         self.presenter.main_window.get_dataset = mock.Mock()
         self.presenter.main_window.get_stack = mock.Mock(return_value=generate_images())
         self.presenter.show_new_sample = mock.Mock()
+        self.presenter.handle_tof_unit_change = mock.Mock()
 
         self.presenter.handle_sample_change(uuid.uuid4())
         self.presenter.main_window.get_dataset.assert_not_called()
@@ -101,6 +105,7 @@ def test_handle_sample_change_to_MixedDataset(self):
         self.presenter.main_window.get_stack = mock.Mock(return_value=generate_images())
         self.presenter.show_new_sample = mock.Mock()
         self.view.try_to_select_relevant_normalise_stack = mock.Mock()
+        self.presenter.handle_tof_unit_change = mock.Mock()
 
         self.presenter.handle_sample_change(uuid.uuid4())
         self.presenter.main_window.get_dataset.assert_called_once()
@@ -113,6 +118,7 @@ def test_handle_sample_change_no_flat(self):
         self.presenter.main_window.get_stack = mock.Mock(return_value=generate_images())
         self.presenter.show_new_sample = mock.Mock()
         self.view.try_to_select_relevant_normalise_stack = mock.Mock()
+        self.presenter.handle_tof_unit_change = mock.Mock()
 
         self.presenter.handle_sample_change(uuid.uuid4())
         self.presenter.main_window.get_dataset.assert_called_once()