Skip to content

Commit 7f675f2

Browse files
authored
Merge pull request #152 from ruaridhg/scatter-test-3D-data
3D scatter test
2 parents 9e540ec + e0b3acf commit 7f675f2

File tree

6 files changed

+29
-0
lines changed

6 files changed

+29
-0
lines changed
143 Bytes
Loading
-34 Bytes
Loading
Loading

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

+23
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,26 @@ def test_scatter_2D(make_napari_viewer, astronaut_data):
2323
viewer.layers.selection.add(viewer.layers[0])
2424
viewer.layers.selection.add(viewer.layers[1])
2525
return deepcopy(fig)
26+
27+
28+
@pytest.mark.mpl_image_compare
29+
def test_scatter_3D(make_napari_viewer, brain_data):
30+
viewer = make_napari_viewer()
31+
widget = ScatterWidget(viewer)
32+
fig = widget.figure
33+
34+
viewer.add_image(brain_data[0], **brain_data[1], name="brain")
35+
36+
viewer.add_image(
37+
brain_data[0] * -1, **brain_data[1], name="brain_reversed"
38+
)
39+
# De-select existing selection
40+
viewer.layers.selection.clear()
41+
axis = viewer.dims.last_used
42+
slice_no = brain_data[0].shape[0] - 1
43+
viewer.dims.set_current_step(axis, slice_no)
44+
# Select images
45+
viewer.layers.selection.add(viewer.layers[0])
46+
viewer.layers.selection.add(viewer.layers[1])
47+
48+
return deepcopy(fig)

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

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ def test_histogram_2D(make_napari_viewer, astronaut_data):
2323
def test_histogram_3D(make_napari_viewer, brain_data):
2424
viewer = make_napari_viewer()
2525
viewer.add_image(brain_data[0], **brain_data[1])
26+
axis = viewer.dims.last_used
27+
slice_no = brain_data[0].shape[0] - 1
28+
viewer.dims.set_current_step(axis, slice_no)
2629
fig = HistogramWidget(viewer).figure
2730
# Need to return a copy, as original figure is too eagerley garbage
2831
# collected by the widget

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

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
def test_slice_3D(make_napari_viewer, brain_data):
1010
viewer = make_napari_viewer()
1111
viewer.add_image(brain_data[0], **brain_data[1])
12+
axis = viewer.dims.last_used
13+
slice_no = brain_data[0].shape[0] - 1
14+
viewer.dims.set_current_step(axis, slice_no)
1215
fig = SliceWidget(viewer).figure
1316
# Need to return a copy, as original figure is too eagerley garbage
1417
# collected by the widget

0 commit comments

Comments
 (0)