2027 adjustable ROI

mantidimaging/gui/ui/spectrum_viewer.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>921</width>
-    <height>739</height>
+    <width>913</width>
+    <height>710</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -351,20 +351,22 @@
          </widget>
         </item>
         <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
+         <widget class="QGroupBox" name="roiPropertiesGroupBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::MinimumExpanding</enum>
+          <property name="title">
+           <string>ROI Properties</string>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
+          <layout class="QVBoxLayout" name="verticalLayout_7">
+           <item>
+            <widget class="QTableWidget" name="roiPropertiesTableWidget"/>
+           </item>
+          </layout>
+         </widget>
         </item>
        </layout>
       </widget>

mantidimaging/gui/windows/spectrum_viewer/spectrum_widget.py

@@ -63,6 +63,10 @@ def colour(self, colour: tuple[int, int, int, int]) -> None:
     def selected_row(self) -> Optional[int]:
         return self._selected_row
 
+    def adjust_spec_roi(self, roi: SensibleROI) -> None:
+        self.setPos((roi.left, roi.top))
+        self.setSize((roi.width, roi.height))
+
 
 class SpectrumWidget(GraphicsLayoutWidget):
     """
@@ -183,6 +187,14 @@ def add_roi(self, roi: SensibleROI, name: str) -> None:
         self.image.vb.addItem(self.roi_dict[name])
         self.roi_dict[name].hoverPen = mkPen(self.roi_dict[name].colour, width=3)
 
+    def adjust_roi(self, new_roi: SensibleROI, roi_name: str):
+        """
+        Adjust the existing ROI with the given name.
+        @param spec_roi: The new SpectrumROI to replace the existing SpectrumROI
+        @param roi_name: The name of the existing ROI.
+        """
+        self.roi_dict[roi_name].adjust_spec_roi(new_roi)
+
     def get_roi(self, roi_name: str) -> SensibleROI:
         """
         Get the ROI with the given name. If no name is given, the default ROI is returned.

mantidimaging/gui/windows/spectrum_viewer/view.py

@@ -6,7 +6,8 @@
 
 from PyQt5.QtGui import QPixmap
 from PyQt5.QtWidgets import QCheckBox, QVBoxLayout, QFileDialog, QPushButton, QLabel, QAbstractItemView, QHeaderView, \
-    QTabWidget, QComboBox, QSpinBox
+    QTabWidget, QComboBox, QSpinBox, QTableWidget, QTableWidgetItem, QGroupBox
+from PyQt5.QtCore import QSignalBlocker, Qt
 
 from mantidimaging.core.utility import finder
 from mantidimaging.gui.mvp_base import BaseMainWindowView
@@ -16,6 +17,7 @@
 from mantidimaging.gui.widgets import RemovableRowTableView
 from .spectrum_widget import SpectrumWidget
 from mantidimaging.gui.windows.spectrum_viewer.roi_table_model import TableModel
+from mantidimaging.core.utility.sensible_roi import SensibleROI
 
 import numpy as np
 
@@ -41,6 +43,9 @@ class SpectrumViewerWindowView(BaseMainWindowView):
     bin_size_spinBox: QSpinBox
     bin_step_spinBox: QSpinBox
 
+    roiPropertiesTableWidget: QTableWidget
+    roiPropertiesGroupBox: QGroupBox
+
     def __init__(self, main_window: 'MainWindowView'):
         super().__init__(None, 'gui/ui/spectrum_viewer.ui')
 
@@ -92,7 +97,47 @@ def __init__(self, main_window: 'MainWindowView'):
         self.tableView.setSelectionMode(QAbstractItemView.SingleSelection)
         self.tableView.setAlternatingRowColors(True)
 
+        # Roi Prop table
+        self.roiPropertiesGroupBoxTitle: str = "Roi Properties: "
+        self.roi_table_properties = ["Top", "Bottom", "Left", "Right"]
+        self.roi_table_properties_secondary = ["Width", "Height", "Area"]
+        self.roi_table_properties_all = self.roi_table_properties + self.roi_table_properties_secondary
+        self.roiPropertiesTableWidget.setColumnCount(2)
+        self.roiPropertiesTableWidget.setRowCount(len(self.roi_table_properties_all))
+
+        self.roiPropertiesSpinBoxes = {}
+        self.roiPropertiesLabels = {}
+        row_ind = 0
+        for prop in self.roi_table_properties_all:
+            table_widget = QTableWidgetItem(prop)
+            table_widget.setFlags(Qt.ItemIsSelectable)
+            self.roiPropertiesTableWidget.setItem(row_ind, 0, table_widget)
+            if prop in self.roi_table_properties:
+                spin_box = QSpinBox()
+                if prop == "Top" or prop == "Bottom":
+                    spin_box.setMaximum(self.spectrum.image.image_data.shape[0])
+                if prop == "Left" or prop == "Right":
+                    spin_box.setMaximum(self.spectrum.image.image_data.shape[1])
+                spin_box.valueChanged.connect(self.adjust_roi)
+                self.roiPropertiesTableWidget.setCellWidget(row_ind, 1, spin_box)
+                self.roiPropertiesSpinBoxes[prop] = spin_box
+            if prop in self.roi_table_properties_secondary:
+                label = QLabel()
+                self.roiPropertiesTableWidget.setCellWidget(row_ind, 1, label)
+                self.roiPropertiesLabels[prop] = label
+            row_ind += 1
+
+        self.roiPropertiesTableWidget.horizontalHeader().hide()
+        self.roiPropertiesTableWidget.verticalHeader().hide()
+        self.roiPropertiesTableWidget.setShowGrid(False)
+
+        self.spectrum.roi_changed.connect(self.set_roi_properties)
+
         _ = self.roi_table_model  # Initialise model
+        self.current_roi = self.roi_table_model.roi_names()[0]
+        self.set_roi_properties()
+
+        print(f"{self.presenter.export_mode=}")
 
         def on_row_change(item, _) -> None:
             """
@@ -104,6 +149,7 @@ def on_row_change(item, _) -> None:
             selected_row_data = self.roi_table_model.row_data(item.row())
             self.selected_row = item.row()
             self.current_roi = selected_row_data[0]
+            self.set_roi_properties()
 
         self.tableView.selectionModel().currentRowChanged.connect(on_row_change)
 
@@ -150,6 +196,8 @@ def on_visibility_change(self) -> None:
         When the visibility of an ROI is changed, update the visibility of the ROI in the spectrum widget
         """
         if self.presenter.export_mode == ExportMode.ROI_MODE:
+            self.current_roi = self.roi_table_model.row_data(self.selected_row)[0]
+            self.set_roi_properties()
             for roi_name, _, roi_visible in self.roi_table_model:
                 if roi_visible is False:
                     self.set_roi_alpha(0, roi_name)
@@ -163,6 +211,8 @@ def on_visibility_change(self) -> None:
         if self.presenter.export_mode == ExportMode.IMAGE_MODE:
             self.set_roi_alpha(255, ROI_RITS)
             self.presenter.redraw_spectrum(ROI_RITS)
+            self.current_roi = ROI_RITS
+            self.set_roi_properties()
         else:
             self.set_roi_alpha(0, ROI_RITS)
 
@@ -334,3 +384,40 @@ def set_binning_visibility(self) -> None:
         self.bin_size_spinBox.setHidden(hide_binning)
         self.bin_step_label.setHidden(hide_binning)
         self.bin_step_spinBox.setHidden(hide_binning)
+
+    def set_roi_properties(self) -> None:
+        current_roi = self.presenter.model.get_roi(self.current_roi)
+        self.roiPropertiesGroupBox.setTitle(self.roiPropertiesGroupBoxTitle + self.current_roi)
+        roi_iter_order = ["Left", "Top", "Right", "Bottom"]
+        row = 0
+        for pos in current_roi.__iter__():
+            with QSignalBlocker(self.roiPropertiesSpinBoxes[roi_iter_order[row]]):
+                self.roiPropertiesSpinBoxes[roi_iter_order[row]].setValue(pos)
+            row = row + 1
+        self.set_roi_spinbox_ranges()
+        self.presenter.redraw_spectrum(self.current_roi)
+        roi_width = abs(self.roiPropertiesSpinBoxes["Right"].value() - self.roiPropertiesSpinBoxes["Left"].value())
+        self.roiPropertiesLabels["Width"].setText(str(roi_width))
+        roi_height = abs(self.roiPropertiesSpinBoxes["Top"].value() - self.roiPropertiesSpinBoxes["Bottom"].value())
+        self.roiPropertiesLabels["Height"].setText(str(roi_height))
+        roi_area = roi_width * roi_height
+        self.roiPropertiesLabels["Area"].setText(str(roi_area))
+
+    def adjust_roi(self) -> None:
+        roi_iter_order = ["Left", "Top", "Right", "Bottom"]
+        new_points = [self.roiPropertiesSpinBoxes[prop].value() for prop in roi_iter_order]
+        new_roi = SensibleROI().from_list(new_points)
+        self.presenter.model.set_roi(self.current_roi, new_roi)
+        self.spectrum.adjust_roi(new_roi, self.current_roi)
+
+    def set_roi_spinbox_ranges(self):
+        spin_boxes = self.roiPropertiesSpinBoxes
+        for key, value in spin_boxes.items():
+            if key == "Left":
+                value.setMaximum(spin_boxes["Right"].value() - 1)
+            elif key == "Right":
+                value.setMinimum(spin_boxes["Left"].value() + 1)
+            elif key == "Top":
+                value.setMaximum(spin_boxes["Bottom"].value() - 1)
+            elif key == "Bottom":
+                value.setMinimum(spin_boxes["Top"].value() + 1)