PlotPy 2.3.2__tar.gz → 2.3.4__tar.gz

{plotpy-2.3.2 → plotpy-2.3.4}/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog #
 
+## Version 2.3.4 ##
+
+In this release, test coverage is 79%.
+
+🛠️ Bug fixes:
+
+* Add support for NumPy 2.0:
+  * Updated build system to use NumPy 2.0 on Python > 3.8 and NumPy 1 on Python 3.8
+  * Use `numpy.asarray` instead of `numpy.array(..., copy=False)`
+  * Use `numpy.isin` instead of `numpy.in1d`
+  * Use `scipy.integrate.trapezoid` instead of `numpy.trapz`
+
+* `ColorMapManager`: fix segmentation fault with PySide6 on Linux
+
+## Version 2.3.3 ##
+
+In this release, test coverage is 79%.
+
+🛠️ Bug fixes:
+
+* Moved up `LineCrossSection` import for consistency with other cross-section panels
+* Unexpected behavior regarding `io.load_items` and `io.save_items` functions:
+  * Those functions were serializing and deserializing most of the parameters of the
+    plot items, but not their visibility state
+  * This is now fixed: the visibility state of the plot items is now saved and restored
+    as expected
+
+ℹ️ Other changes:
+
+* Explicitely exclude NumPy V2 from the dependencies (not compatible yet)
+
 ## Version 2.3.2 ##
 
 In this release, test coverage is 79%.

{plotpy-2.3.2/PlotPy.egg-info → plotpy-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlotPy
-Version: 2.3.2
+Version: 2.3.4
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License

{plotpy-2.3.2 → plotpy-2.3.4/PlotPy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlotPy
-Version: 2.3.2
+Version: 2.3.4
 Summary: Curve and image plotting tools for Python/Qt applications
 Author-email: Codra <p.raybaut@codra.fr>
 License: BSD 3-Clause License

plotpy-2.3.4/conftest.py

@@ -0,0 +1,32 @@
+# content of conftest.py
+
+import guidata
+import h5py
+import numpy
+import PIL
+import qtpy
+import qwt
+import scipy
+import tifffile
+from guidata.env import execenv
+
+import plotpy
+
+# Turn on unattended mode for executing tests without user interaction
+execenv.unattended = True
+execenv.verbose = "quiet"
+
+
+def pytest_report_header(config):
+    """Add additional information to the pytest report header."""
+    qtbindings_version = qtpy.PYSIDE_VERSION
+    if qtbindings_version is None:
+        qtbindings_version = qtpy.PYQT_VERSION
+    return [
+        f"PlotPy {plotpy.__version__}, guidata {guidata.__version__}, "
+        f"PythonQwt {qwt.__version__}, "
+        f"{qtpy.API_NAME} {qtbindings_version} [Qt version: {qtpy.QT_VERSION}]",
+        f"NumPy {numpy.__version__}, SciPy {scipy.__version__}, "
+        f"h5py {h5py.__version__}, "
+        f"Pillow {PIL.__version__}, tifffile {tifffile.__version__}",
+    ]

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/__init__.py

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

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/builder/label.py

@@ -234,7 +234,7 @@ class LabelBuilder:
             title: label name. Default is None
 
         Returns:
-            :py:class:`.DataInfoLabel` object
+            Data info label object
         """
         comps = []
         same_curve = True
@@ -257,7 +257,7 @@ class LabelBuilder:
         image: ImageItem,
         function: Callable,
         title: str | None = None,
-    ) -> RangeComputation2d:
+    ) -> DataInfoLabel:
         """Make a 2D computation label `plot item`
 
         Args:
@@ -270,7 +270,7 @@ class LabelBuilder:
             title: label name. Default is None
 
         Returns:
-            :py:class:`.RangeComputation2d` object
+            Data info label object
         """
         return self.computations2d(
             rect, anchor, [(image, label, function)], title=title
@@ -288,7 +288,7 @@ class LabelBuilder:
             title: label name. Default is None
 
         Returns:
-            :py:class:`.DataInfoLabel` object
+            Data info label object
         """
         comps = []
         same_image = True

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/io.py

@@ -728,6 +728,7 @@ def save_items(
     for item in items:
         with writer.group(_get_name(item)):
             item.serialize(writer)
+            writer.write(item.isVisible(), group_name="visible")
     with writer.group("plot_items"):
         writer.write_sequence(names)
 
@@ -756,6 +757,7 @@ def load_items(
         item = klass()
         with reader.group(name):
             item.deserialize(reader)
+            item.setVisible(reader.read("visible", default=True))
         items.append(item)
     return items
 

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/items/curve/base.py

@@ -388,8 +388,8 @@ class CurveItem(QwtPlotCurve):
              this method is called to update decimated data (i.e. only update 1/N value
              with N set in CurveItem.param.decimation).
         """
-        self._x = np.array(x, copy=False)
-        self._y = np.array(y, copy=False)
+        self._x = np.asarray(x)
+        self._y = np.asarray(y)
         self._setData(self._x, self._y)
 
     def is_empty(self) -> bool:

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/items/curve/errorbar.py

@@ -144,11 +144,11 @@ class ErrorBarCurveItem(CurveItem):
         """
         CurveItem.set_data(self, x, y)
         if dx is not None:
-            dx = np.array(dx, copy=False)
+            dx = np.asarray(dx)
             if dx.size == 0:
                 dx = None
         if dy is not None:
-            dy = np.array(dy, copy=False)
+            dy = np.asarray(dy)
             if dy.size == 0:
                 dy = None
         self._dx = dx

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/items/label.py

@@ -983,7 +983,7 @@ class RangeComputation(ObjectInfo):
             if vector is None:
                 vectors.append(None)
             elif i0 == i1:
-                vectors.append(np.array([np.NaN]))
+                vectors.append(np.array([np.nan]))
             else:
                 vectors.append(vector[i0:i1])
         return self.label % self.func(*vectors)

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/items/polygonmap.py

@@ -264,9 +264,9 @@ class PolygonMapItem(QwtPlotItem):
             * x: NumPy array
             * y: NumPy array
         """
-        self._pts = np.array(pts, copy=False)
-        self._n = np.array(n, copy=False)
-        self._c = np.array(c, copy=False)
+        self._pts = np.asarray(pts)
+        self._n = np.asarray(n)
+        self._c = np.asarray(c)
         xmin, ymin = self._pts.min(axis=0)
         xmax, ymax = self._pts.max(axis=0)
         self.bounds = QC.QRectF(xmin, ymin, xmax - xmin, ymax - ymin)

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/panels/__init__.py

@@ -5,5 +5,10 @@
 
 from .base import PanelWidget
 from .contrastadjustment import ContrastAdjustment
-from .csection import ObliqueCrossSection, XCrossSection, YCrossSection
+from .csection import (
+    ObliqueCrossSection,
+    XCrossSection,
+    YCrossSection,
+    LineCrossSection,
+)
 from .itemlist import PlotItemList

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/panels/csection/__init__.py

@@ -11,9 +11,15 @@ an oblique rectangle).
 .. autoclass:: XCrossSection
 .. autoclass:: YCrossSection
 .. autoclass:: ObliqueCrossSection
+.. autoclass:: LineCrossSection
 """
 
 # pylint: disable=unused-import
 # flake8: noqa
 
-from .cswidget import ObliqueCrossSection, XCrossSection, YCrossSection
+from .cswidget import (
+    ObliqueCrossSection,
+    XCrossSection,
+    YCrossSection,
+    LineCrossSection,
+)

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/features/test_computations.py

@@ -7,8 +7,9 @@
 
 # guitest: show
 
+import numpy as np
+import scipy.integrate as spt
 from guidata.qthelpers import qt_app_context
-from numpy import linspace, sin, trapz
 
 from plotpy.builder import make
 from plotpy.tests import vistools as ptv
@@ -16,8 +17,8 @@ from plotpy.tests import vistools as ptv
 
 def test_computations():
     """Test computations"""
-    x = linspace(-10, 10, 1000)
-    y = sin(sin(sin(x)))
+    x = np.linspace(-10, 10, 1000)
+    y = np.sin(np.sin(np.sin(x)))
     with qt_app_context(exec_loop=True):
         curve = make.curve(x, y, "ab", "b")
         range = make.range(-2, 2)
@@ -26,7 +27,7 @@ def test_computations():
         )
 
         disp1 = make.computation(
-            range, "BL", "trapz=%g", curve, lambda x, y: trapz(y, x)
+            range, "BL", "trapz=%g", curve, lambda x, y: spt.trapezoid(y, x)
         )
 
         disp2 = make.computations(

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_builder_annotation.py

@@ -7,6 +7,7 @@
 
 import numpy as np
 import pytest
+from guidata.qthelpers import qt_app_context
 
 from plotpy.builder import make
 from plotpy.tests.unit.test_builder_curve import show_items_qtbot
@@ -61,28 +62,30 @@ def _make_annotation(
     ],
 )
 def test_builder_annotation_params(method):
-    items = []
-    for show_label in [True, False]:
-        items.append(
-            _make_annotation(
-                method,
-                title="title",
-                subtitle="subtitle",
-                show_label=show_label,
+    """Test PlotBuilder annotation factory method parameters"""
+    with qt_app_context(exec_loop=False):
+        items = []
+        for show_label in [True, False]:
+            items.append(
+                _make_annotation(
+                    method,
+                    title="title",
+                    subtitle="subtitle",
+                    show_label=show_label,
+                )
             )
-        )
-    for show_computations in [True, False]:
-        items.append(_make_annotation(method, show_computations=show_computations))
-    for show_subtitle in [True, False]:
-        items.append(_make_annotation(method, show_subtitle=show_subtitle))
-    for format in ["%f", "%e"]:
-        items.append(_make_annotation(method, format=format))
-    for uncertainty in [0.0, 1.0]:
-        items.append(_make_annotation(method, uncertainty=uncertainty))
-    for transform_matrix in [None, np.identity(3)]:
-        items.append(_make_annotation(method, transform_matrix=transform_matrix))
-    for readonly in [True, False]:
-        items.append(_make_annotation(method, readonly=readonly))
-    for private in [True, False]:
-        items.append(_make_annotation(method, private=private))
-    show_items_qtbot(items)
+        for show_computations in [True, False]:
+            items.append(_make_annotation(method, show_computations=show_computations))
+        for show_subtitle in [True, False]:
+            items.append(_make_annotation(method, show_subtitle=show_subtitle))
+        for format in ["%f", "%e"]:
+            items.append(_make_annotation(method, format=format))
+        for uncertainty in [0.0, 1.0]:
+            items.append(_make_annotation(method, uncertainty=uncertainty))
+        for transform_matrix in [None, np.identity(3)]:
+            items.append(_make_annotation(method, transform_matrix=transform_matrix))
+        for readonly in [True, False]:
+            items.append(_make_annotation(method, readonly=readonly))
+        for private in [True, False]:
+            items.append(_make_annotation(method, private=private))
+        show_items_qtbot(items)

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_builder_curve.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 import pytest
-from guidata.qthelpers import exec_dialog
+from guidata.qthelpers import exec_dialog, qt_app_context
 from qtpy.QtCore import Qt
 from qwt import QwtPlotCurve
 
@@ -43,8 +43,9 @@ def _make_curve_style(shade, curvestyle, baseline):
 @pytest.mark.parametrize("baseline", [0.0])
 def test_builder_curve_curve_style(shade, curvestyle, baseline):
     """Test curve parameters of curve() method"""
-    curve = _make_curve_style(shade, curvestyle, baseline)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_style(shade, curvestyle, baseline)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("shade", [0, 0.4, 1.0])
@@ -52,8 +53,9 @@ def test_builder_curve_curve_style(shade, curvestyle, baseline):
 @pytest.mark.parametrize("baseline", [0.0, 1.0])
 def test_builder_curve_curve_shade_baseline(shade, curvestyle, baseline):
     """Test curve parameters of curve() method"""
-    curve = _make_curve_style(shade, curvestyle, baseline)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_style(shade, curvestyle, baseline)
+        show_items_qtbot([curve], "curve")
 
 
 def _make_curve_dsamp(dsamp_factor, use_dsamp):
@@ -70,16 +72,18 @@ def _make_curve_dsamp(dsamp_factor, use_dsamp):
 @pytest.mark.parametrize("use_dsamp", [True])
 def test_builder_curve_dsamp_on(dsamp_factor, use_dsamp):
     """Test downsampling parameters of curve() method: use_dsamp=True"""
-    curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("dsamp_factor", [1, 2])
 @pytest.mark.parametrize("use_dsamp", [False])
 def test_builder_curve_dsamp_off(dsamp_factor, use_dsamp):
     """Test downsampling parameters of curve() method: use_dsamp=False"""
-    curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
+        show_items_qtbot([curve], "curve")
 
 
 def _make_curve_linestyle(color, linestyle, linewidth):
@@ -102,8 +106,9 @@ def _make_curve_linestyle(color, linestyle, linewidth):
 @pytest.mark.parametrize("linewidth", [1, 2])
 def test_builder_curve_line_style(color, linestyle, linewidth):
     """Test line parameters of curve() method"""
-    curve = _make_curve_linestyle(color, linestyle, linewidth)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_linestyle(color, linestyle, linewidth)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("color", ["red", "blue"])
@@ -111,8 +116,9 @@ def test_builder_curve_line_style(color, linestyle, linewidth):
 @pytest.mark.parametrize("linewidth", [1, 2])
 def test_builder_curve_line_color(color, linestyle, linewidth):
     """Test line parameters of curve() method"""
-    curve = _make_curve_linestyle(color, linestyle, linewidth)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_linestyle(color, linestyle, linewidth)
+        show_items_qtbot([curve], "curve")
 
 
 def _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor):
@@ -160,8 +166,9 @@ def test_builder_curve_marker_params_symbol(
     marker, markersize, markerfacecolor, markeredgecolor
 ):
     """Test marker parameters of curve() methodg"""
-    curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
+        show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("marker", ["Cross"])
@@ -172,5 +179,6 @@ def test_builder_curve_marker_size_color(
     marker, markersize, markerfacecolor, markeredgecolor
 ):
     """Test marker parameters of curve() methodg"""
-    curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
-    show_items_qtbot([curve], "curve")
+    with qt_app_context(exec_loop=False):
+        curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
+        show_items_qtbot([curve], "curve")

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_builder_image.py

@@ -7,6 +7,7 @@
 
 import numpy as np
 import pytest
+from guidata.qthelpers import qt_app_context
 
 from plotpy.builder import make
 from plotpy.constants import LUTAlpha
@@ -61,55 +62,64 @@ def _make_image(
     ],
 )
 def test_builder_image_alpha_function(alpha_function):
-    item = _make_image(alpha_function=alpha_function)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(alpha_function=alpha_function)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize(
     "xdata,ydata", [[[None, None], [None, None]], [[-10, 10], [-10, 10]]]
 )
 def test_builder_image_xdata_ydata(xdata, ydata):
-    item = _make_image(xdata=xdata, ydata=ydata)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(xdata=xdata, ydata=ydata)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("pixel_size", [None, 1.0, (1.0, 2.0)])
 def test_builder_image_pixel_size(pixel_size):
-    item = _make_image(pixel_size=pixel_size)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(pixel_size=pixel_size)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("center_on", [None, [1.0, 3.0]])
 def test_builder_image_center_on(center_on):
-    item = _make_image(center_on=center_on, pixel_size=(1.0, 1.0))
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(center_on=center_on, pixel_size=(1.0, 1.0))
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("interpolation", ["nearest", "linear", "antialiasing"])
 def test_builder_image_interpolation(interpolation):
-    item = _make_image(interpolation=interpolation)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(interpolation=interpolation)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("background_color", [None, "red"])
 def test_builder_image_background_color(background_color):
-    item = _make_image(background_color=background_color)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(background_color=background_color)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("eliminate_outliers", [None, 3.0])
 def test_builder_image_eliminate_outliers(eliminate_outliers):
-    item = _make_image(eliminate_outliers=eliminate_outliers)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(eliminate_outliers=eliminate_outliers)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("lut_range", [None, [0.0, 100.0]])
 def test_builder_image_lut_range(lut_range):
-    item = _make_image(lut_range=lut_range)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(lut_range=lut_range)
+        show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("lock_position", [None, True, False])
 def test_builder_image_lock_position(lock_position):
-    item = _make_image(lock_position=lock_position)
-    show_items_qtbot([item])
+    with qt_app_context(exec_loop=False):
+        item = _make_image(lock_position=lock_position)
+        show_items_qtbot([item])

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_builder_shape.py

@@ -7,6 +7,7 @@
 
 import numpy as np
 import pytest
+from guidata.qthelpers import qt_app_context
 
 from plotpy.builder import make
 from plotpy.tests import get_path
@@ -37,18 +38,20 @@ def _make_standard_shape(
     [make.segment, make.rectangle, make.circle, make.ellipse],
 )
 def test_builder_standard_shape(method):
-    items = []
-    items.append(_make_standard_shape(method, title="title"))
-    show_items_qtbot(items)
+    with qt_app_context(exec_loop=False):
+        items = []
+        items.append(_make_standard_shape(method, title="title"))
+        show_items_qtbot(items)
 
 
 def test_builder_polygon():
     items = []
     x = np.linspace(0, 1, 10)
     y = x**2
-    for closed in [True, False]:
-        items.append(make.polygon(x, y, closed=closed, title="title"))
-    show_items_qtbot(items)
+    with qt_app_context(exec_loop=False):
+        for closed in [True, False]:
+            items.append(make.polygon(x, y, closed=closed, title="title"))
+        show_items_qtbot(items)
 
 
 def test_builder_svgshape():
@@ -56,9 +59,10 @@ def test_builder_svgshape():
     svg_path = get_path("svg_target.svg")
     with open(svg_path, "rb") as f:
         svg_data = f.read()
-    for shape_str in ("circle", "rectangle", "square"):
-        for data_or_path in (svg_data, svg_path):
-            items.append(
-                make.svg(shape_str, data_or_path, 0.0, 0.0, 1.0, 1.0, title="title")
-            )
-    show_items_qtbot(items)
+    with qt_app_context(exec_loop=False):
+        for shape_str in ("circle", "rectangle", "square"):
+            for data_or_path in (svg_data, svg_path):
+                items.append(
+                    make.svg(shape_str, data_or_path, 0.0, 0.0, 1.0, 1.0, title="title")
+                )
+        show_items_qtbot(items)

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_curve_tools.py

@@ -216,7 +216,7 @@ def test_edit_point_tool():
         tool.reset_arrays()
         assert tool.get_changes() == {}
         x_arr, y_arr = curve_item.get_data()
-        assert np.in1d(x_arr, orig_x).all() and np.in1d(y_arr, orig_y).all()
+        assert np.isin(x_arr, orig_x).all() and np.isin(y_arr, orig_y).all()
 
         exec_dialog(win)
 

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_manipulate_selection.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 from typing import TYPE_CHECKING, Callable, TypeVar
 
 import numpy as np
@@ -270,6 +271,7 @@ def test_select_all_items():
         exec_dialog(win)
 
 
+@pytest.mark.skipif(os.name != "nt", reason="Only tested on Windows.")
 def test_rotate_with_mouse():
     """Test rotating an image item with the mouse."""
     with qt_app_context(exec_loop=False) as qapp:
@@ -325,6 +327,7 @@ def test_rectangular_selection():
         exec_dialog(win)
 
 
+@pytest.mark.skipif(os.name != "nt", reason="Only tested on Windows.")
 @pytest.mark.parametrize(
     "mouse_path, rotation",
     [

{plotpy-2.3.2 → plotpy-2.3.4}/plotpy/tests/unit/test_mask_tool.py

@@ -49,9 +49,12 @@ def test_image_mask_tool(shape_tool_cls: type[RectangularShapeTool], inside: boo
         with execenv.context(accept_dialogs=True):
             shape_tool.add_shape_to_plot(plot, pos0, pos1)
             mask_tool.apply_mask()
-            mask_tool.clear_mask()
+
+            # Clear mask
+            item.unmask_all()
+            plot.replot()
 
             shape_tool.add_shape_to_plot(plot, pos0, pos1)
-            mask_tool.remove_all_shapes()
+            mask_tool.remove_shapes()
 
         exec_dialog(win)