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

MAINT: val in [0,1]

Browse Source
This commit is contained in:
François Boulogne
2013-08-27 16:47:21 +02:00
parent a4f1704d6e
commit d998166ede
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/draw/_draw.pyx
+6 -6
View File
@@ -105,7 +105,7 @@ def line_aa(Py_ssize_t y1, Py_ssize_t x1, Py_ssize_t y2, Py_ssize_t x2):
Returns
-------
rr, cc, val : (N,) ndarray of int
rr, cc, val : (N,) ndarray of (int, int, float)
Indices of pixels that belong to the line.
May be used to directly index into an array, e.g.
``img[rr, cc] = val``.
@@ -144,7 +144,7 @@ def line_aa(Py_ssize_t y1, Py_ssize_t x1, Py_ssize_t y2, Py_ssize_t x2):
while True:
cc.append(x)
rr.append(y)
val.append(255 * abs(err - dx + dy) / ed)
val.append(abs(err - dx + dy) / ed)
e = err
if 2 * e >= -dx:
if x == x2:
@@ -152,7 +152,7 @@ def line_aa(Py_ssize_t y1, Py_ssize_t x1, Py_ssize_t y2, Py_ssize_t x2):
if e + dy < ed:
cc.append(x)
rr.append(y + sign_y)
val.append(255 * abs(e + dy) / ed)
val.append(abs(e + dy) / ed)
err -= dy
x += sign_x
if 2 * e <= dy:
@@ -161,13 +161,13 @@ def line_aa(Py_ssize_t y1, Py_ssize_t x1, Py_ssize_t y2, Py_ssize_t x2):
if dx - e < ed:
cc.append(x)
rr.append(y)
val.append(255 * abs(dx - e) / ed)
val.append(abs(dx - e) / ed)
err += dx
y += sign_y
return (np.array(rr, dtype=np.intp),
np.array(cc, dtype=np.intp),
255 - np.array(val, dtype=np.intp))
1 - np.array(val, dtype=np.float))
def polygon(y, x, shape=None):
@@ -361,7 +361,7 @@ def circle_perimeter_aa(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t radius):
Returns
-------
rr, cc, val : (N,) ndarray of int
rr, cc, val : (N,) ndarray (int, int, float)
Indices of pixels (`rr`, `cc`) and intensity values (`val`).
``img[rr, cc] = val``.
skimage/draw/tests/test_draw.py
+2 -2
View File
@@ -63,7 +63,7 @@ def test_line_aa_horizontal():
img[rr, cc] = val
img_ = np.zeros((10, 10))
img_[0, :] = 255
img_[0, :] = 1
assert_array_equal(img, img_)
@@ -75,7 +75,7 @@ def test_line_aa_vertical():
img[rr, cc] = val
img_ = np.zeros((10, 10))
img_[:, 0] = 255
img_[:, 0] = 1
assert_array_equal(img, img_)