wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-15 12:54:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

change bezier_curve definition for consistency

Browse Source
This commit is contained in:
François Boulogne
2013-05-28 07:56:12 +02:00
parent 328e54fa13
commit 1710b12665
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/draw/_draw.pyx
+11 -11
View File
@@ -384,35 +384,35 @@ 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(ix0, iy0+iyd, ix0, iy0, ix0+ixd, iy0, 1-w)
rr, cc = bezier_curve(iy0+iyd, ix0, iy0, ix0, iy0, ix0+ixd, 1-w)
py.extend(rr)
px.extend(cc)
rr, cc = bezier_curve(ix0, iy0+iyd, ix0, iy1, ix1-ixd, iy1, w)
rr, cc = bezier_curve(iy0+iyd, ix0, iy1, ix0, iy1, ix1-ixd, w)
py.extend(rr)
px.extend(cc)
rr, cc = bezier_curve(ix1, iy1-iyd, ix1, iy1, ix1-ixd, iy1, 1-w)
rr, cc = bezier_curve(iy1-iyd, ix1, iy1, ix1, iy1, ix1-ixd, 1-w)
py.extend(rr)
px.extend(cc)
rr, cc = bezier_curve(ix1, iy1-iyd, ix1, iy0, ix0+ixd, iy0, w)
rr, cc = bezier_curve(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 x0, Py_ssize_t y0,
Py_ssize_t x1, Py_ssize_t y1,
Py_ssize_t x2, Py_ssize_t y2,
def bezier_curve(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 a Bezier curve coordinates.
Parameters
----------
x0, y0 : int
y0, x0 : int
Coordinates of the first point
x1, y1 : int
y1, x1 : int
Coordinates of the middle point
x2, y2 : int
y2, x2 : int
Coordinates of the last point
weight : double
Middle point weight, it describes the line tension.
@@ -487,7 +487,7 @@ def bezier_curve(Py_ssize_t x0, Py_ssize_t y0,
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(x0, y0, int(dx), int(dy), int(sx), int(sy), cur)
return bezier_curve(y0, x0, int(dy), int(dx), int(sy), int(sx), cur)
err = dx + dy - xy
while dy <= xy and dx >= xy: