ROI menu: rename "Edit" to "Edit graphically", add "Edit numerically"

Author: PierreRaybaut

datalab/gui/actionhandler.py

@@ -631,13 +631,20 @@ def create_first_actions(self):
 
         with self.new_category(ActionCategory.ROI):
             self.new_action(
-                _("Edit") + "...",
-                triggered=self.panel.processor.edit_regions_of_interest,
+                _("Edit graphically") + "...",
+                triggered=self.panel.processor.edit_roi_graphically,
                 icon_name="roi.svg",
                 context_menu_pos=-1,
                 context_menu_sep=True,
                 toolbar_pos=-1,
                 toolbar_category=ActionCategory.VIEW_TOOLBAR,
+                tip=_("Edit regions of interest graphically"),
+            )
+            self.new_action(
+                _("Edit numerically") + "...",
+                triggered=self.panel.processor.edit_roi_numerically,
+                select_condition=SelectCond.exactly_one_with_roi,
+                tip=_("Edit regions of interest numerically"),
             )
             self.new_action(
                 _("Extract") + "...",

datalab/gui/processor/base.py

@@ -1321,7 +1321,7 @@ def compute_roi_extraction(self, roi: TypeROI | None = None) -> None:
         #   ROI Editor dialog anyway
         # * If multiple objs are selected, then apply the first obj ROI to all
         if roi is None or roi.is_empty():
-            roi = self.edit_regions_of_interest(mode="extract")
+            roi = self.edit_roi_graphically(mode="extract")
         if roi is None or roi.is_empty():
             return
         obj = self.panel.objview.get_sel_objects(include_groups=True)[0]
@@ -1346,7 +1346,7 @@ def _extract_multiple_roi_in_single_object(
 
     # ------Analysis-------------------------------------------------------------------
 
-    def edit_regions_of_interest(
+    def edit_roi_graphically(
         self, mode: Literal["apply", "extract", "define"] = "apply"
     ) -> TypeROI | None:
         """Define Region Of Interest (ROI).
@@ -1407,6 +1407,34 @@ def edit_regions_of_interest(
                 )
         return edited_roi
 
+    def edit_roi_numerically(self) -> TypeROI:
+        """Edit Regions Of Interest (ROIs) numerically.
+
+        Opens a dialog to edit the parameters of the selected ROIs.
+        If no ROIs are selected, it will prompt the user to select ROIs.
+
+        Returns:
+            The edited ROI object if the dialog is accepted, otherwise the original ROI.
+        """
+        obj = self.panel.objview.get_sel_objects()[0]
+        assert obj.roi is not None, _("No ROI selected for editing.")
+        params = obj.roi.to_params(obj)
+        group = gds.DataSetGroup(params, title=_("Regions of Interest"))
+        if group.edit(parent=self.panel.parent()):
+            edited_roi = obj.roi.__class__.from_params(
+                obj, params, singleobj=obj.roi.singleobj
+            )
+            obj.roi = edited_roi
+            self.SIG_ADD_SHAPE.emit(get_uuid(obj))
+            self.panel.refresh_plot(
+                "selected",
+                update_items=True,
+                only_visible=False,
+                only_existing=True,
+            )
+            return edited_roi
+        return obj.roi
+
     def delete_regions_of_interest(self) -> None:
         """Delete Regions Of Interest"""
         if (

datalab/gui/processor/image.py

@@ -712,7 +712,7 @@ def compute_erase(self, roi: ImageROI | None = None) -> None:
             roi: Region of interest to erase
         """
         if roi is None or roi.is_empty():
-            roi = self.edit_regions_of_interest(mode="define")
+            roi = self.edit_roi_graphically(mode="define")
         if roi is None or roi.is_empty():
             return
         obj = self.panel.objview.get_sel_objects(include_groups=True)[0]

datalab/locale/fr/LC_MESSAGES/datalab.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  datalab\n"
 "Report-Msgid-Bugs-To: p.raybaut@codra.fr\n"
-"POT-Creation-Date: 2025-08-03 17:48+0200\n"
+"POT-Creation-Date: 2025-08-07 17:06+0200\n"
 "PO-Revision-Date: 2025-05-22 15:46+0200\n"
 "Last-Translator: Christophe Debonnel <c.debonnel@codra.fr>\n"
 "Language: fr\n"
@@ -141,8 +141,21 @@ msgstr "Copier les titres dans le presse-papier"
 msgid "Copy titles of selected objects to clipboard"
 msgstr "Copier les titres des objets sélectionnés dans le presse-papier"
 
-msgid "Edit"
-msgstr "Modifier"
+#, fuzzy
+msgid "Edit graphically"
+msgstr "ROI graphique"
+
+#, fuzzy
+msgid "Edit regions of interest graphically"
+msgstr "Régions d'intérêt"
+
+#, fuzzy
+msgid "Edit numerically"
+msgstr "Symétrie verticale"
+
+#, fuzzy
+msgid "Edit regions of interest numerically"
+msgstr "Régions d'intérêt"
 
 msgid "Extract"
 msgstr "Extraire"
@@ -979,6 +992,9 @@ msgstr "Second opérande"
 msgid "Regions of Interest"
 msgstr "Régions d'intérêt"
 
+msgid "No ROI selected for editing."
+msgstr ""
+
 msgid "Sum"
 msgstr "Addition"
 

datalab/tests/features/image/contour_app_test.py

@@ -31,7 +31,7 @@ def test_contour_app():
             ima2 = create_test_image_with_roi(newparam)
             ima2.set_metadata_option("colormap", "gray")
             panel.add_object(ima2)
-            panel.processor.edit_regions_of_interest()
+            panel.processor.edit_roi_graphically()
             panel.processor.run_feature("contour_shape", param)
             if not execenv.unattended:
                 break

datalab/tests/features/image/roi_app_test.py

@@ -160,7 +160,7 @@ def test_image_roi_app(screenshots: bool = False):
             ima2_i = ima2.copy()
             panel.add_object(ima2_i)
             print_obj_data_dimensions(ima2_i)
-            panel.processor.edit_regions_of_interest()
+            panel.processor.edit_roi_graphically()
             if screenshots:
                 win.statusBar().hide()
                 win.take_screenshot("i_roi_image")
@@ -175,7 +175,7 @@ def test_image_roi_basic_app():
         param = NewImageParam.create(height=SIZE, width=SIZE)
         ima1 = create_multigaussian_image(param)
         panel.add_object(ima1)
-        panel.processor.edit_regions_of_interest()
+        panel.processor.edit_roi_graphically()
 
 
 if __name__ == "__main__":

datalab/tests/features/signal/roi_app_test.py

@@ -115,7 +115,7 @@ def test_signal_roi_app(screenshots: bool = False) -> None:
             sig2_i = sig2.copy()
             panel.add_object(sig2_i)
             print_obj_data_dimensions(sig2_i, indent=1)
-            panel.processor.edit_regions_of_interest()
+            panel.processor.edit_roi_graphically()
             if screenshots:
                 win.statusBar().hide()
                 win.take_screenshot("s_roi_signal")
@@ -129,7 +129,7 @@ def test_signal_roi_basic_app():
         panel = win.signalpanel
         sig1 = create_paracetamol_signal(SIZE)
         panel.add_object(sig1)
-        panel.processor.edit_regions_of_interest()
+        panel.processor.edit_roi_graphically()
 
 
 if __name__ == "__main__":

doc/features/image/menu_roi.rst

@@ -31,12 +31,14 @@ ROI are taken into account almost in all computing features in DataLab:
 
 The "ROI" menu allows you to:
 
-- "Edit" |roi|: open a dialog box to manage ROI associated with the selected image (add, remove, move, resize, etc.). The ROI definition dialog is exactly the same as ROI extraction (see below).
+- "Edit graphically" |edit_roi|: open a dialog box to manage ROI associated with the selected image (add, remove, move, resize, etc.). The ROI definition dialog is exactly the same as ROI extraction (see below).
 
 .. figure:: /images/shots/i_roi_editor.png
 
     An image with an ROI.
 
+- "Edit numerically": open a dialog box to edit the parameters of the selected ROIs numerically (i.e. using a simple form). This allows you to define or modify ROIs based on numerical values.
+
 - "Extract" |image_roi|: extract the defined ROI from the selected images. This will create a new image for each ROI (or a single image, if the "Extract all ROIs into a single image" option is selected in the dialog), with the same metadata as the original image, but with the data corresponding to the ROI only. The new images will be added to the current workspace.
 
 - "Copy" |roi_copy|: copy the defined ROI from the selected images to the clipboard. This allows you to paste the ROI into another image or use it in other operations.
@@ -53,7 +55,7 @@ The "ROI" menu allows you to:
 
     ROI extraction dialog: the ROI is defined by moving the position and adjusting the size of a rectangle shape.
 
-.. |roi| image:: ../../../datalab/data/icons/roi/roi.svg
+.. |edit_roi| image:: ../../../datalab/data/icons/roi/roi.svg
     :width: 24px
     :height: 24px
     :class: dark-light

doc/features/signal/menu_roi.rst

@@ -31,12 +31,14 @@ ROI are taken into account almost in all computing features in DataLab:
 
 The "ROI" menu allows you to:
 
-- "Edit" |roi|: open a dialog box to manage ROI associated with the selected signal (add, remove, move, resize, etc.). The ROI definition dialog is exactly the same as ROI extraction (see below): the ROI is defined by moving the position and adjusting the width of an horizontal range.
+- "Edit graphically" |edit_roi|: open a dialog box to manage ROI associated with the selected signal (add, remove, move, resize, etc.). The ROI definition dialog is exactly the same as ROI extraction (see below): the ROI is defined by moving the position and adjusting the width of an horizontal range.
 
 .. figure:: /images/shots/s_roi_editor.png
 
     A signal with an ROI.
 
+- "Edit numerically": open a dialog box to edit the parameters of the selected ROIs numerically (i.e. using a simple form). This allows you to define or modify ROIs based on numerical values.
+
 - "Extract" |signal_roi|: extract the defined ROI from the selected signals. This will create a new signal for each ROI (or a single signal, if the "Extract all ROIs into a single signal" option is selected in the dialog), with the same metadata as the original signal, but with the data corresponding to the ROI only. The new signals will be added to the current workspace.
 
 - "Copy" |roi_copy|: copy the defined ROI from the selected signals to the clipboard. This allows you to paste the ROI into another signal or use it in other operations.
@@ -53,7 +55,7 @@ The "ROI" menu allows you to:
 
     ROI extraction dialog: the ROI is defined by moving the position and adjusting the width of an horizontal range.
 
-.. |roi| image:: ../../../datalab/data/icons/roi/roi.svg
+.. |edit_roi| image:: ../../../datalab/data/icons/roi/roi.svg
     :width: 24px
     :height: 24px
     :class: dark-light

doc/locale/fr/LC_MESSAGES/features/image/menu_roi.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DataLab \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-03 18:05+0200\n"
+"POT-Creation-Date: 2025-08-07 17:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -55,15 +55,18 @@ msgstr "Les ROI sont stockées en tant que métadonnées et sont donc attachées
 msgid "The \"ROI\" menu allows you to:"
 msgstr "Le menu \"ROI\" vous permet de :"
 
-msgid "\"Edit\" |roi|: open a dialog box to manage ROI associated with the selected image (add, remove, move, resize, etc.). The ROI definition dialog is exactly the same as ROI extraction (see below)."
-msgstr "\"Modifier\" |roi| : ouvrir une boîte de dialogue pour gérer les ROI associées à l'image sélectionnée (ajouter, supprimer, déplacer, redimensionner, etc.). La boîte de dialogue de définition des ROI est exactement la même que celle de l'extraction des ROI (voir ci-dessous)."
+msgid "\"Edit graphically\" |edit_roi|: open a dialog box to manage ROI associated with the selected image (add, remove, move, resize, etc.). The ROI definition dialog is exactly the same as ROI extraction (see below)."
+msgstr "\"Édition graphique\" |edit_roi| : ouvrir une boîte de dialogue pour gérer les ROI associées à l'image sélectionnée (ajouter, supprimer, déplacer, redimensionner, etc.). La boîte de dialogue de définition des ROI est exactement la même que celle de l'extraction des ROI (voir ci-dessous)."
 
-msgid "roi"
+msgid "edit_roi"
 msgstr ""
 
 msgid "An image with an ROI."
 msgstr "Une image avec une ROI."
 
+msgid "\"Edit numerically\": open a dialog box to edit the parameters of the selected ROIs numerically (i.e. using a simple form). This allows you to define or modify ROIs based on numerical values."
+msgstr "\"Édition numérique\" : ouvrir une boîte de dialogue pour modifier les paramètres des ROI sélectionnées numériquement (c'est-à-dire à l'aide d'un formulaire simple). Cela vous permet de définir ou de modifier des ROI en fonction de valeurs numériques."
+
 msgid "\"Extract\" |image_roi|: extract the defined ROI from the selected images. This will create a new image for each ROI (or a single image, if the \"Extract all ROIs into a single image\" option is selected in the dialog), with the same metadata as the original image, but with the data corresponding to the ROI only. The new images will be added to the current workspace."
 msgstr "\"Extraire\" |image_roi| : extraire la ROI définie des images sélectionnées. Cela créera une nouvelle image pour chaque ROI (ou une seule image, si l'option \"Extraire toutes les ROIs dans une seule image\" est sélectionnée dans la boîte de dialogue), avec les mêmes métadonnées que l'image d'origine, mais avec les données correspondant uniquement à la ROI. Les nouvelles images seront ajoutées à l'espace de travail actuel."