From: Tomas Musil Date: Sat, 13 Oct 2012 16:33:02 +0000 (+0200) Subject: less parameters for manual.lines X-Git-Url: http://git.tomasm.cz/imago.git/commitdiff_plain/bcca367769de787a06e04d957d49468975ac2616?ds=sidebyside less parameters for manual.lines --- diff --git a/manual.py b/manual.py index c5b702d..83e024e 100644 --- a/manual.py +++ b/manual.py @@ -61,10 +61,10 @@ def find_lines(im_orig): width=line_width) draw.line((corners[3], corners[0]), fill=color, width=line_width) - l_vert = lines(corners, 0) + l_vert = lines(corners) for l in l_vert: draw.line(l, fill=color, width=line_width) - l_hor = lines(corners[1:4] + [corners[0]], 0) + l_hor = lines(corners[1:4] + [corners[0]]) for l in l_hor: draw.line(l, fill=color, width=line_width) l_vert += [(corners[0], corners[3]), @@ -83,11 +83,14 @@ def find_lines(im_orig): screen.display_picture(im) clock.tick(15) -def lines(corners, n): +def lines(corners): + return _lines(corners, 0) + +def _lines(corners, n): if n == 0: x = half_line(corners) - return (lines([corners[0], x[0], x[1], corners[3]], n + 1) + [x] + - lines([x[0], corners[1], corners[2], x[1]], n + 1)) + return (_lines([corners[0], x[0], x[1], corners[3]], n + 1) + [x] + + _lines([x[0], corners[1], corners[2], x[1]], n + 1)) else: x = half_line(corners) c = intersection(line(x[0], corners[2]), line(corners[1], corners[3])) @@ -96,9 +99,9 @@ def lines(corners, n): intersection(line(corners[2], corners[3]), line(c,d))) l2 = half_line([corners[0], l[0], l[1], corners[3]]) if n == 1: - return ([l, l2] + lines([l[0], l2[0], l2[1], l[1]], 2) - + lines([corners[0], l2[0], l2[1], corners[3]], 2) - + lines([l[0], corners[1], corners[2], l[1]], 2)) + return ([l, l2] + _lines([l[0], l2[0], l2[1], l[1]], 2) + + _lines([corners[0], l2[0], l2[1], corners[3]], 2) + + _lines([l[0], corners[1], corners[2], l[1]], 2)) if n == 2: return [l, l2]