Refactor ROI editor dialog handling and update plot options retrieval

Author: PierreRaybaut

datalab/gui/panel/base.py

@@ -15,7 +15,7 @@
 import os.path as osp
 import re
 import warnings
-from typing import TYPE_CHECKING, Generic, Literal, Type
+from typing import TYPE_CHECKING, Any, Generic, Literal, Type
 
 import guidata.dataset as gds
 import guidata.dataset.qtwidgets as gdq
@@ -289,7 +289,6 @@ class BaseDataPanel(AbstractPanel, Generic[TypeObj, TypeROI, TypeROIEditor]):
     SIG_REFRESH_PLOT = QC.Signal(
         str, bool, bool, bool, bool
     )  # Connected to PlotHandler.refresh_plot
-    ROIDIALOGOPTIONS = {}
 
     @staticmethod
     @abc.abstractmethod
@@ -1264,13 +1263,23 @@ def __separate_view_finished(self, result: int) -> None:
         self.__separate_views.pop(dlg)
         dlg.deleteLater()
 
+    def get_dialog_size(self) -> tuple[int, int]:
+        """Get dialog size (minimum and maximum)"""
+        # Resize the dialog so that it's at least MINDIALOGSIZE (absolute values),
+        # and at most MAXDIALOGSIZE (% of the main window size):
+        minwidth, minheight = self.MINDIALOGSIZE
+        maxwidth = int(self.mainwindow.width() * self.MAXDIALOGSIZE)
+        maxheight = int(self.mainwindow.height() * self.MAXDIALOGSIZE)
+        size = min(minwidth, maxwidth), min(minheight, maxheight)
+        return size
+
     def create_new_dialog(
         self,
         edit: bool = False,
         toolbar: bool = True,
         title: str | None = None,
         name: str | None = None,
-        options: dict | None = None,
+        options: dict[str, Any] | None = None,
     ) -> PlotDialog | None:
         """Create new pop-up signal/image plot dialog.
 
@@ -1284,27 +1293,20 @@ def create_new_dialog(
         Returns:
             Plot dialog instance
         """
-        plot_options = self.plothandler.get_current_plot_options()
+        plot_options = self.plothandler.get_plot_options()
         if options is not None:
             plot_options = plot_options.copy(options)
 
-        # Resize the dialog so that it's at least MINDIALOGSIZE (absolute values),
-        # and at most MAXDIALOGSIZE (% of the main window size):
-        minwidth, minheight = self.MINDIALOGSIZE
-        maxwidth = int(self.mainwindow.width() * self.MAXDIALOGSIZE)
-        maxheight = int(self.mainwindow.height() * self.MAXDIALOGSIZE)
-        size = min(minwidth, maxwidth), min(minheight, maxheight)
-
         # pylint: disable=not-callable
         dlg = PlotDialog(
             parent=self.parent(),
             title=APP_NAME if title is None else f"{title} - {APP_NAME}",
-            edit=edit,
             options=plot_options,
             toolbar=toolbar,
-            size=size,
+            icon="DataLab.svg",
+            edit=edit,
+            size=self.get_dialog_size(),
         )
-        dlg.setWindowIcon(get_icon("DataLab.svg"))
         dlg.setObjectName(name)
         return dlg
 
@@ -1322,34 +1324,20 @@ def get_roi_editor_output(
             A tuple containing the ROI object and a boolean indicating whether the
             dialog was accepted or not.
         """
-        roi_s = _("Regions of interest")
-        options = self.ROIDIALOGOPTIONS
         obj = self.objview.get_sel_objects(include_groups=True)[-1]
-
-        # Create a new dialog
-
-        dlg = self.create_new_dialog(
-            edit=True,
-            toolbar=mode != "define",
-            title=f"{roi_s} - {obj.title}",
-            name=f"{obj.PREFIX}_roi_dialog",
-            options=options,
-        )
-        if dlg is None:
-            return None
-
-        # Create ROI editor (and add it to the dialog)
-
         item = create_adapter_from_object(obj).make_item(
             update_from=self.plothandler[get_uuid(obj)]
         )
-
-        # pylint: disable=not-callable
-        roi_editor = self.get_roieditor_class()(dlg, obj, mode, item=item)
-
-        dlg.button_layout.insertWidget(0, roi_editor)
-
-        if exec_dialog(dlg):
+        roi_editor_class = self.get_roieditor_class()  # pylint: disable=not-callable
+        roi_editor = roi_editor_class(
+            parent=self.parent(),
+            obj=obj,
+            mode=mode,
+            item=item,
+            options=self.plothandler.get_plot_options(),
+            size=self.get_dialog_size(),
+        )
+        if exec_dialog(roi_editor):
             return roi_editor.get_roieditor_results()
         return None
 

datalab/gui/panel/image.py

@@ -59,7 +59,6 @@ class ImagePanel(BaseDataPanel[ImageObj, ImageROI, roieditor.ImageROIEditor]):
 
     IO_REGISTRY = ImageIORegistry
     H5_PREFIX = "DataLab_Ima"
-    ROIDIALOGOPTIONS = {"show_itemlist": True, "show_contrast": False}
 
     # pylint: disable=duplicate-code
 

datalab/gui/plothandler.py

@@ -471,7 +471,7 @@ def cleanup_dataview(self) -> None:
             ]
         )
 
-    def get_current_plot_options(self) -> PlotOptions:
+    def get_plot_options(self) -> PlotOptions:
         """Return standard signal/image plot options"""
         return PlotOptions(
             type=self.PLOT_TYPE,
@@ -496,9 +496,9 @@ def toggle_anti_aliasing(self, state: bool) -> None:
         self.plot.set_antialiasing(state)
         self.plot.replot()
 
-    def get_current_plot_options(self) -> PlotOptions:
+    def get_plot_options(self) -> PlotOptions:
         """Return standard signal/image plot options"""
-        options = super().get_current_plot_options()
+        options = super().get_plot_options()
         options.curve_antialiasing = self.plot.antialiased
         return options
 
@@ -628,9 +628,9 @@ def cleanup_dataview(self) -> None:
             widget.hide()
         super().cleanup_dataview()
 
-    def get_current_plot_options(self) -> PlotOptions:
+    def get_plot_options(self) -> PlotOptions:
         """Return standard signal/image plot options"""
-        options = super().get_current_plot_options()
+        options = super().get_plot_options()
         options.zlabel = self.plot.get_axis_title("right")
         options.zunit = self.plot.get_axis_unit("right")
         return options

datalab/gui/processor/image.py

@@ -547,7 +547,7 @@ def compute_line_profile(
         add_initial_shape = self.has_param_defaults(sigima.params.LineProfileParam)
         edit, param = self.init_param(param, sigima_image.LineProfileParam, title)
         if edit:
-            options = self.panel.plothandler.get_current_plot_options()
+            options = self.panel.plothandler.get_plot_options()
             dlg = ProfileExtractionDialog(
                 "line", param, options, self.panel.parent(), add_initial_shape
             )
@@ -567,7 +567,7 @@ def compute_segment_profile(
         add_initial_shape = self.has_param_defaults(sigima.params.SegmentProfileParam)
         edit, param = self.init_param(param, sigima_image.SegmentProfileParam, title)
         if edit:
-            options = self.panel.plothandler.get_current_plot_options()
+            options = self.panel.plothandler.get_plot_options()
             dlg = ProfileExtractionDialog(
                 "segment", param, options, self.panel.parent(), add_initial_shape
             )
@@ -587,7 +587,7 @@ def compute_average_profile(
         add_initial_shape = self.has_param_defaults(sigima.params.AverageProfileParam)
         edit, param = self.init_param(param, sigima_image.AverageProfileParam, title)
         if edit:
-            options = self.panel.plothandler.get_current_plot_options()
+            options = self.panel.plothandler.get_plot_options()
             dlg = ProfileExtractionDialog(
                 "rectangle", param, options, self.panel.parent(), add_initial_shape
             )