wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-10 16:13:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1337 from jni/fix-label2rgb

Browse Source 
Fix `label2rgb` by adding default background color
This commit is contained in:
Stefan van der Walt
2015-01-13 16:08:40 -08:00
parent d24ce2b4ab eab2168846
commit e030e8c4c6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/color/colorlabel.py
+1 -1
View File
@@ -64,7 +64,7 @@ def _match_label_with_color(label, colors, bg_label, bg_color):
def label2rgb(label, image=None, colors=None, alpha=0.3,
bg_label=-1, bg_color=None, image_alpha=1, kind='overlay'):
bg_label=-1, bg_color=(0, 0, 0), image_alpha=1, kind='overlay'):
"""Return an RGB image where color-coded labels are painted over the image.
Parameters
skimage/color/tests/test_colorlabel.py
+13 -1
View File
@@ -91,9 +91,12 @@ def test_leave_labels_alone():
assert_array_equal(labels, labels_saved)
def test_avg():
# label image
label_field = np.array([[1, 1, 1, 2],
[1, 2, 2, 2],
[3, 3, 3, 3]], dtype=np.uint8)
# color image
r = np.array([[1., 1., 0., 0.],
[0., 0., 1., 1.],
[0., 0., 0., 0.]])
@@ -104,7 +107,8 @@ def test_avg():
[0., 1., 1., 1.],
[0., 0., 1., 1.]])
image = np.dstack((r, g, b))
out = label2rgb(label_field, image, kind='avg')
# reference label-colored image
rout = np.array([[0.5, 0.5, 0.5, 0.5],
[0.5, 0.5, 0.5, 0.5],
[0. , 0. , 0. , 0. ]])
@@ -115,14 +119,22 @@ def test_avg():
[0. , 1. , 1. , 1. ],
[0.5, 0.5, 0.5, 0.5]])
expected_out = np.dstack((rout, gout, bout))
# test standard averaging
out = label2rgb(label_field, image, kind='avg')
assert_array_equal(out, expected_out)
# test averaging with custom background value
out_bg = label2rgb(label_field, image, bg_label=2, bg_color=(0, 0, 0),
kind='avg')
expected_out_bg = expected_out.copy()
expected_out_bg[label_field == 2] = 0
assert_array_equal(out_bg, expected_out_bg)
# test default background color
out_bg = label2rgb(label_field, image, bg_label=2, kind='avg')
assert_array_equal(out_bg, expected_out_bg)
def test_negative_intensity():
labels = np.arange(100).reshape(10, 10)