From 727ed9212a65120ff2fbf724b27f07971afbacae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 27 Apr 2013 15:59:37 +0200 Subject: [PATCH] Fix hough line examples --- doc/examples/plot_hough_transform.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/examples/plot_hough_transform.py b/doc/examples/plot_hough_transform.py index b15df92e..47b24c13 100644 --- a/doc/examples/plot_hough_transform.py +++ b/doc/examples/plot_hough_transform.py @@ -59,7 +59,8 @@ References ''' -from skimage.transform import hough_line, hough_peaks, probabilistic_hough +from skimage.transform import (hough_line, hough_line_peaks, + probabilistic_hough_line) from skimage.filter import canny from skimage import data @@ -97,7 +98,7 @@ plt.ylabel('Distance (pixels)') plt.subplot(133) plt.imshow(image, cmap=plt.cm.gray) rows, cols = image.shape -for _, angle, dist in zip(*hough_peaks(h, theta, d)): +for _, angle, dist in zip(*hough_line_peaks(h, theta, d)): y0 = (dist - 0 * np.cos(angle)) / np.sin(angle) y1 = (dist - cols * np.cos(angle)) / np.sin(angle) plt.plot((0, cols), (y0, y1), '-r') @@ -108,7 +109,7 @@ plt.title('Detected lines') image = data.camera() edges = canny(image, 2, 1, 25) -lines = probabilistic_hough(edges, threshold=10, line_length=5, line_gap=3) +lines = probabilistic_hough_line(edges, threshold=10, line_length=5, line_gap=3) plt.figure(figsize=(8, 3))