improved testing and small optimizations and bug corrections

Author: vld-codra

plotpy/tests/features/test_colormap_editor.py

@@ -17,6 +17,7 @@
 import qtpy.QtCore as QC
 import qtpy.QtGui as QG
 import qtpy.QtWidgets as QW
+from guidata.env import execenv
 
 from plotpy.widgets.colormap_editor import ColorMapEditor
 from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
@@ -26,6 +27,7 @@
     app = QW.QApplication([])
     editor = ColorMapEditor(None)
     red = QG.QColor(QC.Qt.GlobalColor.red)
+    green = QG.QColor(QC.Qt.GlobalColor.green)
     editor.colormap_widget.add_handle_at_relative_pos(0.5, red)
     editor.show()
     app.exec_()
@@ -57,11 +59,25 @@
     cmap_tuples = tuple((int(val * 255 + 1), color) for val, color in cmap_tuples)
     print(
         "Initialization of a new default colormap editor, "
-        "modified post-initialization with the previous colormap with stops scaled by * 255 + 1: ",
+        "modified post-initialization with the previous colormap with stops scaled by "
+        "255 + 1: ",
         cmap_tuples,
     )
     new_cmap = CustomQwtLinearColormap.from_iterable(cmap_tuples)
     editor = ColorMapEditor(None)
     editor.set_colormap(new_cmap)
     editor.show()
     app.exec_()
+
+    print(
+        "Initialization of a new default colormap editor, "
+        "modified post-initialization with the previous colormap where the red stop is "
+        "replaced with a green stop: ",
+        cmap_tuples,
+    )
+
+    editor = ColorMapEditor(None)
+    editor.set_colormap(new_cmap)
+    editor.colormap_widget.edit_color_stop(1, None, green)
+    editor.show()
+    app.exec_()

plotpy/widgets/colormap_editor.py

@@ -269,8 +269,6 @@ def update_colormap_widget(self):
 
         if current_index > 0 and current_index < self.tabs.count() - 1:
             relative_pos = current_dataset.get_position()
-            new_slider_values[current_index] = relative_pos
-            self.colormap_widget.set_handles_values(new_slider_values)
         else:
             relative_pos = new_slider_values[current_index]
             current_dataset.set_position(relative_pos)

plotpy/widgets/colormap_manager.py

@@ -47,7 +47,7 @@ def __init__(
 
         if active_colormap is None or active_colormap.lower() not in ALL_COLORMAPS:
             active_colormap = next(iter(ALL_COLORMAPS))
-        active_colormap = active_colormap.lower()
+        # active_colormap = active_colormap.lower()
         self._cmap_choice = QW.QComboBox(
             self,
         )
@@ -231,9 +231,7 @@ class ColorMapManagerDialog(QW.QDialog):
         exists, will defaults to the first colormap in the list. Defaults to None
     """
 
-    def __init__(
-        self, parent: QWidget | None, active_colormap: str = "viridis"
-    ) -> None:
+    def __init__(self, parent: QWidget | None, active_colormap: str = "jet") -> None:
         super().__init__(parent)
         self.setWindowIcon(get_icon("edit.png"))
         self.setWindowTitle(_("Colormap manager"))

plotpy/widgets/colormap_widget.py

@@ -401,7 +401,7 @@ def edit_color_stop(
         new_color: QG.QColor | int | None = None,
     ):
         """Edit an existing color stop in the current colormap. Mutates the colormap
-        object.
+        object. Also edits the slider handle position.
 
         Args:
             index: color stop index to mutate
@@ -416,6 +416,7 @@ def edit_color_stop(
             new_color = QG.QColor(self.colortable[new_color])
 
         self._colormap.move_color_stop(index, new_pos, new_color)
+        self.set_handles_values(self._colormap.colorStops())
         self.COLORMAP_CHANGED.emit()
 
     def _edit_color_map_on_slider_change(self, raw_values: tuple[float, ...]):
@@ -460,7 +461,7 @@ def _get_neighbour_positions(self, pos: float) -> tuple[float, float]:
         """
         values = self.get_handles_tuple()
         previous_pos = max(
-            filter(lambda val: val < pos, values[::-1]), default=self.min
+            filter(lambda val: val <= pos, values[::-1]), default=self.min
         )
         next_pos = min(filter(lambda val: val > pos, values), default=self.max)
 
@@ -558,7 +559,9 @@ def add_handle_at_relative_pos(
         self, relative_pos: float, new_color: QG.QColor | int | None = None
     ):
         """insert a handle in the widget at the relative position (between 0. and 1.).
-        Mutates the colormap object.
+        Mutates the colormap object. If the relative position is already occupied by a
+        handle, the new handle will be inserted at the closest available position then
+        will be moved back to the requested position.
 
         Args:
             relative_pos: insertion position
@@ -567,15 +570,16 @@ def add_handle_at_relative_pos(
         if new_color is None:
             new_color = self._colormap.color(self.qwt_color_interval, relative_pos)
 
-        self._colormap.addColorStop(relative_pos, new_color)
+        new_relative_pos = self._new_available_pos(relative_pos)
+        self._colormap.addColorStop(new_relative_pos, new_color)
 
         values = self.get_handles_list()
-        values.append(relative_pos)
+        values.append(new_relative_pos)
         values.sort()
-        self.set_handles_values(values)
+        new_value_index = values.index(new_relative_pos)
 
-        self.COLORMAP_CHANGED.emit()
-        self.HANDLE_ADDED.emit(values.index(relative_pos), relative_pos)
+        self.edit_color_stop(new_value_index, relative_pos, None)
+        self.HANDLE_ADDED.emit(new_value_index, relative_pos)
 
     def get_handles_count(self) -> int:
         """Number of slider handles.