Skip to content

Commit 1225260

Browse files
committed
add condition to check for viewer
- also update tests
1 parent b339034 commit 1225260

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

napari_crop/_function.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ def crop_region(
4646
cropped_list = []
4747
new_layer_index = 0
4848
new_name = layer_props["name"] + " cropped [0]"
49-
# Get existing layer names in viewer
50-
names_list = [layer.name for layer in viewer.layers]
49+
names_list = []
50+
if viewer is not None:
51+
# Get existing layer names in viewer
52+
names_list = [layer.name for layer in viewer.layers]
5153
for shape_count, [shape, shape_type] in enumerate(zip(shapes,
5254
shape_types)):
5355
# move shape vertices to within image coordinate limits

napari_crop/_tests/test_function.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_crop_function_values_2d(make_napari_viewer, shape, shape_type,
5757
viewer = make_napari_viewer()
5858
img_layer = viewer.add_image(arr_2d)
5959
shapes_layer = viewer.add_shapes(shape, shape_type=shape_type)
60-
cropped_actual = crop_region(viewer, img_layer, shapes_layer)
60+
cropped_actual = crop_region(img_layer, shapes_layer)
6161
cropped_actual_arrays = [cropped[0] for cropped in cropped_actual][0]
6262
assert np.array_equal(crop_expected, cropped_actual_arrays)
6363

@@ -68,7 +68,7 @@ def test_crop_multiple_shapes(make_napari_viewer):
6868
viewer = make_napari_viewer()
6969
img_layer = viewer.add_image(arr_2d)
7070
shapes_layer = viewer.add_shapes(shapes, shape_type=shape_types)
71-
cropped_actual = crop_region(viewer, img_layer, shapes_layer)
71+
cropped_actual = crop_region(img_layer, shapes_layer, viewer=viewer)
7272

7373
assert len(shapes) == len(cropped_actual)
7474

@@ -115,7 +115,7 @@ def test_crop_function_nd(layer_data, rgb, layer_type, shape_data, shape_type,
115115
nlayers = len(viewer.layers)
116116

117117
# Get first tuple element (data) of first list element (LayerDataTuple)
118-
cropped_data = crop_region(viewer, layer, shapes_layer)[0][0]
118+
cropped_data = crop_region(layer, shapes_layer)[0][0]
119119
viewer.add_image(cropped_data)
120120

121121
assert len(viewer.layers) == nlayers + 1

0 commit comments

Comments
 (0)