New colormap selection dialog

Author: PierreRaybaut

plotpy/images/cmap_edit.png

@@ -80,7 +80,7 @@ def save_colormaps(json_filename: str, colormaps: dict[str, CustomQwtLinearColor
 
 
 def build_icon_from_cmap(
-    cmap: CustomQwtLinearColormap, width: int = 24, height: int = 24
+    cmap: CustomQwtLinearColormap, width: int = 16, height: int = 16
 ) -> QG.QIcon:
     """Builds an icon representing the colormap
 

plotpy/locale/fr/LC_MESSAGES/plotpy.mo

@@ -16,7 +16,6 @@
 
 import qtpy.QtCore as QC
 import qtpy.QtGui as QG
-import qtpy.QtWidgets as QW
 from guidata.qthelpers import qt_app_context
 
 from plotpy.widgets.colormap_editor import ColorMapEditor

plotpy/locale/fr/LC_MESSAGES/plotpy.po

@@ -13,6 +13,7 @@
 
 import qtpy.QtCore as QC
 import qtpy.QtGui as QG
+from guidata.env import execenv
 from guidata.qthelpers import qt_app_context
 
 from plotpy.mathutils.colormaps import ALL_COLORMAPS
@@ -22,18 +23,21 @@
 
 def test_colormap_manager() -> None:
     """Test the colormap manager widget."""
-    with qt_app_context(exec_loop=True):
+    with qt_app_context():
         red = QG.QColor(QC.Qt.GlobalColor.red)
         blue = QG.QColor(QC.Qt.GlobalColor.blue)
         yellow = QG.QColor(QC.Qt.GlobalColor.yellow)
         cmap = CustomQwtLinearColormap(blue, yellow, name="kinda_viridis")
         ALL_COLORMAPS["kinda_viridis"] = cmap
-        editor = ColorMapManager(None, active_colormap="YlGn")
-        editor.colormap_editor.colormap_widget.add_handle_at_relative_pos(0.5, red)
-        editor.get_colormap()
-        editor.colormap_editor.update_colormap_widget()
-        editor.colormap_editor.update_current_dataset()
-        editor.show()
+        dlg = ColorMapManager(None, active_colormap="YlGn")
+        dlg.colormap_editor.colormap_widget.add_handle_at_relative_pos(0.5, red)
+        dlg.get_colormap()
+        dlg.colormap_editor.update_colormap_widget()
+        dlg.colormap_editor.update_current_dataset()
+        result = dlg.exec()
+        execenv.print("Dialog result:", result)
+        cmap = dlg.get_colormap()
+        execenv.print("Selected colormap:", cmap.name)
 
 
 if __name__ == "__main__":

plotpy/locale/plotpy.pot

@@ -134,9 +134,9 @@ def test_colormap_tool(qtbot):
 
     # change the colormap
     plot.select_item(item)
-    action = color_map_tool.menu.actions()[0]
-    color_map_tool.activate_cmap(action)
-    assert item.get_color_map_name() == "Accent"
+    cmap_name = "Accent"
+    color_map_tool.activate_cmap(cmap_name)
+    assert item.get_color_map_name() == cmap_name
     accent_img = plot.grab().toImage()
     assert jet_img != accent_img
 

plotpy/mathutils/colormaps.py

@@ -8,7 +8,7 @@
 
 from guidata.configtools import get_icon
 from guidata.dataset import BoolItem, DataSet, FloatItem
-from guidata.qthelpers import add_actions
+from guidata.qthelpers import add_actions, exec_dialog
 from guidata.widgets.arrayeditor import ArrayEditor
 from qtpy import QtCore as QC
 from qtpy import QtWidgets as QW
@@ -51,7 +51,7 @@
 )
 from plotpy.tools.misc import OpenFileTool
 from plotpy.tools.shape import CircleTool, RectangleTool, RectangularShapeTool
-from plotpy.widgets.colormap_manager import ColorMapManagerDialog
+from plotpy.widgets.colormap_manager import ColorMapManager
 from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
 from plotpy.widgets.imagefile import exec_image_save_dialog
 
@@ -463,73 +463,24 @@ def __init__(
             self.action.setIconText("")
             self.action.setIcon(self.default_icon)
 
-    def create_action_menu(self, manager: PlotManager) -> QW.QMenu:
-        """Create and return menu for the tool's action with all the colormaps and
-        colormap editor available
+    def activate_command(self, plot: BasePlot, checked: bool) -> None:
+        """Triggers tool action.
 
         Args:
-            manager: PlotManager instance
-        """
-        menu = QW.QMenu()
-
-        default_cmaps_action_group = QActionGroup(menu)
-        for cmap in DEFAULT_COLORMAPS.values():
-            icon = build_icon_from_cmap(cmap)
-            action = menu.addAction(icon, cmap.name)
-            action.setEnabled(True)  # type: ignore
-            action.setData(cmap)  # type: ignore
-            action = default_cmaps_action_group.addAction(action)
-        default_cmaps_action_group.triggered.connect(self.activate_cmap)
-
-        menu.addSeparator()
-
-        custom_cmaps_action_group = QActionGroup(menu)
-        for cmap in CUSTOM_COLORMAPS.values():
-            icon = build_icon_from_cmap(cmap)
-            action = menu.addAction(icon, cmap.name)
-            custom_cmaps_action_group.addAction(action)
-            action.setEnabled(True)  # type: ignore
-            action.setData(cmap)  # type: ignore
-        custom_cmaps_action_group.triggered.connect(self.activate_cmap)
-
-        menu.addSeparator()
-
-        action = menu.addAction(_("Edit..."))
-        action.setEnabled(True)  # type: ignore
-        action.setIcon(get_icon("edit.png"))  # type: ignore
-        action.triggered.connect(self.open_cmap_manager)  # type: ignore
-
-        return menu
-
-    def open_cmap_manager(self) -> None:
-        """Opens the colormap manager in a new dialog. The chosen colormap will be
-        applied to the active image when the manager is closed.
+            plot: Plot instance
+            checked: True if tool is checked, False otherwise
         """
-        plot = self.get_active_plot()
         if (
             plot is None
             or not isinstance(self.action, QC.QObject)
             or not isinstance(self.action.text(), str)
         ):
             return
-        manager = ColorMapManagerDialog(
+        manager = ColorMapManager(
             plot.parent(), active_colormap=self._active_colormap.name
         )
-        manager.exec_()
-
-        self._active_colormap = manager.get_colormap()
-        self.menu = self.create_action_menu(plot.manager)
-        self.action.setMenu(self.menu)
-        self.activate_cmap()
-
-    def activate_command(self, plot: BasePlot, checked: bool) -> None:
-        """Triggers tool action.
-
-        Args:
-            plot: Plot instance
-            checked: True if tool is checked, False otherwise
-        """
-        pass
+        if exec_dialog(manager):
+            self.activate_cmap(manager.get_colormap())
 
     def get_selected_images(self, plot: BasePlot) -> list[IBasePlotItem]:
         """Returns the currently selected images in the given plot.
@@ -547,30 +498,24 @@ def get_selected_images(self, plot: BasePlot) -> list[IBasePlotItem]:
                 items = [active_image]
         return items
 
-    def activate_cmap(
-        self, cmap: QAction | str | CustomQwtLinearColormap | None = None
-    ) -> None:
+    def activate_cmap(self, cmap: str | CustomQwtLinearColormap) -> None:
         """Activate the given colormap. Supports mutliple input types.
 
         Args:
-            cmap: Cmap to apply for currently selected images. If None, the tool's
-            active colormap will be used. Defaults to None.
+            cmap: Cmap to apply for currently selected images.
         """
-        assert isinstance(cmap, (QAction, str, CustomQwtLinearColormap)) or cmap is None
-        if isinstance(cmap, QAction):
-            self._active_colormap = cmap.data()  # type: ignore
-        elif isinstance(cmap, str):
+        assert isinstance(cmap, (str, CustomQwtLinearColormap))
+        if isinstance(cmap, str):
             self._active_colormap = get_cmap(cmap)
-        elif isinstance(cmap, CustomQwtLinearColormap):
+        else:
             self._active_colormap = cmap
-
         plot = self.get_active_plot()
         if self._active_colormap is not None and plot is not None:
             items = self.get_selected_images(plot)
             for item in items:
                 item.param.colormap = self._active_colormap.name
                 item.param.update_item(item)
-            self.action.setText(self._active_colormap.name)
+            self.action.setText(_("Colormap: %s") % self._active_colormap.name)
             plot.invalidate()
             self.update_status(plot)
 

plotpy/tests/features/test_colormap_editor.py

@@ -3,7 +3,8 @@
 # Licensed under the terms of the BSD 3-Clause
 # (see plotpy/LICENSE for details)
 
-"""This module provides a more complete colormap editor widget than the one provided
+"""
+This module provides a more complete colormap editor widget than the one provided
 by ColorMapWidget (plotpy/widgets/colormap_widget.py). It allows to edit a colormap
 by changing its color stops (add/delete/move/change color).
 """