From 8befed20bf6500f1e9872ab7548bfd9c64bfccbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sun, 18 Jan 2015 19:55:53 -0500 Subject: [PATCH 1/3] DOC: fix typos --- skimage/draw/_draw.pyx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx index 615d9937..b3f93755 100644 --- a/skimage/draw/_draw.pyx +++ b/skimage/draw/_draw.pyx @@ -305,7 +305,7 @@ def circle_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t radius, shape : tuple, optional Image shape which is used to determine maximum extents of output pixel coordinates. This is useful for circles which exceed the image size. - By default the full extents of the polygon are used. + By default the full extents of the circle are used. Returns ------- @@ -413,7 +413,7 @@ def circle_perimeter_aa(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t radius, shape : tuple, optional Image shape which is used to determine maximum extents of output pixel coordinates. This is useful for circles which exceed the image size. - By default the full extents of the polygon are used. + By default the full extents of the circle are used. Returns ------- @@ -501,7 +501,7 @@ def ellipse_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t yradius, shape : tuple, optional Image shape which is used to determine maximum extents of output pixel coordinates. This is useful for ellipses which exceed the image size. - By default the full extents of the polygon are used. + By default the full extents of the ellipse are used. Returns ------- @@ -776,7 +776,7 @@ def bezier_curve(Py_ssize_t y0, Py_ssize_t x0, shape : tuple, optional Image shape which is used to determine maximum extents of output pixel coordinates. This is useful for curves which exceed the image size. - By default the full extents of the polygon are used. + By default the full extents of the curve are used. Returns ------- From 310ddf6d6286c82145be713eccb8b82b47f2017b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sun, 18 Jan 2015 21:38:34 -0500 Subject: [PATCH 2/3] DOC: fix typo --- skimage/draw/_draw.pyx | 22 +++++++++++----------- skimage/draw/draw.py | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx index b3f93755..f7e6d368 100644 --- a/skimage/draw/_draw.pyx +++ b/skimage/draw/_draw.pyx @@ -19,7 +19,7 @@ def _coords_inside_image(rr, cc, shape, val=None): rr, cc : (N,) ndarray of int Indices of pixels. shape : tuple - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. val : ndarray of float, optional Values of pixels at coordinates [rr, cc]. @@ -223,9 +223,9 @@ def polygon(y, x, shape=None): x : (N,) ndarray X-coordinates of vertices of polygon. shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for polygons which exceed the image size. - By default the full extents of the polygon are used. + By default the full extent of the polygon are used. Returns ------- @@ -303,9 +303,9 @@ def circle_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t radius, bresenham : Bresenham method (default) andres : Andres method shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for circles which exceed the image size. - By default the full extents of the circle are used. + By default the full extent of the circle are used. Returns ------- @@ -411,9 +411,9 @@ def circle_perimeter_aa(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t radius, radius: int Radius of circle. shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for circles which exceed the image size. - By default the full extents of the circle are used. + By default the full extent of the circle are used. Returns ------- @@ -499,9 +499,9 @@ def ellipse_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t yradius, orientation : double, optional (default 0) Major axis orientation in clockwise direction as radians. shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for ellipses which exceed the image size. - By default the full extents of the ellipse are used. + By default the full extent of the ellipse are used. Returns ------- @@ -774,9 +774,9 @@ def bezier_curve(Py_ssize_t y0, Py_ssize_t x0, weight : double Middle control point weight, it describes the line tension. shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for curves which exceed the image size. - By default the full extents of the curve are used. + By default the full extent of the curve are used. Returns ------- diff --git a/skimage/draw/draw.py b/skimage/draw/draw.py index b6bc5588..be59e268 100644 --- a/skimage/draw/draw.py +++ b/skimage/draw/draw.py @@ -22,9 +22,9 @@ def ellipse(cy, cx, yradius, xradius, shape=None): yradius, xradius : double Minor and major semi-axes. ``(x/xradius)**2 + (y/yradius)**2 = 1``. shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for ellipses which exceed the image size. - By default the full extents of the ellipse are used. + By default the full extent of the ellipse are used. Returns ------- @@ -85,9 +85,9 @@ def circle(cy, cx, radius, shape=None): radius: double Radius of circle. shape : tuple, optional - Image shape which is used to determine maximum extents of output pixel + Image shape which is used to determine the maximum extent of output pixel coordinates. This is useful for circles which exceed the image size. - By default the full extents of the circle are used. + By default the full extent of the circle are used. Returns ------- From 6633ca9a7113f080bda1b40a8db962663115b917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Thu, 22 Jan 2015 13:41:49 -0500 Subject: [PATCH 3/3] PEP8 --- skimage/draw/_draw.pyx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx index f7e6d368..649f69f2 100644 --- a/skimage/draw/_draw.pyx +++ b/skimage/draw/_draw.pyx @@ -19,8 +19,8 @@ def _coords_inside_image(rr, cc, shape, val=None): rr, cc : (N,) ndarray of int Indices of pixels. shape : tuple - Image shape which is used to determine the maximum extent of output pixel - coordinates. + Image shape which is used to determine the maximum extent of output + pixel coordinates. val : ndarray of float, optional Values of pixels at coordinates [rr, cc]. @@ -223,9 +223,9 @@ def polygon(y, x, shape=None): x : (N,) ndarray X-coordinates of vertices of polygon. shape : tuple, optional - Image shape which is used to determine the maximum extent of output pixel - coordinates. This is useful for polygons which exceed the image size. - By default the full extent of the polygon are used. + Image shape which is used to determine the maximum extent of output + pixel coordinates. This is useful for polygons which exceed the image + size. By default the full extent of the polygon are used. Returns ------- @@ -774,9 +774,9 @@ def bezier_curve(Py_ssize_t y0, Py_ssize_t x0, weight : double Middle control point weight, it describes the line tension. shape : tuple, optional - Image shape which is used to determine the maximum extent of output pixel - coordinates. This is useful for curves which exceed the image size. - By default the full extent of the curve are used. + Image shape which is used to determine the maximum extent of output + pixel coordinates. This is useful for curves which exceed the image + size. By default the full extent of the curve are used. Returns -------