projekty / imago.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
code reorganisation
[imago.git] / imago.py
diff --git a/imago.py b/imago.py
index 511027b..ea9ee6c 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -6,16 +6,16 @@ import sys
 import os
 import math
 import argparse
 import os
 import math
 import argparse
+from operator import itemgetter
 
 try:
     import Image, ImageDraw
 except ImportError, msg:
 
 try:
     import Image, ImageDraw
 except ImportError, msg:
-    print >>sys.stderr, msg
+    print >> sys.stderr, msg
     sys.exit(1)
 
 import im_debug
     sys.exit(1)
 
 import im_debug
-import filters
-from hough import Hough
+import linef
 
 Saving_dir = ''
 Saving_num = 0
 
 Saving_dir = ''
 Saving_num = 0
@@ -25,101 +25,70 @@ def main():
     
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('file', metavar='file', nargs=1,
     
     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,
     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',
                         const=image_save, default=im_debug.show,
                         help="save images instead of displaying them")
     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',
                         const=image_save, default=im_debug.show,
                         help="save images instead of displaying them")
+    parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
+                        help="report progress")
     args = parser.parse_args()
 
     show_all = args.show_all
     args = parser.parse_args()
 
     show_all = args.show_all
-    do_something = args.do_something    
+    do_something = args.do_something
+    verbose = args.verbose
 
     try:
         image = Image.open(args.file[0])
     except IOError, msg:
 
     try:
         image = Image.open(args.file[0])
     except IOError, msg:
-        print >>sys.stderr, msg
+        print >> sys.stderr, msg
         return 1
         return 1
+    if image.mode == 'P':
+        image = image.convert('RGB')
+    
     if image.size[0] > args.w:
         image = image.resize((args.w, int((float(args.w)/image.size[0]) *
                               image.size[1])), Image.ANTIALIAS)
     global Saving_dir
     Saving_dir = "saved/" + args.file[0][:-4] + "_" + str(image.size[0]) + "/"
     
     if image.size[0] > args.w:
         image = image.resize((args.w, int((float(args.w)/image.size[0]) *
                               image.size[1])), Image.ANTIALIAS)
     global Saving_dir
     Saving_dir = "saved/" + args.file[0][:-4] + "_" + str(image.size[0]) + "/"
     
-    if show_all:
-        do_something(image, "original image")
-
-    im_l = image.convert('L')
-    if show_all:
-        do_something(im_l, "ITU-R 601-2 luma transform")
-
-    im_edges = filters.edge_detection(im_l)
-    if show_all:    
-        do_something(im_edges, "edge detection")
-
-    im_h = filters.high_pass(im_edges, 100)
-    if show_all:
-        do_something(im_h, "high pass filters")
+    lines = linef.find_lines(image, show_all, do_something, verbose)
+
+    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))
     
     
-    hough1 = Hough(im_h.size)
-    im_hough = hough1.transform(im_h)
-    if show_all:
-        do_something(im_hough, "hough transform")
-
-    im_hough = filters.peaks(im_hough)
-    if show_all:
-        do_something(im_hough, "peak extraction")
-               
-    im_h2 = filters.high_pass(im_hough, 120)
-    if show_all:
-        do_something(im_h2, "second high pass filters")
-
-    im_c = filters.components(im_h2)
-    if show_all:
-        do_something(im_c, "components centers")
-
-    """
-    hough2 = Hough(im_h2.size)
-    im_hough2 = hough2.transform(im_h2)
-    if show_all:
-        do_something(im_hough2, "second hough transform")
+    for line in intersections:
+        print ' '.join([stone_color(image, intersection) for intersection in
+                       line])
 
 
-    im_h3 = filters.high_pass(im_hough2, 120)
     if show_all:
     if show_all:
-        do_something(im_h3, "third high pass filters")
-     
-    lines = hough2.find_angle_distance(im_h3)
-
-    im_lines = Image.new('L', im_h2.size)
-
-    draw = ImageDraw.Draw(im_lines)
-
-    for line in lines:
-        draw.line(line_from_angl_dist(line, im_h2.size), fill=255)
-    if show_all:
-        do_something(im_lines, "lines")
-
-    im_c = combine(im_h2, im_lines)
-    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)
-    draw = ImageDraw.Draw(image)
-    for line in lines:
-        draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120))
-
-    do_something(image, "the grid")
+        do_something(image_g, "intersections")
 
     return 0
 
 
     return 0
 
+def stone_color(image, (x, y)):
+    suma = 0.
+    for i in range(-2, 3):
+        for j in range(-2, 3):
+            try:
+                suma += sum(image.getpixel((x + i, y + j)))
+            except IndexError:
+                pass
+    suma /= 3 * 25
+    if suma < 55:
+        return 'B'
+    elif suma < 200: 
+        return '.'
+    else:
+        return 'W'
+
 def image_save(image, title=''):
     global Saving_dir
     global Saving_num
 def image_save(image, title=''):
     global Saving_dir
     global Saving_num
@@ -129,39 +98,35 @@ def image_save(image, title=''):
     image.save(filename, 'JPEG')
     Saving_num += 1
 
     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()
 
 def combine(image1, image2):
     im_l1 = image1.load()
     im_l2 = image2.load()
 
-    im_n = Image.new('L', image1.size)
-    im_nl = im_n.load()
+    on_both = []
 
     for x in xrange(image1.size[0]):
         for y in xrange(image1.size[1]):
             if im_l1[x, y] and im_l2[x, y]:
 
     for x in xrange(image1.size[0]):
         for y in xrange(image1.size[1]):
             if im_l1[x, y] and im_l2[x, y]:
-                im_nl[x, y] = 255
-    return im_n
-
-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
-    x2 = size[0] / 2 
-    y2 = int(round((x2 * math.sin(angle) - distance)/math.cos(angle))) + size[1] / 2
-    return [(0, y1), (size[0] - 1, y2)]
+                on_both.append((x, y))
+    return on_both
+
+def intersections_from_angl_dist(lines, size):
+    intersections = []
+    for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
+        line = []
+        for (angl2, dist2) in sorted(lines[0], key=itemgetter(1)):
+            if abs(angl1 - angl2) > 0.4:
+                x =  - ((dist2 / math.cos(angl2))-(dist1 / math.cos(angl1))) / (math.tan(angl1) - math.tan(angl2))
+                y = (math.tan(angl1) * x) - (dist1 / math.cos(angl1))
+                if (-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)))
+        intersections.append(line)
+    return intersections
 
 if __name__ == '__main__':
 
 if __name__ == '__main__':
-    sys.exit(main())
+    try:
+        sys.exit(main())
+    except KeyboardInterrupt:
+        print "Interrupted."
+        sys.exit()
Go image recognition