output bug fixed

[imago.git] / intrsc.py

diff --git a/intrsc.py b/intrsc.py
index 00165b1..cefed90 100644 (file)
--- a/intrsc.py
+++ b/intrsc.py
@@ -1,17 +1,36 @@
-from math import cos, tan
+"""Imago intersections module"""
+
+from math import cos, tan, pi

 from operator import itemgetter
 
 import ImageDraw
 
 from operator import itemgetter
 
 import ImageDraw
 

+def dst(line):
+    """Return normalized line."""
+    if line[0] < pi / 2:
+        line = line[0] + pi, - line[1]
+    return line
+
+def dst_sort(lines):
+    """Return lines sorted by distance."""
+    l_max = max(l[0] for l in lines)
+    l_min = min(l[0] for l in lines)
+    if l_max - l_min > (3. / 4) * pi:
+        lines = [dst(l) for l in lines]
+    lines.sort(key=itemgetter(1))
+    return lines
+

 def board(image, lines, show_all, do_something):
 def board(image, lines, show_all, do_something):

+    """Compute intersections, find stone colors and return board situation."""
+    lines = [dst_sort(l) for l in lines]

     intersections = intersections_from_angl_dist(lines, image.size)
     intersections = intersections_from_angl_dist(lines, image.size)

-    image_g = image.copy()
-    draw = ImageDraw.Draw(image_g)
-    for line in intersections:
-        for (x, y) in line:
-            draw.point((x , y), fill=(120, 255, 120))

 
     if show_all:
 
     if show_all:

+        image_g = image.copy()
+        draw = ImageDraw.Draw(image_g)
+        for line in intersections:
+            for (x, y) in line:
+                draw.point((x , y), fill=(120, 255, 120))

         do_something(image_g, "intersections")
 
     board_r = []
         do_something(image_g, "intersections")
 
     board_r = []


@@ -21,22 +40,25 @@ def board(image, lines, show_all, do_something):
                       line])
     return board_r
 
                       line])
     return board_r
 

-def intersections_from_angl_dist(lines, size, get_all=False):
+def intersections_from_angl_dist(lines, size, get_all=True):
+    """Take grid-lines and size of the image. Return intersections."""

     intersections = []
     intersections = []

-    for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
+    for (angl1, dist1) in lines[1]:

         line = []
         line = []

-        for (angl2, dist2) in sorted(lines[0], key=itemgetter(1)):
+        for (angl2, dist2) in lines[0]:

             if abs(angl1 - angl2) > 0.4:
             if abs(angl1 - angl2) > 0.4:

-                x =  (- ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) 
+                i_x =  (- ((dist2 / cos(angl2)) - (dist1 / cos(angl1))) 

                         / (tan(angl1) - tan(angl2)))
                         / (tan(angl1) - tan(angl2)))

-                y = (tan(angl1) * x) - (dist1 / cos(angl1))
-                if get_all or (-size[0] / 2 < x < size[0] / 2 and 
-                    -size[1] / 2 < y < size[1] / 2):
-                    line.append((int(x + size[0] / 2), int(y + size[1] / 2)))
+                i_y = (tan(angl1) * i_x) - (dist1 / cos(angl1))
+                if get_all or (-size[0] / 2 < i_x < size[0] / 2 and 
+                    -size[1] / 2 < i_y < size[1] / 2):
+                    line.append((int(i_x + size[0] / 2),
+                                 int(i_y + size[1] / 2)))

         intersections.append(line)
     return intersections
    
 def stone_color(image, (x, y)):
         intersections.append(line)
     return intersections
    
 def stone_color(image, (x, y)):

+    """Given image and coordinates, return stone color."""

     suma = 0.
     for i in range(-2, 3):
         for j in range(-2, 3):
     suma = 0.
     for i in range(-2, 3):
         for j in range(-2, 3):