less parameters for manual.lines

[imago.git] / manual.py

diff --git a/manual.py b/manual.py
index f774c7b..83e024e 100644 (file)
--- a/manual.py
+++ b/manual.py
@@ -11,7 +11,7 @@ class Screen:
     def __init__(self, res):
         pygame.init()
         pygame.display.set_mode(res)
-        pygame.display.set_caption("Go image capture")
+        pygame.display.set_caption("Imago manual mode")
         self._screen = pygame.display.get_surface()
 
     def display_picture(self, im):
@@ -32,7 +32,7 @@ def find_lines(im_orig):
                  fill=(255, 64, 64))
     corners = []
     color=(64, 64, 255)
-    line_width = 2
+    line_width = 1
     lines_r = []
 
     while not done:
@@ -61,20 +61,20 @@ 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]),
                                    (corners[1], corners[2])]
                         l_hor += [(corners[0], corners[1]),
                                    (corners[2], corners[3])]
-                        l_vert = sorted(l_vert)
-                        l_hor = sorted(l_hor)
-                        for i in [3, 8, 14]:
-                            for j in [3, 8, 14]:
+                        l_vert.sort()
+                        l_hor.sort()
+                        for i in [3, 9, 15]:
+                            for j in [3, 9, 15]:
                                 hoshi(intersection(line(l_vert[i][0], l_vert[i][1]),
                                                    line(l_hor[j][0], l_hor[j][1])))
                         lines_r = [[l2ad(l[0], l[1], im.size) for l in l_vert], 
@@ -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]
 
@@ -139,6 +142,11 @@ def l2ad(a, b, size):
         q = float(a[1] - b[1]) / (a[0] - b[0])
         angle = atan(q)
 
+    if angle < 0:
+        angle += pi
+    if angle > pi:
+        angle -= pi
+
     distance = (((a[0] - (size[0] / 2)) * sin(angle)) + 
                 ((a[1] - (size[1] / 2)) * - cos(angle)))
     return (angle, distance)