Skip to content

Commit 162d9dc

Browse files
committed
squash commit on branch
1 parent 9598eeb commit 162d9dc

File tree

3 files changed

+29
-7
lines changed

3 files changed

+29
-7
lines changed
Loading

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

+29-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
@pytest.mark.mpl_image_compare
12-
def test_scatter(make_napari_viewer, astronaut_data):
12+
def test_scatter_2D(make_napari_viewer, astronaut_data):
1313
viewer = make_napari_viewer()
1414
widget = ScatterWidget(viewer)
1515
fig = widget.figure
@@ -25,16 +25,38 @@ def test_scatter(make_napari_viewer, astronaut_data):
2525
# Select images
2626
viewer.layers.selection.add(viewer.layers[0])
2727
viewer.layers.selection.add(viewer.layers[1])
28-
2928
return deepcopy(fig)
3029

3130

32-
def test_features_scatter_widget(make_napari_viewer):
33-
# Smoke test adding a features scatter widget
31+
@pytest.mark.mpl_image_compare
32+
def test_features_scatter_widget_2D(make_napari_viewer):
3433
viewer = make_napari_viewer()
35-
viewer.add_image(np.random.random((100, 100)))
36-
viewer.add_labels(np.random.randint(0, 5, (100, 100)))
37-
FeaturesScatterWidget(viewer)
34+
widget = FeaturesScatterWidget(viewer)
35+
36+
# make the points data
37+
n_points = 100
38+
np.random.seed(10)
39+
points_data = 100 * np.random.random((100, 2))
40+
points_features = {
41+
"feature_0": np.random.random((n_points,)),
42+
"feature_1": np.random.random((n_points,)),
43+
"feature_2": np.random.random((n_points,)),
44+
}
45+
46+
viewer.add_points(points_data, features=points_features)
47+
# De-select existing selection
48+
viewer.layers.selection.clear()
49+
50+
# Select points data and chosen features
51+
viewer.layers.selection.add(
52+
viewer.layers["points_data"]
53+
) # images need to be selected
54+
widget.x_axis_key = "feature_0"
55+
widget.y_axis_key = "feature_1"
56+
57+
fig = widget.figure
58+
59+
return deepcopy(fig)
3860

3961

4062
def make_labels_layer_with_features() -> (

0 commit comments

Comments
 (0)