bugfix

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index 3634363..1e0cbba 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -4,154 +4,132 @@
 
 import sys
 import os
 
 import sys
 import os

-import math

 import argparse
 import argparse

+import pickle

 
 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
-
-Saving_dir = ''
-Saving_num = 0
+import linef
+import manual
+import intrsc
+import gridf

 
 def main():
     """Main function of the program."""
     
     parser = argparse.ArgumentParser(description=__doc__)
 
 def main():
     """Main function of the program."""
     
     parser = argparse.ArgumentParser(description=__doc__)

-    parser.add_argument('file', metavar='file', nargs=1,
-                        help="image to anlyse")
+    parser.add_argument('files', metavar='file', nargs='+',
+                        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")
-    parser.add_argument('-d', '--debug', dest='show_all', action='store_true',
+                    help="scale image to the specified width before analysis")
+    parser.add_argument('-m', '--manual', dest='manual_mode',
+                        action='store_true',
+                        help="manual grid selection")
+    parser.add_argument('-d', '--debug', dest='show_all',
+                        action='store_true',

                         help="show every step of the computation")
                         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,
+    parser.add_argument('-s', '--save', dest='saving', action='store_true',

                         help="save images instead of displaying them")
                         help="save images instead of displaying them")

+    parser.add_argument('-c', '--cache', dest='l_cache', action='store_true',
+                        help="use cached lines")
+    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    
+    verbose = args.verbose

 
     try:
 
     try:

-        image = Image.open(args.file[0])
+        image = Image.open(args.files[0])

     except IOError, msg:
     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)
     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")
+    do_something = im_debug.show
+    if args.saving:
+        do_something = Imsave("saved/" + args.files[0][:-4] + "_" +
+                               str(image.size[0]) + "/").save
+
+    if args.manual_mode:
+        try:
+            lines = manual.find_lines(image)
+        except manual.UserQuitError:
+            #TODO ask user to try again
+            return 1
+    else:
+        if args.l_cache:
+            filename = ("saved/cache/" + args.files[0][:-4] + "_" +
+                       str(image.size[0]))
+            cache_dir = "/".join(filename.split('/')[:-1])
+            if os.path.exists(filename):
+                lines, l1, l2, bounds, hough = pickle.load(open(filename))
+                print >> sys.stderr, "using cached results"
+                im_h = None
+            else:
+                lines, l1, l2, bounds, hough, im_h = linef.find_lines(image, show_all, do_something, verbose)
+                if not os.path.isdir(cache_dir):
+                    os.makedirs(cache_dir)
+                d_file = open(filename, 'wb')
+                pickle.dump((lines, l1, l2, bounds, hough), d_file)
+                d_file.close()
+        else:
+            lines, l1, l2, bounds, hough, im_h = linef.find_lines(image, show_all, do_something, verbose)
+
+        grid, lines = gridf.find(lines, image.size, l1, l2, bounds, hough,
+                                 do_something, im_h)
+        if show_all:
+            im_g = image.copy()
+            draw = ImageDraw.Draw(im_g)
+            for l in grid[0] + grid[1]:
+                draw.line(l, fill=(64, 255, 64), width=1)
+            do_something(im_g)
+
+    board = intrsc.board(image, lines, show_all, do_something)
+
+    #simple ASCII output:
+    for line in board:
+        print ' '.join(line)

     
     

-    hough1 = Hough(im_h.size)
-    im_hough = hough1.transform(im_h)
-    if show_all:
-        do_something(im_hough, "hough transform")
-
-    im_h2 = filters.high_pass(im_hough, 120)
-    if show_all:
-        do_something(im_h2, "second high pass filters")
-
-    hough2 = Hough(im_h2.size)
-    im_hough2 = hough2.transform(im_h2)
-    if show_all:
-        do_something(im_hough2, "second hough transform")
-
-    im_h3 = filters.high_pass(im_hough2, 120)
-    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")
+    if len(args.files) > 1:
+        for f in args.files[1:]:
+            try:
+                image = Image.open(f)
+            except IOError, msg:
+                print >> sys.stderr, msg
+                continue
+            if image.mode == 'P':
+                image = image.convert('RGB')
+            board = intrsc.board(image, lines, show_all, do_something)
+            for line in board:
+                print ' '.join(line)

 
     return 0
 
 
     return 0
 

-def image_save(image, title=''):
-    global Saving_dir
-    global Saving_num
-    filename = Saving_dir + "{0:0>2}".format(Saving_num) + '.jpg'
-    if not os.path.isdir(Saving_dir):
-        os.makedirs(Saving_dir)
-    image.save(filename, 'JPEG')
-    Saving_num += 1
+class Imsave():
+    def __init__(self, saving_dir):
+        self.saving_dir = saving_dir
+        self.saving_num = 0

 
 

-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()
-
-    im_n = Image.new('L', image1.size)
-    im_nl = im_n.load()
-
-    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)]
+    def save(self, image, title=''):
+        filename = self.saving_dir + "{0:0>2}".format(self.saving_num) + '.jpg'
+        if not os.path.isdir(self.saving_dir):
+            os.makedirs(self.saving_dir)
+        image.save(filename, 'JPEG')
+        self.saving_num += 1

 
 if __name__ == '__main__':
 
 if __name__ == '__main__':

-    sys.exit(main())
+    try:
+        sys.exit(main())
+    except KeyboardInterrupt:
+        print "Interrupted."
+        sys.exit()