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

Author: PierreRaybaut

plotpy/plot/base.py

@@ -441,15 +441,15 @@ def __del__(self):
                 # This happens when object has already been deleted
                 pass
 
-    def on_active_curve(self, x: float, y: float) -> None:
+    def on_active_curve(self, x: float, y: float) -> tuple[float, float]:
         """
         Callback called when the active curve is moved
 
         Args:
             x (float): the x position
             y (float): the y position
         """
-        curve: CurveItem = self.get_last_active_item(itf.ITrackableItemType)
+        curve: CurveItem = self.get_last_active_item(itf.ICurveItemType)
         if curve:
             x, y = curve.get_closest_coordinates(x, y)
         return x, y
@@ -549,7 +549,7 @@ def do_pan_view(
         self,
         dx: tuple[float, float, float, float],
         dy: tuple[float, float, float, float],
-        replot: bool = True
+        replot: bool = True,
     ) -> None:
         """
         Translate the active axes according to dx, dy axis 'state' tuples
@@ -1683,6 +1683,7 @@ def set_active_item(self, item: itf.IBasePlotItem) -> None:
         self.active_item = item
         if self.active_item is not None:
             if not item.selected:
+                print(f"Selecting item {item}")
                 self.select_item(self.active_item)
             self._active_xaxis = item.xAxis()
             self._active_yaxis = item.yAxis()

plotpy/tests/unit/test_point_tools.py

@@ -118,8 +118,9 @@ def test_edit_point_tool():
 
         drag_mouse(win, qapp, x_path, y_path)
         curve_changes = tool.get_changes()[curve_item]
+
+        x_arr, y_arr = curve_item.get_data()
         for i, (x, y) in curve_changes.items():
-            x_arr, y_arr = curve_item.get_data()
             assert x == x_arr[i]
             assert y == y_arr[i]
 

plotpy/tests/unit/utils.py

@@ -145,11 +145,10 @@ def create_window(
     items: list[CurveItem | BaseImageItem] = make_curve_image_legend()
     win = ptv.show_items(items, wintitle="Unit test plot", auto_tools=False)
     plot = win.manager.get_plot()
-    for item in win.manager.get_plot().get_items()[::-1]:
+    for item in items:
         plot.set_active_item(item)
     last_active_item = plot.get_last_active_item(active_item_type)
     plot.set_active_item(last_active_item)
-
     if panels is not None:
         for panel in panels:
             win.manager.add_panel(panel())

plotpy/tools/curve.py

@@ -1028,10 +1028,10 @@ def stop(self, filter: StatefulEventFilter, event: QG.QMouseEvent) -> None:
         if not (isinstance(self.__x, np.ndarray) and isinstance(self.__y, np.ndarray)):
             return
 
-        backup_x_arr, backup_y_arr = self.__curve_item_array_backup[curve_item]
-        if self.__idx < backup_x_arr.size and (
-            self.__x[self.__idx] != backup_x_arr[self.__idx]
-            or self.__y[self.__idx] != backup_y_arr[self.__idx]
+        self.__x_bkp, self.__y_bkp = self.__curve_item_array_backup[curve_item]
+        if self.__idx < self.__x_bkp.size and (
+            self.__x[self.__idx] != self.__x_bkp[self.__idx]
+            or self.__y[self.__idx] != self.__y_bkp[self.__idx]
         ):
             self.__indexed_changes.setdefault(curve_item, {})[self.__idx] = (
                 self.__x[self.__idx],