threaded error surface plotting

[imago.git] / manual.py

diff --git a/manual.py b/manual.py
index 1d06035..e60a848 100644 (file)
--- a/manual.py
+++ b/manual.py
@@ -65,8 +65,8 @@ def find_lines(im_orig):
                             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])))
                             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], 
-                                   [l2ad(l[0], l[1], im.size) for l in l_hor]]
+                        lines_r = [[l2ad(l, im.size) for l in l_vert], 
+                                   [l2ad(l, im.size) for l in l_hor]]

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


@@ -139,7 +139,7 @@ def intersection(p, q):
     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 (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):
+def l2ad((a, b), size):

     if (a[0] - b[0]) == 0:
         angle = pi / 2
     else:
     if (a[0] - b[0]) == 0:
         angle = pi / 2
     else: