minor corrections

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index f0d64e8..f3a9eb7 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -1,65 +1,54 @@
 #!/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
 except ImportError, msg:
-    print >>sys.stderr, msg
+    print >> sys.stderr, msg
     sys.exit(1)
 
 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
-    do_something = im_debug.show
-
-    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
-        if "--save" in argv:
-            global Saving_dir
-            Saving_dir = "saved/" + argv[0][:-4] + "/"
-            do_something = image_save
-    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 analyse")
+    parser.add_argument('-w', type=int, default=640,
+                        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")
+    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
+        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:
         do_something(image, "original image")
 
@@ -80,10 +69,18 @@ def main(*argv):
     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_h2 = filters.components(im_h2)
+    if show_all:
+        do_something(im_h2, "components centers")
+
     hough2 = Hough(im_h2.size)
     im_hough2 = hough2.transform(im_h2)
     if show_all:
@@ -91,16 +88,20 @@ def main(*argv):
 
     im_h3 = filters.high_pass(im_hough2, 120)
     if show_all:
-        do_something(im_h3, "third high pass filters")
+        do_something(im_h3, "third high pass filter")
      
-    lines = hough2.find_angle_distance(im_h3)
+    im_h3 = filters.components(im_h3)
+    if show_all:
+        do_something(im_h3, "components centers 2")
+
+    lines = hough2.all_lines(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)
+        draw.line(line_from_angl_dist(line, im_h2.size), fill=255, width=5)
     if show_all:
         do_something(im_lines, "lines")
 
@@ -108,10 +109,6 @@ def main(*argv):
     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:
@@ -130,20 +127,6 @@ def image_save(image, title=''):
     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()