bugs in manual mode fixed

[imago.git] / manual.py

diff --git a/manual.py b/manual.py
index 658f601..c7f8e2b 100644 (file)
--- a/manual.py
+++ b/manual.py
@@ -2,6 +2,7 @@
 
 import pygame
 import Image, ImageDraw
 
 import pygame
 import Image, ImageDraw

+from math import atan, sin, cos, pi

 
 class UserQuitError(Exception):
     pass
 
 class UserQuitError(Exception):
     pass


@@ -31,19 +32,24 @@ def find_lines(im_orig):
                  fill=(255, 64, 64))
     corners = []
     color=(64, 64, 255)
                  fill=(255, 64, 64))
     corners = []
     color=(64, 64, 255)

-    line_width = 2
+    line_width = 1
+    lines_r = []
+

     while not done:
         for event in pygame.event.get():
     while not done:
         for event in pygame.event.get():

-            if event.type == pygame.QUIT:
+            if event.type == pygame.QUIT or event.type == pygame.KEYDOWN:

                 pygame.quit()
                 pygame.quit()

-                raise UserQuitError 
+                if len(corners) == 4:
+                    return lines_r
+                else:
+                    raise UserQuitError 

             if event.type == pygame.MOUSEBUTTONDOWN:
             if event.type == pygame.MOUSEBUTTONDOWN:

-               if len(corners) >= 4: 
+                if len(corners) >= 4: 

                     corners = []
                     im = im_orig.copy()
                     draw = ImageDraw.Draw(im)
 
                     corners = []
                     im = im_orig.copy()
                     draw = ImageDraw.Draw(im)
 

-               if len(corners) < 4:
+                if len(corners) < 4:

                     corners.append(pygame.mouse.get_pos())
                     draw.point(corners[:-1], fill=color)
                     if len(corners) == 4:
                     corners.append(pygame.mouse.get_pos())
                     draw.point(corners[:-1], fill=color)
                     if len(corners) == 4:


@@ -61,12 +67,18 @@ def find_lines(im_orig):
                         l_hor = lines(corners[1:4] + [corners[0]], 0)
                         for l in l_hor:
                             draw.line(l, fill=color, width=line_width)
                         l_hor = lines(corners[1:4] + [corners[0]], 0)
                         for l in l_hor:
                             draw.line(l, fill=color, width=line_width)

-                        l_vert = sorted(l_vert)
-                        l_hor = sorted(l_hor)
-                        for i in [3, 8, 14]:
-                            for j in [3, 8, 14]:
+                        l_vert += [(corners[0], corners[3]),
+                                   (corners[1], corners[2])]
+                        l_hor += [(corners[0], corners[1]),
+                                   (corners[2], corners[3])]
+                        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])))
                                 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], 
+                                   [l2ad(l[0], l[1], im.size) for l in l_hor]]

 
         screen.display_picture(im)
         clock.tick(15)
 
         screen.display_picture(im)
         clock.tick(15)


@@ -119,3 +131,19 @@ def intersection(p, q):
         return None
     return (int(round(float(q[1] * p[2] - p[1] * q[2]) / det)), 
             int(round(float(p[0] * q[2] - q[0] * p[2]) / det)))
         return None
     return (int(round(float(q[1] * p[2] - p[1] * q[2]) / det)), 
             int(round(float(p[0] * q[2] - q[0] * p[2]) / det)))

+
+def l2ad(a, b, size):
+    if (a[0] - b[0]) == 0:
+        angle = pi / 2
+    else:
+        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)