new tests and imrpovements

Author: vld-codra

.vscode/settings.json

@@ -22,7 +22,9 @@
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.testing.pytestPath": "pytest",
-    "python.testing.pytestArgs": [],
+    "python.testing.pytestArgs": [
+        "plotpy"
+    ],
     "[python]": {
         "editor.defaultFormatter": "charliermarsh.ruff"
     },

plotpy/plot/base.py

@@ -1107,7 +1107,9 @@ def disable_unused_axes(self):
             self.enableAxis(self.colormap_axis)
 
     def get_items(
-        self, z_sorted: bool = False, item_type: itf.IBasePlotItem | None = None
+        self,
+        z_sorted: bool = False,
+        item_type: type[itf.IItemType | itf.IBasePlotItem] | None = None,
     ) -> list[itf.IBasePlotItem]:
         """Return widget's item list
         (items are based on IBasePlotItem's interface)

plotpy/tests/items/test_curves.py

@@ -12,6 +12,7 @@
 
 from plotpy.builder import make
 from plotpy.tests import vistools as ptv
+from plotpy.tools import CurveStatsTool
 
 
 def test_plot():
@@ -43,6 +44,8 @@ def test_plot():
         _win = ptv.show_items(
             items, wintitle=test_plot.__doc__, title="Curves", plot_type="curve"
         )
+        stats_tool = _win.get_plot().manager.get_tool(CurveStatsTool)
+        _win.get_plot().manager.set_active_tool(stats_tool)
 
 
 if __name__ == "__main__":

plotpy/tests/items/test_image_masked.py

@@ -36,6 +36,8 @@ def build_items(self) -> list:
             xdata=[0, 20],
             ydata=[0, 25],
         )
+        image.add_masked_area("rectangular", 0, 0, 10, 10, True)
+        image.apply_masked_areas()
         return [image]
 
 

plotpy/tests/unit/test_cursor_tools.py

@@ -0,0 +1,89 @@
+import numpy as np
+import pytest
+import qtpy.QtCore as QC
+from guidata.qthelpers import exec_dialog, qt_app_context
+from qwt import QwtPlotItem
+
+from plotpy.builder import make
+from plotpy.interfaces.items import (
+    ICurveItemType,
+    IDecoratorItemType,
+    IShapeItemType,
+    ITrackableItemType,
+)
+from plotpy.items import CurveItem, DataInfoLabel, Marker, TrImageItem, XRangeSelection
+from plotpy.plot.base import BasePlot
+from plotpy.plot.plotwidget import PlotWindow
+from plotpy.tests.data import gen_image4
+from plotpy.tests.unit.utils import (
+    create_window,
+    drag_mouse,
+    keyboard_event,
+)
+from plotpy.tools import (
+    CurveStatsTool,
+    HCursorTool,
+    HRangeTool,
+    VCursorTool,
+    XCursorTool,
+)
+from plotpy.tools.cursor import BaseCursorTool
+
+# guitest: show
+
+
+def test_curve_stat_tool():
+    with qt_app_context(exec_loop=False) as qapp:
+        win, tool = create_window(CurveStatsTool)
+        plot = win.manager.get_plot()
+
+        active_tool = win.manager.get_active_tool()
+        assert isinstance(active_tool, CurveStatsTool)
+
+        og_stat_items = [
+            item
+            for item in plot.get_items()
+            if isinstance(item, (DataInfoLabel, XRangeSelection))
+        ]
+
+        drag_mouse(win, qapp, np.array([0.5, 0.6, 0.7]), np.array([0.5, 0.6, 0.7]))
+
+        new_stat_items = [
+            item
+            for item in plot.get_items()
+            if isinstance(item, (DataInfoLabel, XRangeSelection))
+        ]
+
+        # There should be one more new DataInfoLabel and one new XRangeSelection
+        # compared to the original plot items (before mouse drag)
+        assert len(new_stat_items) == len(og_stat_items) + 2
+
+        exec_dialog(win)
+
+
+@pytest.mark.parametrize(
+    "cursor_tool", [HCursorTool, VCursorTool, XCursorTool, HRangeTool]
+)
+def test_cursor_tool(cursor_tool: type[BaseCursorTool]):
+    with qt_app_context(exec_loop=False) as qapp:
+        win, tool = create_window(cursor_tool)
+        plot = win.manager.get_plot()
+
+        active_tool = win.manager.get_active_tool()
+        assert isinstance(active_tool, cursor_tool)
+        tool_shape_type = type(active_tool.create_shape())
+        assert tool_shape_type not in (type(item) for item in plot.get_items())
+
+        drag_mouse(win, qapp, np.array([0.5, 0.6, 0.7]), np.array([0.5, 0.6, 0.7]))
+
+        assert tool_shape_type in (type(item) for item in plot.get_items())
+
+        exec_dialog(win)
+
+
+if __name__ == "__main__":
+    test_curve_stat_tool()
+    test_cursor_tool(HCursorTool)
+    test_cursor_tool(VCursorTool)
+    test_cursor_tool(XCursorTool)
+    test_cursor_tool(HRangeTool)

plotpy/tests/unit/test_display_coords_tool.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import numpy as np
+import qtpy.QtCore as QC
 from guidata.qthelpers import qt_app_context
 
 from plotpy.interfaces.items import IImageItemType
@@ -14,6 +15,22 @@ def test_display_coords_on_curve():
         win, tool = create_window(DisplayCoordsTool)
         drag_mouse(win, qapp, np.array([0.5]), np.array([0.5]), click=False)
         drag_mouse(win, qapp, np.array([0.5]), np.array([0.5]), click=True)
+        drag_mouse(
+            win,
+            qapp,
+            np.array([0.5]),
+            np.array([0.5]),
+            click=True,
+            mod=QC.Qt.KeyboardModifier.AltModifier,
+        )
+        drag_mouse(
+            win,
+            qapp,
+            np.array([0.5]),
+            np.array([0.5]),
+            click=True,
+            mod=QC.Qt.KeyboardModifier.ControlModifier,
+        )
 
 
 def test_display_coords_on_image():
@@ -22,6 +39,22 @@ def test_display_coords_on_image():
         win, tool = create_window(DisplayCoordsTool, active_item_type=IImageItemType)
         drag_mouse(win, qapp, np.array([0.5]), np.array([0.5]), click=False)
         drag_mouse(win, qapp, np.array([0.5]), np.array([0.5]), click=True)
+        drag_mouse(
+            win,
+            qapp,
+            np.array([0.5]),
+            np.array([0.5]),
+            click=True,
+            mod=QC.Qt.KeyboardModifier.AltModifier,
+        )
+        drag_mouse(
+            win,
+            qapp,
+            np.array([0.5]),
+            np.array([0.5]),
+            click=True,
+            mod=QC.Qt.KeyboardModifier.ControlModifier,
+        )
 
 
 if __name__ == "__main__":

plotpy/tests/unit/test_multiline_tools.py

@@ -7,11 +7,14 @@
 from plotpy.tests.unit.utils import (
     CLICK,
     create_window,
+    drag_mouse,
     keyboard_event,
     mouse_event_at_relative_plot_pos,
 )
 from plotpy.tools import FreeFormTool, MultiLineTool
 
+# guitest: show
+
 
 def test_free_form_tool():
     """Test the free form tool."""
@@ -24,9 +27,25 @@ def test_free_form_tool():
             mouse_event_at_relative_plot_pos(win, qapp, (x, y), CLICK)
 
         assert tool.shape is not None
-
         assert tool.shape.get_points().shape == corners.shape
 
+        # Delete last point
+        keyboard_event(win, qapp, QC.Qt.Key.Key_Backspace)
+
+        points_count, _ = tool.shape.get_points().shape
+
+        assert points_count == (len(corners) - 1)
+
+        # add last point by dragging mouse
+        drag_mouse(win, qapp, corners[-2:, 0], corners[-2:, 1])
+
+        points_count, _ = tool.shape.get_points().shape
+        assert points_count == len(corners)
+
+        keyboard_event(win, qapp, QC.Qt.Key.Key_Enter)
+
+        assert tool.shape is None
+
         exec_dialog(win)
 
 
@@ -56,6 +75,16 @@ def test_multiline_tool():
 
         assert points_count == (n - 1)
 
+        # add last point by dragging mouse
+        drag_mouse(win, qapp, x_arr[-2:], y_arr[-2:])
+
+        points_count, _ = tool.shape.get_points().shape
+        assert points_count == n
+
+        keyboard_event(win, qapp, QC.Qt.Key.Key_Enter)
+
+        assert tool.shape is None
+
         exec_dialog(win)