From da5a2a82213e01fc9b9d98f31cf740c6d3aa7767 Mon Sep 17 00:00:00 2001 From: "Josh Warner (Mac)" Date: Tue, 20 Nov 2012 01:11:31 -0600 Subject: [PATCH] BUG - Now parsing all unique labels != 0 properly, and set threshold_rel=0 in is_local_maximum() wrapper. --- skimage/feature/peak.py | 4 +++- skimage/morphology/watershed.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/skimage/feature/peak.py b/skimage/feature/peak.py index fcd088c6..ea2ace3e 100644 --- a/skimage/feature/peak.py +++ b/skimage/feature/peak.py @@ -106,8 +106,10 @@ def peak_local_max(image, min_distance=10, threshold_abs=0, threshold_rel=0.1, labels[mask] = rank_order(labels[mask])[0].astype(labels.dtype) labels = labels.astype(np.int32) + # New values for new ordering + label_values = np.unique(labels) out = np.zeros_like(image) - for label in labels: + for label in label_values[label_values != 0]: maskim = (labels == label) out += peak_local_max(image * maskim, min_distance=min_distance, threshold_abs=threshold_abs, diff --git a/skimage/morphology/watershed.py b/skimage/morphology/watershed.py index f4c5a816..b6ae2d07 100644 --- a/skimage/morphology/watershed.py +++ b/skimage/morphology/watershed.py @@ -294,8 +294,8 @@ def is_local_maximum(image, labels=None, footprint=None): """ return peak_local_max(image, labels=labels, min_distance=1, - footprint=footprint, indices=False, - exclude_border=False) + threshold_rel=0, footprint=footprint, + indices=False, exclude_border=False) # ---------------------- deprecated ------------------------------