From 2131a9ddfd0cf6ebd39ccf9007968495cbdad36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sun, 21 Apr 2013 16:16:37 +0200 Subject: [PATCH] rename function bezier_curve to bezier_segment --- doc/examples/plot_shapes.py | 2 +- skimage/draw/__init__.py | 2 +- skimage/draw/_draw.pyx | 14 +++++++------- skimage/draw/tests/test_draw.py | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/examples/plot_shapes.py b/doc/examples/plot_shapes.py index 79da99b6..f44a989d 100644 --- a/doc/examples/plot_shapes.py +++ b/doc/examples/plot_shapes.py @@ -15,7 +15,7 @@ import numpy as np import matplotlib.pyplot as plt from skimage.draw import line, polygon, circle, circle_perimeter, \ - ellipse, ellipse_perimeter, bezier_curve + ellipse, ellipse_perimeter import numpy as np import math diff --git a/skimage/draw/__init__.py b/skimage/draw/__init__.py index 9875364e..38c114f7 100644 --- a/skimage/draw/__init__.py +++ b/skimage/draw/__init__.py @@ -1,6 +1,6 @@ from .draw import circle, ellipse, set_color from ._draw import line, polygon, ellipse_perimeter, circle_perimeter, \ - bezier_curve + bezier_segment __all__ = ['line', 'polygon', diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx index 9965af21..eba069be 100644 --- a/skimage/draw/_draw.pyx +++ b/skimage/draw/_draw.pyx @@ -384,27 +384,27 @@ def ellipse_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t yradius, iyd = int(floor(ya * w + 0.5)) # Draw the 4 quadrants - rr, cc = bezier_curve(iy0+iyd, ix0, iy0, ix0, iy0, ix0+ixd, 1-w) + rr, cc = bezier_segment(iy0+iyd, ix0, iy0, ix0, iy0, ix0+ixd, 1-w) py.extend(rr) px.extend(cc) - rr, cc = bezier_curve(iy0+iyd, ix0, iy1, ix0, iy1, ix1-ixd, w) + rr, cc = bezier_segment(iy0+iyd, ix0, iy1, ix0, iy1, ix1-ixd, w) py.extend(rr) px.extend(cc) - rr, cc = bezier_curve(iy1-iyd, ix1, iy1, ix1, iy1, ix1-ixd, 1-w) + rr, cc = bezier_segment(iy1-iyd, ix1, iy1, ix1, iy1, ix1-ixd, 1-w) py.extend(rr) px.extend(cc) - rr, cc = bezier_curve(iy1-iyd, ix1, iy0, ix1, iy0, ix0+ixd, w) + rr, cc = bezier_segment(iy1-iyd, ix1, iy0, ix1, iy0, ix0+ixd, w) py.extend(rr) px.extend(cc) return np.array(py, dtype=np.intp), np.array(px, dtype=np.intp) -def bezier_curve(Py_ssize_t y0, Py_ssize_t x0, +def bezier_segment(Py_ssize_t y0, Py_ssize_t x0, Py_ssize_t y1, Py_ssize_t x1, Py_ssize_t y2, Py_ssize_t x2, double weight): - """Generate Bezier curve coordinates. + """Generate Bezier segment coordinates. Parameters ---------- @@ -492,7 +492,7 @@ def bezier_curve(Py_ssize_t y0, Py_ssize_t x0, sy = floor((y0 + 2 * weight * y1 + y2) * xy * 0.5 + 0.5) dx = floor((weight * x1 + x0) * xy + 0.5) dy = floor((y1 * weight + y0) * xy + 0.5) - return bezier_curve(y0, x0, int(dy), int(dx), int(sy), int(sx), cur) + return bezier_segment(y0, x0, int(dy), int(dx), int(sy), int(sx), cur) err = dx + dy - xy while dy <= xy and dx >= xy: diff --git a/skimage/draw/tests/test_draw.py b/skimage/draw/tests/test_draw.py index 19ebe6d8..ee600b87 100644 --- a/skimage/draw/tests/test_draw.py +++ b/skimage/draw/tests/test_draw.py @@ -2,7 +2,7 @@ from numpy.testing import assert_array_equal import numpy as np from skimage.draw import line, polygon, circle, circle_perimeter, \ - ellipse, ellipse_perimeter, bezier_curve + ellipse, ellipse_perimeter, bezier_segment def test_line_horizontal(): @@ -345,7 +345,7 @@ def test_ellipse_perimeter_nzeroangle(): assert_array_equal(img, img_) -def test_bezier_curve(): +def test_bezier_segment(): image = np.zeros((200, 200), dtype=int) x0 = 50 y0 = 50 @@ -353,7 +353,7 @@ def test_bezier_curve(): y1 = 50 x2 = 150 y2 = 150 - rr, cc = bezier_curve(x0, y0, x1, y1, x2, y2, 0) + rr, cc = bezier_segment(x0, y0, x1, y1, x2, y2, 0) image [rr, cc] = 1 image2 = np.zeros((200, 200), dtype=int)