X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/841662dc25b40dce151a0bf7a024e55682028f18..78ff145bbc5a1323c889b174d0f93ab30bfc0efe:/src/manual.py?ds=inline diff --git a/src/manual.py b/src/manual.py index f6f3807..4030104 100644 --- a/src/manual.py +++ b/src/manual.py @@ -76,14 +76,16 @@ def find_lines(im_orig): def lines(corners): # TODO Error on triangle + corners.sort() # TODO does this help? + # TODO refactor this vvv cor_d = [(corners[0], (c[0] - corners[0][0], c[1] - corners[0][1]), c) for c in corners[1:]] cor_d = [(float(a[0] * b[0] + a[1] * b[1]) / (sqrt(a[0] ** 2 + a[1] ** 2) * sqrt(b[0] **2 + b[1] ** 2)), a[0] * b[1] - b[0] * a[1], c) for a, b, c in cor_d] cor_d = sorted([(copysign(acos(min(a, 1)), b), c) for a, b, c in cor_d]) corners = [corners[0]] + [c for _, c in cor_d] - return (_lines(corners, 0) + [(corners[0], corners[3]), - (corners[1], corners[2])], + return (_lines(corners, 0) + + [(corners[0], corners[3]), (corners[1], corners[2])], _lines(corners[1:4] + [corners[0]], 0) + [(corners[0], corners[1]), (corners[2], corners[3])]) @@ -91,8 +93,8 @@ def _lines(corners, n): # TODO what is this? 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]], 1) + [x] + + _lines([x[0], corners[1], corners[2], x[1]], 1)) else: x = half_line(corners) c = intersection(line(x[0], corners[2]), line(corners[1], corners[3]))