Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md

Author: PierreRaybaut

CHANGELOG.md

@@ -1,17 +1,26 @@
 # Changelog #
 
-## Version 2.6.3 ##
+## Version 2.7.0 ##
 
 💥 New features / Enhancements:
 
 * Added `AnnotatedPolygon` annotation to items
 * Added `make.annotated_polygon` function to `plotpy.builder` module
 
+## Version 2.6.3 ##
+
 🛠️ Bug fixes:
 
+* PySide6 compatibility issues:
+  * Fixed deprecated call to `QMouseEvent` in `tests/unit/utils.py`
+  * Added workaround for `QPolygonF` shape point slicing
+* [Issue #21](https://github.com/PlotPyStack/PlotPy/issues/21) - PySide6 on Linux: segfault in test_colormap_editor.py
+* Fixed `sliderMoved` signal connection in `ColorMapEditor`
+* Fixed `AssertionError` in test_rect_zoom.py (Linux, Python 3.12, PyQt6)
 * Fixed typing issues in `plotpy.events` module:
   * Event objects were not properly typed (`QtCore.QEvent` instead of `QtGui.QMouseEvent`)
   * Event position arguments were not properly typed (`QtCore.QPoint` instead of `QtCore.QPointF`)
+* Fix NumPy `FutureWarning: Format strings passed to MaskedConstant are ignored [...]` when displaying masked pixel coordinates
 
 ## Version 2.6.2 ##
 

plotpy/__init__.py

@@ -20,7 +20,7 @@
 .. _GitHub: https://github.com/PierreRaybaut/plotpy
 """
 
-__version__ = "2.6.2"
+__version__ = "2.7.0"
 __VERSION__ = tuple([int(number) for number in __version__.split(".")])
 
 # --- Important note: DATAPATH and LOCALEPATH are used by guidata.configtools

plotpy/external/sliders/_generic_range_slider.py

@@ -27,20 +27,29 @@ class _GenericRangeSlider(_GenericSlider):
     integers.
     """
 
-    # Emitted when the slider value has changed, with the new slider values
-    _valuesChanged = Signal(tuple)
-
-    # Emitted when sliderDown is true and the slider moves
-    # This usually happens when the user is dragging the slider
-    # The value is the positions of *all* handles.
-    _slidersMoved = Signal(tuple)
+    # -- BEGIN -- Original implementation, causing segfault on Linux with PySide6
+    # https://github.com/PlotPyStack/PlotPy/issues/21
+    # _valuesChanged = Signal(tuple)
+    # _slidersMoved = Signal(tuple)
+    # -- END --
+
+    # -- BEGIN -- New implementation: avoid segfault by overriding the class attributes
+    # instead of overriding them through instance attributes in `__init__`
+    valueChanged = Signal(tuple)
+    sliderMoved = Signal(tuple)
+    # -- END --
 
     def __init__(self, *args, **kwargs):
         self._style = RangeSliderStyle()
 
         super().__init__(*args, **kwargs)
-        self.valueChanged = self._valuesChanged
-        self.sliderMoved = self._slidersMoved
+
+        # -- BEGIN -- Original implementation, causing segfault on Linux with PySide6
+        # https://github.com/PlotPyStack/PlotPy/issues/21
+        # self.valueChanged = self._valuesChanged
+        # self.sliderMoved = self._slidersMoved
+        # -- END --
+
         # list of values
         self._value: List[_T] = [20, 80]
 

plotpy/external/sliders/_generic_slider.py

@@ -19,6 +19,7 @@
 scalar (with one handle per item), and it forms the basis of
 QRangeSlider.
 """
+
 import os
 import platform
 from typing import TypeVar
@@ -59,9 +60,19 @@
 
 
 class _GenericSlider(QSlider):
-    _fvalueChanged = Signal(int)
-    _fsliderMoved = Signal(int)
-    _frangeChanged = Signal(int, int)
+    # -- BEGIN -- Original implementation, causing segfault on Linux with PySide6
+    # https://github.com/PlotPyStack/PlotPy/issues/21
+    # _fvalueChanged = Signal(int)
+    # _fsliderMoved = Signal(int)
+    # _frangeChanged = Signal(int, int)
+    # -- END --
+
+    # -- BEGIN -- New implementation: avoid segfault by overriding the class attributes
+    # instead of overriding them through instance attributes in `__init__`
+    valueChanged = Signal(int)
+    sliderMoved = Signal(int)
+    rangeChanged = Signal(int, int)
+    # -- END --
 
     MAX_DISPLAY = 5000
 
@@ -88,9 +99,13 @@ def __init__(self, *args, **kwargs) -> None:
         self._control_fraction = 0.04
 
         super().__init__(*args, **kwargs)
-        self.valueChanged = self._fvalueChanged
-        self.sliderMoved = self._fsliderMoved
-        self.rangeChanged = self._frangeChanged
+
+        # -- BEGIN -- Original implementation, causing segfault on Linux with PySide6
+        # https://github.com/PlotPyStack/PlotPy/issues/21
+        # self.valueChanged = self._fvalueChanged
+        # self.sliderMoved = self._fsliderMoved
+        # self.rangeChanged = self._frangeChanged
+        # -- END --
 
         self.setAttribute(Qt.WidgetAttribute.WA_Hover)
         self.setStyleSheet("")

plotpy/items/shape/polygon.py

@@ -302,8 +302,10 @@ def draw(
         painter.setBrush(brush)
         points = self.transform_points(xMap, yMap)
         if self.ADDITIONNAL_POINTS:
-            shape_points = points[: -self.ADDITIONNAL_POINTS]
-            other_points = points[-self.ADDITIONNAL_POINTS :]
+            # Slice indexing is not supported by PySide6, so we convert the `QPolygonF`
+            # object to a list before converting it back to a `QPolygonF` object:
+            shape_points = QG.QPolygonF(list(points)[: -self.ADDITIONNAL_POINTS])
+            other_points = QG.QPolygonF(list(points)[-self.ADDITIONNAL_POINTS :])
         else:
             shape_points = points
             other_points = []

plotpy/tests/unit/test_rect_zoom.py

@@ -53,7 +53,7 @@ def zoom(
 def test_rect_zoom_tool():
     """Test the rectangular zoom tool."""
     x_path = linspace(0, 0.5, 100)
-    y_path = linspace(0, 0.5, 100)
+    y_path = linspace(0, 0.4, 100)
     zoom(x_path, y_path, lambda og, final: final < og)
 
 

plotpy/tests/unit/utils.py

@@ -162,6 +162,7 @@ def mouse_event_at_relative_plot_pos(
         mouse_event = QG.QMouseEvent(
             type_,
             canvas_pos,
+            QC.QPointF(canvas.mapToGlobal(canvas_pos.toPoint())),
             btn,
             btn,
             mod,

plotpy/widgets/colormap/editor.py

@@ -155,7 +155,7 @@ def __init__(
         self.colormap_widget.HANDLE_ADDED.connect(self.new_tab)
         self.colormap_widget.HANDLE_DELETED.connect(self.delete_tab)
         self.colormap_widget.multi_range_hslider.sliderMoved.connect(
-            self.update_current_dataset
+            lambda *args: self.update_current_dataset()
         )
 
     def set_colormap(self, colormap: EditableColormap) -> None: