small bug corrections on colormap selection

Author: vld-codra

plotpy/external/__init__.py

@@ -1,5 +1,3 @@
-
-
 from .sliders import (
     QDoubleRangeSlider,
     QDoubleSlider,
@@ -18,4 +16,4 @@
     "QLabeledRangeSlider",
     "QLabeledSlider",
     "QRangeSlider",
-]
+]

plotpy/items/image/base.py

@@ -480,18 +480,6 @@ def get_color_map_name(self) -> str | None:
             return None
         return self.cmap_table.name
 
-    def get_color_map_key_name(self) -> str | None:
-        """Same as get_color_map_name, but returns the colormap name in lowercase. This
-        is because the colormap string keys of the global colormap dictionaries are all
-        lowercase.
-
-        Returns:
-            Colormap name
-        """
-        if self.cmap_table is None:
-            return None
-        return self.cmap_table.name.lower()
-
     def set_interpolation(self, interp_mode: int, size: int | None = None) -> None:
         """Set interpolation mode
 

plotpy/mathutils/colormaps.py

@@ -111,12 +111,14 @@ def get_cmap(cmap_name: str) -> CustomQwtLinearColormap:
     If the colormap is not found, returns the DEFAULT colormap.
 
     Args:
-        cmap_name: colormap name to search in ALL_COLORMAPS
+        cmap_name: colormap name to search in ALL_COLORMAPS. All keys in ALL_COLORMAPS
+        are lower case, so the given name is also lowered.
 
     Returns:
-        A CustomQwtLinearColormap instance corresponding to the given name
+        A CustomQwtLinearColormap instance corresponding to the given name, if no
+        colormap is found, returns the DEFAULT colormap.
     """
-    return ALL_COLORMAPS.get(cmap_name, DEFAULT)
+    return ALL_COLORMAPS.get(cmap_name.lower(), DEFAULT)
 
 
 def get_cmap_path(config_path: str):

plotpy/tools/image.py

@@ -36,6 +36,7 @@
     DEFAULT_COLORMAPS,
     build_icon_from_cmap,
     build_icon_from_cmap_name,
+    get_cmap,
 )
 from plotpy.tools.base import (
     CommandTool,
@@ -530,12 +531,10 @@ def activate_cmap(
         if isinstance(cmap, QAction):
             self._active_colormap = cmap.data()  # type: ignore
         elif isinstance(cmap, str):
-            cmap = cmap.lower()
-            assert cmap in ALL_COLORMAPS
-            self._active_colormap = ALL_COLORMAPS[cmap]
+            self._active_colormap = get_cmap(cmap)
         elif isinstance(cmap, CustomQwtLinearColormap):
             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)
@@ -560,9 +559,7 @@ def update_status(self, plot: BasePlot):
                 cmap_name = item.get_color_map_name()
                 if cmap_name:
                     icon = build_icon_from_cmap_name(cmap_name)
-                    self._active_colormap = ALL_COLORMAPS.get(
-                        cmap_name.lower(), DEFAULT
-                    )
+                    self._active_colormap = get_cmap(cmap_name)
             else:
                 self.action.setEnabled(False)
                 self._active_colormap = ALL_COLORMAPS.get("jet", DEFAULT)