Skip to content

Commit 1af4e64

Browse files
authored
Merge pull request #137 from dstansby/scatter-test
Add scatter figure test
2 parents cb940ab + ae06a7a commit 1af4e64

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

Diff for: src/napari_matplotlib/base.py

+1
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ def _update_layers(self, event: napari.utils.events.Event) -> None:
183183
Update the ``layers`` attribute with currently selected layers and re-draw.
184184
"""
185185
self.layers = list(self.viewer.layers.selection)
186+
self.layers = sorted(self.layers, key=lambda layer: layer.name)
186187
self.on_update_layers()
187188
self._draw()
188189

11.6 KB
Loading

Diff for: src/napari_matplotlib/tests/test_scatter.py

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
1+
from copy import deepcopy
12
from typing import Any, Dict, Tuple
23

34
import numpy as np
45
import numpy.typing as npt
6+
import pytest
57

68
from napari_matplotlib import FeaturesScatterWidget, ScatterWidget
79

810

9-
def test_scatter(make_napari_viewer):
10-
# Smoke test adding a scatter widget
11+
@pytest.mark.mpl_image_compare
12+
def test_scatter(make_napari_viewer, astronaut_data):
1113
viewer = make_napari_viewer()
12-
viewer.add_image(np.random.random((100, 100)))
13-
viewer.add_image(np.random.random((100, 100)))
14-
ScatterWidget(viewer)
14+
widget = ScatterWidget(viewer)
15+
fig = widget.figure
16+
17+
viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
18+
19+
viewer.add_image(
20+
astronaut_data[0] * -1, **astronaut_data[1], name="astronaut_reversed"
21+
)
22+
# De-select existing selection
23+
viewer.layers.selection.clear()
24+
25+
# Select images
26+
viewer.layers.selection.add(viewer.layers[0])
27+
viewer.layers.selection.add(viewer.layers[1])
28+
29+
return deepcopy(fig)
1530

1631

1732
def test_features_scatter_widget(make_napari_viewer):

0 commit comments

Comments
 (0)