X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/ce8b3198a767da7c4ecdac7d39a19084408386d7..e34ac48a7387f7c359c1987f3a58ebcca154697e:/imago.py?ds=sidebyside

diff --git a/imago.py b/imago.py
index 87b522e..127ddd9 100755
--- a/imago.py
+++ b/imago.py
@@ -10,7 +10,7 @@ import argparse
 try:
     import Image, ImageDraw
 except ImportError, msg:
-    print >>sys.stderr, msg
+    print >> sys.stderr, msg
     sys.exit(1)
 
 import im_debug
@@ -25,9 +25,9 @@ def main():
     
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('file', metavar='file', nargs=1,
-                        help="image to anlyse")
+                        help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
-                        help="scales image to the specified width before analysis")
+                        help="scale image to the specified width before analysis")
     parser.add_argument('-d', '--debug', dest='show_all', action='store_true',
                         help="show every step of the computation")
     parser.add_argument('-s', '--save', dest='do_something', action='store_const',
@@ -41,7 +41,7 @@ def main():
     try:
         image = Image.open(args.file[0])
     except IOError, msg:
-        print >>sys.stderr, msg
+        print >> sys.stderr, msg
         return 1
     if image.size[0] > args.w:
         image = image.resize((args.w, int((float(args.w)/image.size[0]) *
@@ -88,9 +88,13 @@ def main():
 
     im_h3 = filters.high_pass(im_hough2, 120)
     if show_all:
-        do_something(im_h3, "third high pass filters")
+        do_something(im_h3, "third high pass filter")
      
-    lines = hough2.find_angle_distance(im_h3)
+    im_h3 = filters.components(im_h3)
+    if show_all:
+        do_something(im_h3, "components centers 2")
+
+    lines = hough2.all_lines(im_h3)
 
     im_lines = Image.new('L', im_h2.size)
 
@@ -105,14 +109,13 @@ def main():
     if show_all:
         do_something(im_c, "first hough x lines")
 
-    collapse(im_c)
-    if show_all:
-        do_something(im_c, "optimalised hough")
-
     lines = hough1.all_lines(im_c)
+    intersections = intersections_from_angl_dist(lines)
     draw = ImageDraw.Draw(image)
-    for line in lines:
-        draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120))
+    for (x, y) in intersections:
+        draw.point((x + image.size[0] / 2, y + image.size[1] / 2), fill=(120, 255, 120))
+
+    print(len(intersections))
 
     do_something(image, "the grid")
 
@@ -127,20 +130,6 @@ def image_save(image, title=''):
     image.save(filename, 'JPEG')
     Saving_num += 1
 
-def collapse(image):
-    #HACK
-    im_l = image.load()
-    last = False
-    for y in xrange(image.size[1]):
-        for x in xrange(image.size[0]):
-            if im_l[x, y] and last:
-                im_l[x, y] = 0
-                last = False
-            elif im_l[x, y]:
-                last = True
-            elif last:
-                last = False
-
 def combine(image1, image2):
     im_l1 = image1.load()
     im_l2 = image2.load()
@@ -156,10 +145,20 @@ def combine(image1, image2):
 
 def line_from_angl_dist((angle, distance), size):
     x1 = - size[0] / 2
-    y1 = int(round((x1 * math.sin(angle) - distance)/math.cos(angle))) + size[1] / 2
+    y1 = int(round((x1 * math.sin(angle) - distance) / math.cos(angle))) + size[1] / 2
     x2 = size[0] / 2 
-    y2 = int(round((x2 * math.sin(angle) - distance)/math.cos(angle))) + size[1] / 2
+    y2 = int(round((x2 * math.sin(angle) - distance) / math.cos(angle))) + size[1] / 2
     return [(0, y1), (size[0] - 1, y2)]
 
+def intersections_from_angl_dist(lines):
+    intersections = set()
+    for (angl1, dist1) in lines:
+        for (angl2, dist2) in lines:
+            if abs(angl1 - angl2) > 0.3:
+                x =  - ((dist2 / math.cos(angl2))-(dist1 / math.cos(angl1))) / (math.tan(angl1) - math.tan(angl2))
+                y = (math.tan(angl1) * x) - (dist1 / math.cos(angl1))
+                intersections.add((int(x), int(y)))
+    return intersections
+
 if __name__ == '__main__':
     sys.exit(main())