X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/cb5eb5a01ee68e22c9ac02a6feaf52c46bfc6c0e..790d9cb736d8a5e30b6fafb0e4c00b7495199f03:/imago.py?ds=sidebyside

diff --git a/imago.py b/imago.py
index 13702b0..45d165c 100755
--- a/imago.py
+++ b/imago.py
@@ -1,17 +1,11 @@
 #!/usr/bin/env python
 
-"""Usage:
-imago.py file
-    analyses the given file
-imago.py file --debug
-    shows every step of the computation
-imago.py --help
-    shows this help
-
-"""
+"""Go image recognition"""
 
 import sys
+import os
 import math
+import argparse
 
 try:
     import Image, ImageDraw
@@ -23,66 +17,74 @@ import im_debug
 import filters
 from hough import Hough
 
-class UsageError(Exception):
-    def __init__(self, msg):
-        self.msg = msg
+Saving_dir = ''
+Saving_num = 0
 
-def main(*argv):
+def main():
     """Main function of the program."""
     
-    show_all = False
-
-    try:
-        if argv is ():
-            argv = sys.argv[1:]
-            if argv == []:
-                raise UsageError('Missing filename')
-        if "--help" in argv:
-            print __doc__
-            return 0
-        if "--debug" in argv:
-            show_all = True
-    except UsageError, err:
-        print >>sys.stderr, err.msg, "(\"imago.py --help\" for help)"
-        return 2
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('file', metavar='file', nargs=1,
+                        help="image to anlyse")
+    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="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")
+    args = parser.parse_args()
+
+    show_all = args.show_all
+    do_something = args.do_something    
 
     try:
-        image = Image.open(argv[0])
+        image = Image.open(args.file[0])
     except IOError, 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]) *
+                              image.size[1])), Image.ANTIALIAS)
+    global Saving_dir
+    Saving_dir = "saved/" + args.file[0][:-4] + "_" + str(image.size[0]) + "/"
+    
     if show_all:
-        im_debug.show(image, "original image")
+        do_something(image, "original image")
 
     im_l = image.convert('L')
     if show_all:
-        im_debug.show(im_l, "ITU-R 601-2 luma transform")
+        do_something(im_l, "ITU-R 601-2 luma transform")
 
     im_edges = filters.edge_detection(im_l)
     if show_all:    
-        im_debug.show(im_edges, "edge detection")
+        do_something(im_edges, "edge detection")
 
     im_h = filters.high_pass(im_edges, 100)
     if show_all:
-        im_debug.show(im_h, "high pass filters")
+        do_something(im_h, "high pass filters")
     
     hough1 = Hough(im_h.size)
     im_hough = hough1.transform(im_h)
     if show_all:
-        im_debug.show(im_hough, "hough transform")
+        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:
-        im_debug.show(im_h2, "second high pass filters")
+        do_something(im_h2, "second high pass filters")
 
     hough2 = Hough(im_h2.size)
     im_hough2 = hough2.transform(im_h2)
     if show_all:
-        im_debug.show(im_hough2, "second hough transform")
+        do_something(im_hough2, "second hough transform")
 
     im_h3 = filters.high_pass(im_hough2, 120)
     if show_all:
-        im_debug.show(im_h3, "third high pass filters")
+        do_something(im_h3, "third high pass filters")
      
     lines = hough2.find_angle_distance(im_h3)
 
@@ -93,25 +95,34 @@ def main(*argv):
     for line in lines:
         draw.line(line_from_angl_dist(line, im_h2.size), fill=255)
     if show_all:
-        im_debug.show(im_lines, "lines")
+        do_something(im_lines, "lines")
 
     im_c = combine(im_h2, im_lines)
     if show_all:
-        im_debug.show(im_c, "first hough x lines")
+        do_something(im_c, "first hough x lines")
 
     collapse(im_c)
     if show_all:
-        im_debug.show(im_c, "optimalised hough")
+        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))
 
-    im_debug.show(image, "the grid")
+    do_something(image, "the grid")
 
     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
+
 def collapse(image):
     #HACK
     im_l = image.load()