Merge branch 'develop'

Author: ThomasMalletCodra

doc/release_notes/release_2.11.md

@@ -0,0 +1,12 @@
+# Version 2.11 #
+
+## PlotPy Version 2.11.0 ##
+
+✨ New features:
+* **Enhance contour builder with style parameters** — Add color, linestyle and linewidth parameters to ContourLine item class
+
+🛠️ Bug fixes:
+
+* **Image cross sections** — Restored live cross-section updates when using `Alt+Mousemove` over an image. This regression had been introduced in v2.1.0: the X/Y cross-section panels no longer received marker-change updates because method resolution order was shadowing the mixin hook that connects `SIG_MARKER_CHANGED` (closes [Issue #68](https://github.com/PlotPyStack/PlotPy/issues/68))
+
+* **Empty Label ledend box crash prevent** — When plot items list is empty, LegendBoxItem could crashes while clicking on it. Fix and tests added

plotpy/__init__.py

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

plotpy/builder/image.py

@@ -826,6 +826,9 @@ def contours(
         levels: float | np.ndarray,
         X: np.ndarray | None = None,
         Y: np.ndarray | None = None,
+        color: str | None = None,
+        linestyle: str | None = None,
+        linewidth: float | None = None,
     ) -> list[ContourItem]:
         """Make a contour curves
 
@@ -845,11 +848,24 @@ def contours(
              ``numpy.meshgrid``), or it must both be 1-D such that ``len(Y) == N``
              is the number of rows in *Z*.
              If none, they are assumed to be integer indices, i.e. ``Y = range(N)``.
+            color: contour color name. Default is None
+            linestyle: contour line style (MATLAB-like string or "SolidLine",
+             "DashLine", "DotLine", "DashDotLine", "DashDotDotLine", "NoPen").
+             Default is None
+            linewidth: contour line width (pixels). Default is None
 
         Returns:
             list of :py:class:`.ContourItem` objects
         """
-        return create_contour_items(Z, levels, X, Y)
+        return create_contour_items(
+            Z,
+            levels,
+            X,
+            Y,
+            color=color,
+            linestyle=linestyle,
+            linewidth=linewidth,
+        )
 
     def histogram2D(
         self,

plotpy/items/contour.py

@@ -29,7 +29,7 @@
 
 from plotpy.config import _
 from plotpy.items.shape.polygon import PolygonShape
-from plotpy.styles import ShapeParam
+from plotpy.styles import COLORS, ShapeParam
 
 
 class ContourLine(gds.DataSet):
@@ -123,6 +123,9 @@ def create_contour_items(
     levels: float | np.ndarray,
     X: np.ndarray | None = None,
     Y: np.ndarray | None = None,
+    color: str | None = None,
+    linestyle: str | None = None,
+    linewidth: float | None = None,
 ) -> list[ContourItem]:
     """Create contour items
 
@@ -142,6 +145,11 @@ def create_contour_items(
          ``numpy.meshgrid``), or it must both be 1-D such that ``len(Y) == N``
          is the number of rows in *Z*.
          If none, they are assumed to be integer indices, i.e. ``Y = range(N)``.
+        color: contour color name. Default is None
+        linestyle: contour line style (MATLAB-like string or "SolidLine",
+         "DashLine", "DotLine", "DashDotLine", "DashDotDotLine", "NoPen").
+         Default is None
+        linewidth: contour line width (pixels). Default is None
 
     Returns:
         A list of :py:class:`.ContourItem` instances.
@@ -153,6 +161,14 @@ def create_contour_items(
         param = ShapeParam("Contour", icon="contour.png")
         item = ContourItem(points=cline.vertices, shapeparam=param)
         item.set_style("plot", "shape/contour")
+        if color is not None:
+            item.shapeparam.line.color = COLORS.get(color, color)
+        if linestyle is not None:
+            item.shapeparam.line.set_style_from_matlab(linestyle)
+        if linewidth is not None:
+            item.shapeparam.line.width = linewidth
+        if color is not None or linestyle is not None or linewidth is not None:
+            item.shapeparam.update_item(item)
         item.setTitle(_("Contour") + f"[Z={cline.level}]")
         items.append(item)
     return items

plotpy/items/label.py

@@ -828,7 +828,7 @@ def click_inside(self, locx: float, locy: float) -> tuple[float, float, bool, ty
                 for item in self.plot().get_items()
                 if self.include_item(item) and isinstance(item, CurveItem)
             ]
-            if line < len(items):
+            if 0 <= line < len(items):
                 return 1000.0, None, False, items[line]
         return 2.0, 1, True, None
 

plotpy/tests/items/test_contours.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the BSD 3-Clause
+# (see plotpy/LICENSE for details)
+
+"""Contour builder test"""
+
+# guitest: show
+
+import numpy as np
+from guidata.qthelpers import qt_app_context
+
+from plotpy.builder import make
+from plotpy.items import ContourItem
+from plotpy.tests import vistools as ptv
+
+
+def create_two_gaussians() -> np.ndarray:
+    """Create two nearby 2D Gaussians with different shapes."""
+    axis = np.linspace(-5.0, 5.0, 300)
+    x, y = np.meshgrid(axis, axis)
+    wide = np.exp(-((x + 0.9) ** 2 + (y + 0.2) ** 2) / (2.0 * 1.2**2))
+    narrow = 0.65 * np.exp(-((x - 1.0) ** 2 + (y - 0.4) ** 2) / (2.0 * 0.6**2))
+    return wide + narrow
+
+
+def test_contours():
+    """Contour plotting on two nearby 2D Gaussians"""
+    with qt_app_context(exec_loop=True):
+        image = create_two_gaussians()
+        contour_items = make.contours(
+            image,
+            np.linspace(0.2, 1.0, 5),
+            color="y",
+            linestyle=":",
+            linewidth=2.0,
+        )
+
+        assert contour_items
+        assert all(isinstance(item, ContourItem) for item in contour_items)
+
+        _win = ptv.show_items(
+            [make.image(image, colormap="cool")] + contour_items,
+            wintitle=test_contours.__doc__,
+            curve_antialiasing=False,
+            lock_aspect_ratio=True,
+        )
+
+
+if __name__ == "__main__":
+    test_contours()

plotpy/tests/items/test_label.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+
+"""Label and legend item tests."""
+
+import numpy as np
+from guidata.qthelpers import qt_app_context
+
+from plotpy.builder import make
+
+
+def test_legend_click_inside_out_of_range_row() -> None:
+    """Clicking outside a legend row must not index the curve list negatively."""
+    with qt_app_context(exec_loop=False):
+        window = make.dialog(edit=False, type="curve", size=(640, 480))
+        plot = window.manager.get_plot()
+        plot.add_item(make.curve(np.arange(3), np.arange(3), title="Signal"))
+        legend = make.legend("TR")
+        plot.add_item(legend)
+        legend.get_text_rect()
+
+        result = legend.click_inside(6.0, -100.0)
+
+        assert result == (2.0, 1, True, None)
+        window.close()
+
+
+def test_empty_legend_click_inside_does_not_crash() -> None:
+    """Clicking an empty legend must not index an empty curve list."""
+    with qt_app_context(exec_loop=False):
+        window = make.dialog(edit=False, type="curve", size=(640, 480))
+        plot = window.manager.get_plot()
+        legend = make.legend("TR")
+        plot.add_item(legend)
+        legend.get_text_rect()
+
+        result = legend.click_inside(6.0, -100.0)
+
+        assert result == (2.0, 1, True, None)
+        window.close()

plotpy/tests/unit/test_contour.py

@@ -1,7 +1,9 @@
 import unittest
 
 import numpy as np
+from qtpy.QtCore import Qt
 
+from plotpy.builder import make
 from plotpy.items.contour import compute_contours
 from plotpy.tests.data import gen_xyz_data
 
@@ -54,3 +56,26 @@ def test_contour_abs_level_1(self):
         for line in lines:
             assert np.all(np.equal(line.vertices[0], line.vertices[-1]))
             assert line.level == 1.0
+
+    def test_contour_item_style(self):
+        """Test contour builder line style parameters."""
+        items = make.contours(
+            self.Z,
+            1.0,
+            self.X,
+            self.Y,
+            color="r",
+            linestyle="--",
+            linewidth=2.5,
+        )
+        assert items
+        for item in items:
+            assert item.pen.color().name() == "#ff0000"
+            assert item.pen.style() == Qt.DashLine
+            assert item.pen.widthF() == 2.5
+
+        default_item = make.contours(self.Z, 1.0, self.X, self.Y)[0]
+        color_item = make.contours(self.Z, 1.0, self.X, self.Y, color="b")[0]
+        assert color_item.pen.color().name() == "#0000ff"
+        assert color_item.pen.style() == default_item.pen.style()
+        assert color_item.pen.widthF() == default_item.pen.widthF()