|
6 | 6 | import pytest
|
7 | 7 | from napari.viewer import Viewer
|
8 | 8 |
|
9 |
| -from napari_matplotlib import HistogramWidget, SliceWidget |
| 9 | +from napari_matplotlib import ( |
| 10 | + FeaturesScatterWidget, |
| 11 | + HistogramWidget, |
| 12 | + SliceWidget, |
| 13 | +) |
10 | 14 | from napari_matplotlib.base import NapariMPLWidget
|
11 | 15 | from napari_matplotlib.tests.helpers import (
|
12 | 16 | assert_figures_equal,
|
@@ -39,10 +43,48 @@ def assert_one_layer_plot_changes(
|
39 | 43 | by `widget_cls` also changes.
|
40 | 44 | """
|
41 | 45 | widget = widget_cls(viewer)
|
42 |
| - |
43 | 46 | viewer.add_image(data1[0], **data1[1])
|
44 | 47 | viewer.add_image(data2[0], **data2[1])
|
| 48 | + assert_plot_changes(viewer, widget) |
| 49 | + |
45 | 50 |
|
| 51 | +@pytest.mark.parametrize("widget_cls", [FeaturesScatterWidget]) |
| 52 | +def test_change_features_layer( |
| 53 | + make_napari_viewer, points_with_features_data, widget_cls |
| 54 | +): |
| 55 | + """ |
| 56 | + Test all widgets that take one layer with features as input to make sure the |
| 57 | + plot changes when the napari layer selection changes. |
| 58 | + """ |
| 59 | + viewer = make_napari_viewer() |
| 60 | + assert_features_plot_changes(viewer, widget_cls, points_with_features_data) |
| 61 | + |
| 62 | + |
| 63 | +def assert_features_plot_changes( |
| 64 | + viewer: Viewer, |
| 65 | + widget_cls: Type[NapariMPLWidget], |
| 66 | + data: Tuple[npt.NDArray[np.generic], Dict[str, Any]], |
| 67 | +) -> None: |
| 68 | + """ |
| 69 | + When the selected layer is changed, make sure the plot generated |
| 70 | + by `widget_cls` also changes. |
| 71 | + """ |
| 72 | + widget = widget_cls(viewer) |
| 73 | + viewer.add_points(data[0], **data[1]) |
| 74 | + # Change the features data for the second layer |
| 75 | + data[1]["features"] = { |
| 76 | + name: data + 1 for name, data in data[1]["features"].items() |
| 77 | + } |
| 78 | + viewer.add_points(data[0], **data[1]) |
| 79 | + assert_plot_changes(viewer, widget) |
| 80 | + |
| 81 | + |
| 82 | +def assert_plot_changes(viewer: Viewer, widget: NapariMPLWidget) -> None: |
| 83 | + """ |
| 84 | + Assert that a widget plot changes when the layer selection |
| 85 | + is changed. The passed viewer must already have two layers |
| 86 | + loaded. |
| 87 | + """ |
46 | 88 | # Select first layer
|
47 | 89 | viewer.layers.selection.clear()
|
48 | 90 | viewer.layers.selection.add(viewer.layers[0])
|
|
0 commit comments