From b1628e07adb94258ca0b7de7f466bcf5ca004fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Tue, 12 Mar 2013 20:31:33 +0100 Subject: [PATCH 1/4] fix comment --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f50ba1ac..3a127d3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # vim ft=yaml # travis-ci.org definition for skimage build # -# We pretend to be erlang because we need can't use the python support in +# We pretend to be erlang because we can't use the python support in # travis-ci; it uses virtualenvs, they do not have numpy, scipy, matplotlib, # and it is impractical to build them From a3d73bdd61ba1685c1038af6658edb8682eb1a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 16 Mar 2013 13:25:01 +0100 Subject: [PATCH 2/4] DOC: minor fix ellipse_perim. --- skimage/draw/_draw.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx index 4316cadc..ee2b89e0 100644 --- a/skimage/draw/_draw.pyx +++ b/skimage/draw/_draw.pyx @@ -293,12 +293,12 @@ def ellipse_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t yradius, cy, cx : int Centre coordinate of ellipse. yradius, xradius: int - Main radial values. + Minor and major semi-axes. ``(x/xradius)**2 + (y/yradius)**2 = 1``. Returns ------- rr, cc : (N,) ndarray of int - Indices of pixels that belong to the circle perimeter. + Indices of pixels that belong to the ellipse perimeter. May be used to directly index into an array, e.g. ``img[rr, cc] = 1``. From 6b1c809a784d6d8b5c7c45da2fae187801999a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Tue, 19 Mar 2013 21:16:34 +0100 Subject: [PATCH 3/4] DOC: add docstring for deprecation --- skimage/transform/hough_transform.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/skimage/transform/hough_transform.py b/skimage/transform/hough_transform.py index e83cecd5..8abcfa32 100644 --- a/skimage/transform/hough_transform.py +++ b/skimage/transform/hough_transform.py @@ -100,6 +100,9 @@ from skimage._shared.utils import deprecated @deprecated('hough_line') def hough(img, theta=None): + """ + This function is deprecated. Use `hough_line` instead. + """ return hough_line(img, theta) from ._hough_transform import _hough_circle From cebc9839e4dd5bf63b98e34be4fe58d23b41b2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Tue, 19 Mar 2013 21:18:30 +0100 Subject: [PATCH 4/4] Fix mistake in example --- doc/source/plots/hough_tf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/plots/hough_tf.py b/doc/source/plots/hough_tf.py index 8b745864..42aa9c48 100644 --- a/doc/source/plots/hough_tf.py +++ b/doc/source/plots/hough_tf.py @@ -20,8 +20,8 @@ plt.title('Input image') plt.subplot(1, 2, 2) plt.imshow(out, cmap=plt.cm.bone, - extent=(d[0], d[-1], - np.rad2deg(angles[0]), np.rad2deg(angles[-1]))) + extent=(np.rad2deg(angles[0]), np.rad2deg(angles[-1]), + d[0], d[-1])) plt.title('Hough transform') plt.xlabel('Angle (degree)') plt.ylabel('Distance (pixel)')