Colormaps: small/large icons are now both horizontal

Author: PierreRaybaut

plotpy/mathutils/colormaps.py

@@ -48,8 +48,8 @@
 from plotpy.widgets.colormap.widget import EditableColormap
 
 FULLRANGE = QwtInterval(0.0, 1.0)
-SQUARE_ICON_SIZE = 16
-RECT_ICON_SIZE_W, RECT_ICON_SIZE_H = 80, 16
+SMALL_ICON_WIDTH, SMALL_ICON_HEIGHT, SMALL_ICON_ORIENTATION = 16, 7, "h"
+LARGE_ICON_WIDTH, LARGE_ICON_HEIGHT, LARGE_ICON_ORIENTATION = 80, 16, "h"
 
 CmapDictType = Dict[str, EditableColormap]
 
@@ -167,9 +167,9 @@ def save_colormaps(json_filename: str, colormaps: CmapDictType):
 
 def build_icon_from_cmap(
     cmap: EditableColormap,
-    width: int = SQUARE_ICON_SIZE,
-    height: int = SQUARE_ICON_SIZE,
-    orientation: Literal["h", "v"] = "v",
+    width: int = SMALL_ICON_WIDTH,
+    height: int = SMALL_ICON_HEIGHT,
+    orientation: Literal["h", "v"] = SMALL_ICON_ORIENTATION,
     margin: int = 0,
 ) -> QG.QIcon:
     """Builds an icon representing the colormap
@@ -220,9 +220,9 @@ def build_icon_from_cmap(
 
 def build_icon_from_cmap_name(
     cmap_name: str,
-    width: int = SQUARE_ICON_SIZE,
-    height: int = SQUARE_ICON_SIZE,
-    orientation: Literal["h", "v"] = "v",
+    width: int = SMALL_ICON_WIDTH,
+    height: int = SMALL_ICON_HEIGHT,
+    orientation: Literal["h", "v"] = SMALL_ICON_ORIENTATION,
     margin: int = 0,
 ) -> QG.QIcon:
     """Builds an QIcon representing the colormap from the colormap name found in

plotpy/styles/image.py

@@ -25,8 +25,9 @@
 from plotpy.constants import LUTAlpha
 from plotpy.mathutils.colormaps import (
     ALL_COLORMAPS,
-    RECT_ICON_SIZE_H,
-    RECT_ICON_SIZE_W,
+    LARGE_ICON_HEIGHT,
+    LARGE_ICON_ORIENTATION,
+    LARGE_ICON_WIDTH,
     build_icon_from_cmap_name,
 )
 from plotpy.styles.base import ItemParameters
@@ -46,7 +47,11 @@ def _create_choices(
                 cmap.name,
                 cmap.name,
                 lambda name: build_icon_from_cmap_name(
-                    name, RECT_ICON_SIZE_W, RECT_ICON_SIZE_H, "h", 1
+                    name,
+                    LARGE_ICON_WIDTH,
+                    LARGE_ICON_HEIGHT,
+                    LARGE_ICON_ORIENTATION,
+                    1,
                 ),
             )
         )
@@ -75,7 +80,7 @@ class BaseImageParam(DataSet):
     colormap = (
         ImageChoiceItem(_("Colormap"), _create_choices, default="jet")
         .set_prop("display", hide=GetAttrProp("_hide_colormap"))
-        .set_prop("display", size=(RECT_ICON_SIZE_W, RECT_ICON_SIZE_H))
+        .set_prop("display", size=(LARGE_ICON_WIDTH, LARGE_ICON_HEIGHT))
     )
 
     interpolation = ChoiceItem(

plotpy/widgets/colormap/manager.py

@@ -35,8 +35,9 @@
     ALL_COLORMAPS,
     CUSTOM_COLORMAPS,
     DEFAULT_COLORMAPS,
-    RECT_ICON_SIZE_H,
-    RECT_ICON_SIZE_W,
+    LARGE_ICON_HEIGHT,
+    LARGE_ICON_ORIENTATION,
+    LARGE_ICON_WIDTH,
     add_cmap,
     build_icon_from_cmap,
     cmap_exists,
@@ -134,11 +135,11 @@ def __init__(
         self._cmap_choice.setMaxVisibleItems(15)
         for cmap in ALL_COLORMAPS.values():
             icon = build_icon_from_cmap(
-                cmap, RECT_ICON_SIZE_W, RECT_ICON_SIZE_H, "h", 1
+                cmap, LARGE_ICON_WIDTH, LARGE_ICON_HEIGHT, LARGE_ICON_ORIENTATION, 1
             )
             self._cmap_choice.addItem(icon, cmap.name, cmap)
 
-        self._cmap_choice.setIconSize(QC.QSize(RECT_ICON_SIZE_W, RECT_ICON_SIZE_H))
+        self._cmap_choice.setIconSize(QC.QSize(LARGE_ICON_WIDTH, LARGE_ICON_HEIGHT))
         self._cmap_choice.setCurrentText(active_colormap)
         select_gbox = QW.QGroupBox(_("Select or create a colormap"))
         select_label = QW.QLabel(_("Colormap presets:"))