Plugin refactor [7]: Fix trajectory plot, better interactions

src/napari_deeplabcut/_tests/compat/test_compat_integration.py

@@ -5,7 +5,6 @@
 from __future__ import annotations
 
 import numpy as np
-import pytest
 
 from napari_deeplabcut.napari_compat import (
     apply_points_layer_ui_tweaks,
@@ -111,7 +110,6 @@ def paste_func(this):
     assert seen == [layer]
 
 
-@pytest.mark.xfail(reason="This test is fixed in a subsequent PR, to be added")
 def test_apply_points_layer_ui_tweaks_real_dropdown(qtbot):
     from types import SimpleNamespace
 
@@ -147,7 +145,12 @@ def __init__(self):
         def layout(self):
             return self._layout
 
-    layer = SimpleNamespace(metadata={"colormap_name": "magma"})
+    class DummyLayer:
+        def __init__(self):
+            self.metadata = {"colormap_name": "magma"}
+
+    layer = DummyLayer()
+
     point_controls = PointControls()
     qtbot.addWidget(point_controls)
 

src/napari_deeplabcut/_tests/e2e/test_points_layers.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 import numpy as np
 import pytest
 from napari.layers import Points
 
-from napari_deeplabcut.core.layers import populate_keypoint_layer_properties
+from napari_deeplabcut.core.layers import PointsInteractionObserver, populate_keypoint_layer_properties
 
 
 @pytest.mark.usefixtures("qtbot")
@@ -100,7 +102,7 @@ def test_layer_insert_does_not_crash_when_current_property_is_nan(viewer, keypoi
     layer = viewer.add_points(data, **md)
     # Plot cannot be formed because of the NaN,
     # but the layer must still be added and cycle mode must not be enabled.
-    assert keypoint_controls._matplotlib_canvas.df is None
+    assert keypoint_controls._traj_mpl_canvas.df is None
     assert isinstance(layer, Points)
     assert layer.face_color_mode != "cycle"
 
@@ -239,3 +241,71 @@ def test_copy_paste_same_frame_does_not_duplicate_existing_keypoints(
 
     # no duplicates expected on same frame
     assert len(layer.data) == before
+
+
+def test_points_interaction_observer_emits_on_selected_data_change(viewer, qtbot):
+    layer = viewer.add_points(
+        np.array([[0, 0], [1, 1]]),
+        properties={"label": np.array(["nose", "tail"], dtype=object)},
+    )
+    viewer.layers.selection.active = layer
+
+    seen = []
+
+    observer = PointsInteractionObserver(viewer, seen.append, debounce_ms=0)
+    observer.install()
+
+    layer.selected_data.select_only(1)
+
+    qtbot.waitUntil(lambda: len(seen) >= 1, timeout=1000)
+
+    evt = seen[-1]
+    assert evt.viewer is viewer
+    assert isinstance(evt.layer, Points)
+    assert "selection" in evt.reasons
+    assert tuple(sorted(evt.layer.selected_data)) == (1,)
+
+    observer.close()
+
+
+def test_points_interaction_observer_rebinds_when_active_layer_changes(viewer, qtbot):
+    layer1 = viewer.add_points(
+        np.array([[0, 0], [1, 1]]),
+        properties={"label": np.array(["nose", "tail"], dtype=object)},
+        name="points-1",
+    )
+    layer2 = viewer.add_points(
+        np.array([[2, 2], [3, 3]]),
+        properties={"label": np.array(["paw", "ear"], dtype=object)},
+        name="points-2",
+    )
+
+    seen = []
+    observer = PointsInteractionObserver(viewer, seen.append, debounce_ms=0)
+    observer.install()
+
+    viewer.layers.selection.active = layer1
+    layer1.selected_data.select_only(0)
+    qtbot.waitUntil(lambda: any("selection" in ev.reasons for ev in seen), timeout=1000)
+
+    count_after_layer1 = len(seen)
+
+    # Switch active layer
+    viewer.layers.selection.active = layer2
+    qtbot.waitUntil(lambda: len(seen) > count_after_layer1, timeout=1000)
+
+    count_after_active_switch = len(seen)
+
+    # Mutating old inactive layer selection should not produce a new callback
+    layer1.selected_data.select_only(1)
+    qtbot.wait(50)
+    assert len(seen) == count_after_active_switch
+
+    # Mutating new active layer selection should produce a callback
+    layer2.selected_data.select_only(1)
+    qtbot.waitUntil(lambda: len(seen) > count_after_active_switch, timeout=1000)
+    assert seen[-1].layer is not None
+    assert seen[-1].layer.name == layer2.name
+    assert "selection" in seen[-1].reasons
+
+    observer.close()

src/napari_deeplabcut/_tests/test_widgets.py

@@ -1,3 +1,7 @@
+"""
+NOTE: This file can be somewhat non-specific, please ensure functionalities from ui/ are tested
+in the _tests/ui folder and consider moving tests below to more specific files as needed."""
+
 # src/napari_deeplabcut/_tests/test_widgets.py
 import os
 import types
@@ -16,7 +20,7 @@
 from napari_deeplabcut.ui.color_scheme_display import ColorSchemeDisplay
 from napari_deeplabcut.ui.dialogs import ShortcutRow
 from napari_deeplabcut.ui.labels_and_dropdown import KeypointsDropdownMenu, LabelPair
-from napari_deeplabcut.ui.plots.trajectory import KeypointMatplotlibCanvas
+from napari_deeplabcut.ui.plots.trajectory import TrajectoryMatplotlibCanvas
 
 from .conftest import force_show
 
@@ -235,7 +239,7 @@ def test_color_scheme_display(qtbot):
 @pytest.mark.usefixtures("qtbot")
 def test_matplotlib_canvas_initialization_and_slider(viewer, points, qtbot):
     # Create the canvas widget
-    canvas = KeypointMatplotlibCanvas(viewer)
+    canvas = TrajectoryMatplotlibCanvas(viewer)
     qtbot.add_widget(canvas)
 
     # Simulate adding a Points layer (triggers _load_dataframe)
@@ -254,8 +258,11 @@ def test_matplotlib_canvas_initialization_and_slider(viewer, points, qtbot):
     assert canvas._window == initial_window + 100
     assert canvas.slider_value.text() == str(initial_window + 100)
 
-    # Test plot refresh on frame change
+    # Test plot refresh does nothing when plot is hidden
     canvas.update_plot_range(event=type("Event", (), {"value": [5]}))
+    assert canvas._n == 0
+    # Test plot refresh on frame change (forced as it is hidden)
+    canvas.update_plot_range(event=type("Event", (), {"value": [5]}), force=True)
     assert canvas._n == 5
     # Check that x-limits reflect the new window
     start, end = canvas.ax.get_xlim()
@@ -286,7 +293,7 @@ def fake_add_dock_widget(*args, **kwargs):
     # Ensure it wouldn't try to dock again
     monkeypatch.setattr(controls.viewer.window, "add_dock_widget", fake_add_dock_widget)
 
-    controls._ensure_mpl_canvas_docked()
+    controls._ensure_traj_canvas_docked()
     assert called["count"] == 0, "add_dock_widget should not be called when already docked"
     assert controls._mpl_docked is True  # stays docked
 
@@ -301,7 +308,7 @@ def test_ensure_mpl_canvas_docked_missing_window(keypoint_controls, qtbot):
     controls.viewer = types.SimpleNamespace()  # no 'window'
 
     controls._mpl_docked = False
-    controls._ensure_mpl_canvas_docked()
+    controls._ensure_traj_canvas_docked()
 
     # Nothing should change; crucially, no exceptions should be raised
     assert controls._mpl_docked is False
@@ -322,11 +329,11 @@ def test_trajectory_loader_ignores_invalid_properties(viewer, keypoint_controls,
 
     layer = viewer.add_points(np.array([[0.0, 10.0, 20.0]]), **md)
     assert layer is not None
-    assert keypoint_controls._matplotlib_canvas.df is None  # loader should have bailed out safely
+    assert keypoint_controls._traj_mpl_canvas.df is None  # loader should have bailed out safely
 
 
 @pytest.mark.usefixtures("qtbot")
-def test_ensure_mpl_canvas_docked_missing_qt_window(keypoint_controls, qtbot):
+def test_ensure_traj_canvas_docked_missing_qt_window(keypoint_controls, qtbot):
     """If window._qt_window is None, method should safely no-op."""
     controls = keypoint_controls
     qtbot.add_widget(controls)
@@ -341,7 +348,7 @@ def add_dock_widget(self, *args, **kwargs):
     controls.viewer = types.SimpleNamespace(window=DummyWindow())
 
     controls._mpl_docked = False
-    controls._ensure_mpl_canvas_docked()
+    controls._ensure_traj_canvas_docked()
 
     # Still undocked, no crash
     assert controls._mpl_docked is False
@@ -365,7 +372,7 @@ def add_dock_widget(self, *args, **kwargs):
     controls._mpl_docked = False
 
     # Should not raise
-    controls._ensure_mpl_canvas_docked()
+    controls._ensure_traj_canvas_docked()
 
     # Docking failed → remains undocked
     assert controls._mpl_docked is False