Merge remote-tracking branch 'Codra/develop-2.1_tools-unit-tests' into develop

Author: PierreRaybaut

plotpy/locale/fr/LC_MESSAGES/plotpy.mo

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2024-03-01 10:00+0100\n"
+"POT-Creation-Date: 2024-03-01 10:13+0100\n"
 "PO-Revision-Date: 2019-02-20 14:42+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1468,7 +1468,7 @@ msgid "Right-click on the curve to enable/disable downsampling"
 msgstr ""
 "Clic droit sur la courbe pour activer/désactiver le sous-échantillonnage"
 
-#: plotpy\tests\tools\test_edit_point.py:47 plotpy\tools\curve.py:836
+#: plotpy\tests\tools\test_edit_point.py:47 plotpy\tools\curve.py:837
 msgid "Insert point"
 msgstr "Insérer un point"
 
@@ -1650,71 +1650,71 @@ msgstr "Curseur horizontal"
 msgid "Cross cursor"
 msgstr "Curseur croix"
 
-#: plotpy\tools\curve.py:50
+#: plotpy\tools\curve.py:51
 msgid "Signal statistics"
 msgstr "Statistiques du signal"
 
-#: plotpy\tools\curve.py:156
+#: plotpy\tools\curve.py:157
 msgid "Antialiasing (curves)"
 msgstr "Anticrénelage (courbes)"
 
-#: plotpy\tools\curve.py:190
+#: plotpy\tools\curve.py:191
 msgid "Point selection"
 msgstr "Sélection d'un point"
 
-#: plotpy\tools\curve.py:340
+#: plotpy\tools\curve.py:341
 msgid "Multi-point selection"
 msgstr "Sélection multi-points"
 
-#: plotpy\tools\curve.py:629
+#: plotpy\tools\curve.py:630
 msgid "Insertion index"
 msgstr "Index d'insertion"
 
-#: plotpy\tools\curve.py:631
+#: plotpy\tools\curve.py:632
 msgid "New value"
 msgstr "Nouvelle valeur"
 
-#: plotpy\tools\curve.py:633
+#: plotpy\tools\curve.py:634
 msgid "After"
 msgstr "Après"
 
-#: plotpy\tools\curve.py:633
+#: plotpy\tools\curve.py:634
 msgid "Before"
 msgstr "Avant"
 
-#: plotpy\tools\curve.py:633
+#: plotpy\tools\curve.py:634
 msgid "Location"
 msgstr "Position"
 
-#: plotpy\tools\curve.py:661
+#: plotpy\tools\curve.py:662
 msgid "Edit point"
 msgstr "Modifier le point"
 
-#: plotpy\tools\curve.py:837
+#: plotpy\tools\curve.py:838
 msgid "Before inserting a new point, please select an existing curve point."
 msgstr "Avant d'insérer un nouveau point, sélectionner un point existant."
 
-#: plotpy\tools\curve.py:844
+#: plotpy\tools\curve.py:845
 msgid "Insert new value"
 msgstr "Insérer une nouvelle valeur"
 
-#: plotpy\tools\curve.py:1091
+#: plotpy\tools\curve.py:1095
 msgid "Downsample"
 msgstr "Sous-échantillonner"
 
-#: plotpy\tools\curve.py:1138 plotpy\tools\curve.py:1150
+#: plotpy\tools\curve.py:1142 plotpy\tools\curve.py:1154
 msgid "Export"
 msgstr "Exporter"
 
-#: plotpy\tools\curve.py:1142
+#: plotpy\tools\curve.py:1146
 msgid "Text file"
 msgstr "Fichier texte"
 
-#: plotpy\tools\curve.py:1151
+#: plotpy\tools\curve.py:1155
 msgid "Unable to export item data."
 msgstr "Impossible d'exporter les données de l'objet sélectionné."
 
-#: plotpy\tools\curve.py:1153
+#: plotpy\tools\curve.py:1157
 msgid "Error message:"
 msgstr "Message d'erreur :"
 
@@ -2289,3 +2289,6 @@ msgstr "Rotation et rognage"
 #: plotpy\widgets\rotatecrop.py:219
 msgid "Show cropping rectangle"
 msgstr "Afficher le rectangle de rognage"
+
+#~ msgid "Save"
+#~ msgstr "Enregistrer"

plotpy/locale/fr/LC_MESSAGES/plotpy.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-03-01 10:00+0100\n"
+"POT-Creation-Date: 2024-03-01 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1416,7 +1416,7 @@ msgstr ""
 msgid "Right-click on the curve to enable/disable downsampling"
 msgstr ""
 
-#: plotpy\tests\tools\test_edit_point.py:47 plotpy\tools\curve.py:836
+#: plotpy\tests\tools\test_edit_point.py:47 plotpy\tools\curve.py:837
 msgid "Insert point"
 msgstr ""
 
@@ -1594,71 +1594,71 @@ msgstr ""
 msgid "Cross cursor"
 msgstr ""
 
-#: plotpy\tools\curve.py:50
+#: plotpy\tools\curve.py:51
 msgid "Signal statistics"
 msgstr ""
 
-#: plotpy\tools\curve.py:156
+#: plotpy\tools\curve.py:157
 msgid "Antialiasing (curves)"
 msgstr ""
 
-#: plotpy\tools\curve.py:190
+#: plotpy\tools\curve.py:191
 msgid "Point selection"
 msgstr ""
 
-#: plotpy\tools\curve.py:340
+#: plotpy\tools\curve.py:341
 msgid "Multi-point selection"
 msgstr ""
 
-#: plotpy\tools\curve.py:629
+#: plotpy\tools\curve.py:630
 msgid "Insertion index"
 msgstr ""
 
-#: plotpy\tools\curve.py:631
+#: plotpy\tools\curve.py:632
 msgid "New value"
 msgstr ""
 
-#: plotpy\tools\curve.py:633
+#: plotpy\tools\curve.py:634
 msgid "After"
 msgstr ""
 
-#: plotpy\tools\curve.py:633
+#: plotpy\tools\curve.py:634
 msgid "Before"
 msgstr ""
 
-#: plotpy\tools\curve.py:633
+#: plotpy\tools\curve.py:634
 msgid "Location"
 msgstr ""
 
-#: plotpy\tools\curve.py:661
+#: plotpy\tools\curve.py:662
 msgid "Edit point"
 msgstr ""
 
-#: plotpy\tools\curve.py:837
+#: plotpy\tools\curve.py:838
 msgid "Before inserting a new point, please select an existing curve point."
 msgstr ""
 
-#: plotpy\tools\curve.py:844
+#: plotpy\tools\curve.py:845
 msgid "Insert new value"
 msgstr ""
 
-#: plotpy\tools\curve.py:1091
+#: plotpy\tools\curve.py:1095
 msgid "Downsample"
 msgstr ""
 
-#: plotpy\tools\curve.py:1138 plotpy\tools\curve.py:1150
+#: plotpy\tools\curve.py:1142 plotpy\tools\curve.py:1154
 msgid "Export"
 msgstr ""
 
-#: plotpy\tools\curve.py:1142
+#: plotpy\tools\curve.py:1146
 msgid "Text file"
 msgstr ""
 
-#: plotpy\tools\curve.py:1151
+#: plotpy\tools\curve.py:1155
 msgid "Unable to export item data."
 msgstr ""
 
-#: plotpy\tools\curve.py:1153
+#: plotpy\tools\curve.py:1157
 msgid "Error message:"
 msgstr ""
 

plotpy/locale/plotpy.pot

@@ -6,6 +6,7 @@
 """Line cross section test"""
 
 # guitest: show
+from __future__ import annotations
 
 from guidata.qthelpers import qt_app_context
 

plotpy/tests/tools/test_cross_section_line.py

@@ -7,6 +7,8 @@
 
 # guitest: show
 
+from __future__ import annotations
+
 from plotpy.panels.csection.csitem import ObliqueCrossSectionItem
 from plotpy.panels.csection.cswidget import ObliqueCrossSection
 from plotpy.tests.tools import test_cross_section_line

plotpy/tests/tools/test_cross_section_oblique.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+import qtpy.QtCore as QC
+from guidata.qthelpers import exec_dialog, qt_app_context
+
+from plotpy.interfaces.items import IImageItemType
+from plotpy.tests.unit.utils import create_window
+from plotpy.tools import AspectRatioTool
+
+
+def test_aspect_ratio_tool():
+    """Test the aspect ratio tool."""
+    with qt_app_context(exec_loop=False):
+        win, tool = create_window(AspectRatioTool, active_item_type=IImageItemType)
+        plot = win.manager.get_plot()
+
+        initial_aspect_ratio: float = plot.get_aspect_ratio()
+
+        new_ratio = 0.5
+
+        plot.set_aspect_ratio(new_ratio)
+        tool.edit_aspect_ratio()
+        assert plot.get_aspect_ratio() == new_ratio
+
+        plot.set_aspect_ratio(initial_aspect_ratio)
+        tool.edit_aspect_ratio()
+        assert plot.get_aspect_ratio() == initial_aspect_ratio
+
+        tool.lock_aspect_ratio(True)
+        assert plot.lock_aspect_ratio is True
+        tool.lock_aspect_ratio(False)
+        assert plot.lock_aspect_ratio is False
+
+        exec_dialog(win)
+
+
+if __name__ == "__main__":
+    test_aspect_ratio_tool()

plotpy/tests/unit/test_aspect_ratio_tool.py

@@ -26,7 +26,6 @@ def test_baseplot_api():
         plot = win.get_plot()
         plot.manager.add_tool(SelectPointsTool)
         plot.manager.add_tool(EditPointTool)
-        plot.manager.add_tool(DownSamplingTool)  # noqa: F821
         plot.get_default_item()
         title = "Test title"
         plot.set_title(title)

plotpy/tests/unit/test_baseplot.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+import numpy as np
+from guidata.qthelpers import qt_app_context
+
+from plotpy.interfaces.items import IImageItemType
+from plotpy.tests.unit.utils import create_window, drag_mouse
+from plotpy.tools import DisplayCoordsTool
+
+
+def test_display_coords_on_curve():
+    """Test display coordinates tool on a curve."""
+    with qt_app_context(exec_loop=False) as qapp:
+        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)
+
+
+def test_display_coords_on_image():
+    """Test display coordinates tool on an image."""
+    with qt_app_context(exec_loop=False) as qapp:
+        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)
+
+
+if __name__ == "__main__":
+    test_display_coords_on_curve()
+    test_display_coords_on_image()

plotpy/tests/unit/test_display_coords_tool.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+import numpy as np
+import qtpy.QtCore as QC
+from guidata.qthelpers import exec_dialog, qt_app_context
+
+from plotpy.tests.unit.utils import (
+    CLICK,
+    create_window,
+    keyboard_event,
+    mouse_event_at_relative_plot_pos,
+)
+from plotpy.tools import FreeFormTool, MultiLineTool
+
+
+def test_free_form_tool():
+    """Test the free form tool."""
+    corners = np.array(((0.1, 0.1), (0.1, 0.8), (0.8, 0.8), (0.8, 0.1)))
+    with qt_app_context(exec_loop=False) as qapp:
+        win, tool = create_window(FreeFormTool)
+
+        # drag_mouse(win, qapp, x_path, y_path)
+        for x, y in corners:
+            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
+
+        exec_dialog(win)
+
+
+def test_multiline_tool():
+    """Test the multi line tool."""
+    n = 100
+    t = np.linspace(0, np.pi * 10, n)
+
+    # Create x and y arrays
+    x_arr = t * np.cos(t) / n + 0.5
+    y_arr = t * np.sin(t) / n + 0.5
+
+    with qt_app_context(exec_loop=False) as qapp:
+        win, tool = create_window(MultiLineTool)
+
+        # drag_mouse(win, qapp, x_path, y_path)
+        for x, y in zip(x_arr, y_arr):
+            mouse_event_at_relative_plot_pos(win, qapp, (x, y), CLICK)
+
+        assert tool.shape is not None
+        assert tool.shape.get_points().shape == np.array([x_arr, y_arr]).T.shape
+
+        # Delete last point
+        keyboard_event(win, qapp, QC.Qt.Key.Key_Backspace)
+
+        points_count, _ = tool.shape.get_points().shape
+
+        assert points_count == (n - 1)
+
+        exec_dialog(win)
+
+
+if __name__ == "__main__":
+    test_free_form_tool()
+    test_multiline_tool()