cleaner code

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index a0eabfd..66c758f 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -4,7 +4,6 @@
 
 import sys
 import os
 
 import sys
 import os

-import math

 import argparse
 
 try:
 import argparse
 
 try:


@@ -17,18 +16,21 @@ import im_debug
 import linef
 import manual
 import intrsc
 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,
+    parser.add_argument('files', metavar='file', nargs='+',

                         help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
                         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")
                         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")
                         help="show every step of the computation")
     parser.add_argument('-s', '--save', dest='saving', action='store_true',
                         help="save images instead of displaying them")


@@ -40,7 +42,7 @@ def main():
     verbose = args.verbose
 
     try:
     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
     except IOError, msg:
         print >> sys.stderr, msg
         return 1


@@ -52,7 +54,7 @@ def main():
                               image.size[1])), Image.ANTIALIAS)
     do_something = im_debug.show
     if args.saving:
                               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:
                                str(image.size[0]) + "/").save
 
     if args.manual_mode:


@@ -62,17 +64,38 @@ def main():
             #TODO ask user to try again
             return 1
     else:
             #TODO ask user to try again
             return 1
     else:

-        lines = linef.find_lines(image, show_all, do_something, verbose)
+        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)
 
     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
 
 
     return 0
 

-class imsave():
+class Imsave():

     def __init__(self, saving_dir):
         self.saving_dir = saving_dir
         self.saving_num = 0
     def __init__(self, saving_dir):
         self.saving_dir = saving_dir
         self.saving_num = 0