X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/3fa492032fb6f72fc8d153c0d11ad61155e8c1b9..577a280086d400b3ab83caed89424b6f5e064be9:/imago.py

diff --git a/imago.py b/imago.py
index a0eabfd..1e0cbba 100755
--- a/imago.py
+++ b/imago.py
@@ -4,8 +4,8 @@
 
 import sys
 import os
-import math
 import argparse
+import pickle
 
 try:
     import Image, ImageDraw
@@ -17,21 +17,26 @@ import im_debug
 import linef
 import manual
 import intrsc
+import gridf
 
 def main():
     """Main function of the program."""
     
     parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument('file', metavar='file', nargs=1,
+    parser.add_argument('files', metavar='file', nargs='+',
                         help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
-                        help="scale image to the specified width before analysis")
-    parser.add_argument('-m', '--manual', dest='manual_mode', 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',
+    parser.add_argument('-d', '--debug', dest='show_all',
+                        action='store_true',
                         help="show every step of the computation")
     parser.add_argument('-s', '--save', dest='saving', action='store_true',
                         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()
@@ -40,7 +45,7 @@ def main():
     verbose = args.verbose
 
     try:
-        image = Image.open(args.file[0])
+        image = Image.open(args.files[0])
     except IOError, msg:
         print >> sys.stderr, msg
         return 1
@@ -52,7 +57,7 @@ def main():
                               image.size[1])), Image.ANTIALIAS)
     do_something = im_debug.show
     if args.saving:
-        do_something = imsave("saved/" + args.file[0][:-4] + "_" +
+        do_something = Imsave("saved/" + args.files[0][:-4] + "_" +
                                str(image.size[0]) + "/").save
 
     if args.manual_mode:
@@ -62,17 +67,55 @@ def main():
             #TODO ask user to try again
             return 1
     else:
-        lines = linef.find_lines(image, show_all, do_something, verbose)
+        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)
+    
+    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
 
-class imsave():
+class Imsave():
     def __init__(self, saving_dir):
         self.saving_dir = saving_dir
         self.saving_num = 0