2062 Spectrum Viewer ROI Desync Fix (#2064)

mantidproject · Feb 26, 2024 · 19458d0 · 19458d0
2 parents 8bb4100 + 81197be
commit 19458d0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/mantidimaging/gui/windows/spectrum_viewer/view.py b/mantidimaging/gui/windows/spectrum_viewer/view.py
@@ -220,8 +220,12 @@ def on_visibility_change(self) -> None:
         if self.presenter.export_mode == ExportMode.ROI_MODE:
             if self.current_roi in self.old_table_names and self.last_clicked_roi in self.old_table_names:
                 pass
-            else:
+            elif self.current_roi == ROI_RITS and self.last_clicked_roi in self.old_table_names:
                 self.current_roi = self.last_clicked_roi
+            elif self.current_roi == ROI_RITS and self.last_clicked_roi not in self.old_table_names:
+                self.current_roi = self.roi_table_model.row_data(self.selected_row)[0]
+            else:
+                self.last_clicked_roi = self.current_roi
             if self.roi_table_model.rowCount() == 0:
                 self.disable_roi_properties()
             if not self.roi_table_model.rowCount() == 0:
@@ -421,6 +425,10 @@ def remove_roi(self) -> None:
         if self.roi_table_model.rowCount() == 0:
             self.removeBtn.setEnabled(False)
             self.disable_roi_properties()
+        else:
+            self.set_old_table_names()
+            self.current_roi = self.roi_table_model.row_data(self.selected_row)[0]
+            self.set_roi_properties()
 
     def clear_all_rois(self) -> None:
         """