Merge remote-tracking branch 'Codra/develop' into develop

# Conflicts:
#	plotpy/items/curve/base.py
#	plotpy/tests/tools/test_downsample_curve.py
#	plotpy/tools/curve.py

Author: PierreRaybaut

plotpy/items/curve/base.py

@@ -360,7 +360,7 @@ def get_data(self) -> tuple[np.ndarray, np.ndarray]:
         assert isinstance(self._x, np.ndarray) and isinstance(self._y, np.ndarray)
         return self._x, self._y
 
-    def update_data(self):
+    def update_data(self) -> None:
         """Update curve data with current arrays."""
         if isinstance(self._x, np.ndarray) and isinstance(self._y, np.ndarray):
             self._setData(self._x, self._y)
@@ -378,7 +378,7 @@ def dsamp(self, data: np.ndarray) -> np.ndarray:
             return data[:: self.param.dsamp_factor]
         return data
 
-    def _setData(self, x: np.ndarray, y: np.ndarray):
+    def _setData(self, x: np.ndarray, y: np.ndarray) -> None:
         """Wrapper around QwtPlotCurve.setData() to handle downsampling"""
         return super().setData(self.dsamp(x), self.dsamp(y))
 

plotpy/mathutils/colormaps.py

@@ -6,7 +6,7 @@
 #
 # Licensed under the terms of the BSD 3-Clause
 # (see plotpy/LICENSE for details)
-
+from __future__ import annotations
 
 import json
 import os

plotpy/styles/curve.py

@@ -49,7 +49,7 @@ class CurveParam(DataSet):
         "display", active=_use_dsamp_prop
     )
 
-    def update_param(self, curve: CurveItem | PolygonMapItem):
+    def update_param(self, curve: CurveItem | PolygonMapItem) -> None:
         """Updates the parameters using values from a given CurveItem/PolygonMapItem
 
         Args:
@@ -61,7 +61,7 @@ def update_param(self, curve: CurveItem | PolygonMapItem):
         self.curvestyle = CURVESTYLE_NAME[curve.style()]
         self.baseline = curve.baseline()
 
-    def update_item(self, curve: CurveItem | PolygonMapItem):
+    def update_item(self, curve: CurveItem | PolygonMapItem) -> None:
         """Updates a given CurveItem/PolygonMapItem using the current parameters
 
         Args:

plotpy/styles/image.py

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import annotations
+
+from typing import Callable
 
 import numpy as np
 from guidata.dataset import (
@@ -23,9 +26,9 @@
 from plotpy.styles.base import ItemParameters
 
 
-def _create_choices():
-    choices = []
-    for cmap_name in ALL_COLORMAPS.keys():
+def _create_choices() -> list[tuple[str, str, Callable[[str], QG.QIcon]]]:
+    choices: list[tuple[str, str, Callable[[str], QG.QIcon]]] = []
+    for cmap_name in ALL_COLORMAPS:
         choices.append((cmap_name, cmap_name, build_icon_from_cmap_name))
     return choices
 

plotpy/tests/features/test_colormap_editor.py

@@ -17,66 +17,70 @@
 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
 from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
 
-if __name__ == "__main__":
-    print("Initialization of a default colormap editor widget")
-    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_()
 
-    cmap_tuples = editor.get_colormap().to_tuples()
-    print(
-        "Initialization of a new colormap editor with the previous colormap: ",
-        cmap_tuples,
-    )
-    new_cmap = CustomQwtLinearColormap.from_iterable(cmap_tuples)
-    print(f"{new_cmap.to_tuples()}")
-    editor = ColorMapEditor(None, colormap=new_cmap)
-    editor.show()
-    app.exec_()
+def test_colormap_manager() -> None:
+    """Test the colormap editor widget and the CustomQwtLinearColormap class
+    by using multiple methods to initialize and export the colormap.
+    """
+    with qt_app_context(exec_loop=True):
+        print("Initialization of a default colormap editor widget")
+        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()
+
+        cmap_tuples = editor.get_colormap().to_tuples()
+        print(
+            "Initialization of a new colormap editor with the previous colormap: ",
+            cmap_tuples,
+        )
+        new_cmap = CustomQwtLinearColormap.from_iterable(cmap_tuples)
+        print(f"{new_cmap.to_tuples()}")
+        editor = ColorMapEditor(None, colormap=new_cmap)
+        editor.show()
+
+        cmap_tuples = editor.get_colormap().to_tuples()
+        print(
+            "Initialization of a new default colormap editor, "
+            "modified post-initialization with the previous colormap: ",
+            cmap_tuples,
+        )
+        new_cmap = CustomQwtLinearColormap.from_iterable(cmap_tuples)
+        editor = ColorMapEditor(None)
+        editor.set_colormap(new_cmap)
+        editor.show()
 
-    cmap_tuples = editor.get_colormap().to_tuples()
-    print(
-        "Initialization of a new default colormap editor, "
-        "modified post-initialization with the previous colormap: ",
-        cmap_tuples,
-    )
-    new_cmap = CustomQwtLinearColormap.from_iterable(cmap_tuples)
-    editor = ColorMapEditor(None)
-    editor.set_colormap(new_cmap)
-    editor.show()
-    app.exec_()
+        cmap_tuples = editor.get_colormap().to_tuples()
+        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: ",
+            cmap_tuples,
+        )
+        new_cmap = CustomQwtLinearColormap.from_iterable(cmap_tuples)
+        editor = ColorMapEditor(None)
+        editor.set_colormap(new_cmap)
+        editor.show()
 
-    cmap_tuples = editor.get_colormap().to_tuples()
-    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: ",
-        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,
+        )
 
-    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()
 
-    editor = ColorMapEditor(None)
-    editor.set_colormap(new_cmap)
-    editor.colormap_widget.edit_color_stop(1, None, green)
-    editor.show()
-    app.exec_()
+
+if __name__ == "__main__":
+    test_colormap_manager()

plotpy/tests/features/test_colormap_manager.py

@@ -19,9 +19,10 @@
 from plotpy.widgets.colormap_manager import ColorMapManager
 from plotpy.widgets.colormap_widget import CustomQwtLinearColormap
 
-if __name__ == "__main__":
+
+def test_colormap_manager() -> None:
+    """Test the colormap manager widget."""
     with qt_app_context(exec_loop=True):
-        # app = QW.QApplication([])
         red = QG.QColor(QC.Qt.GlobalColor.red)
         blue = QG.QColor(QC.Qt.GlobalColor.blue)
         yellow = QG.QColor(QC.Qt.GlobalColor.yellow)
@@ -33,4 +34,7 @@
         editor.colormap_editor.update_colormap_widget()
         editor.colormap_editor.update_current_dataset()
         editor.show()
-    # app.exec_()
+
+
+if __name__ == "__main__":
+    test_colormap_manager()

plotpy/tools/base.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import annotations
 
 import weakref
 from typing import Any, TypeVar

plotpy/tools/curve.py

@@ -53,7 +53,7 @@ class CurveStatsTool(BaseCursorTool):
 
     def __init__(
         self, manager, toolbar_id=DefaultToolbarID, title=None, icon=None, tip=None
-    ):
+    ) -> None:
         super().__init__(manager, toolbar_id, title=title, icon=icon, tip=tip)
         self._last_item = None
         self.label = None
@@ -319,7 +319,23 @@ def get_coordinates(self) -> tuple[float, float] | None:
 
 
 class SelectPointsTool(InteractiveTool):
-    """Curve points selection tool"""
+    """Curve points selection tool
+
+    Args:
+        manager: PlotManager Instance
+        mode: Selection mode. Defaults to "reuse".
+        on_active_item: Wether to use the active item or not. Defaults to False.
+        title: Tool name. Defaults to None.
+        icon: Tool icon path. Defaults to None.
+        tip: Available tip. Defaults to None.
+        end_callback: Callback function taking a Self instance as argument that will
+        be passed when the user stops dragging the point. Defaults to None.
+        toolbar_id: Toolbar Id to use. Defaults to DefaultToolbarID.
+        marker_style: Marker style. Defaults to None.
+        switch_to_default_tool: Wether to use as the default tool or not.
+         Defaults to None.
+        max_select: Maximum number of points to select. Defaults to None.
+    """
 
     TITLE = _("Multi-point selection")
     ICON = "multipoint_selection.png"
@@ -340,7 +356,7 @@ def __init__(
         marker_style=None,
         switch_to_default_tool=None,
         max_select: int | None = None,
-    ):
+    ) -> None:
         super().__init__(
             manager,
             toolbar_id,