readme

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index f0d64e8..45d165c 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -1,18 +1,11 @@
 #!/usr/bin/env python
 
 #!/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 sys
 import os
 import math

+import argparse

 
 try:
     import Image, ImageDraw
 
 try:
     import Image, ImageDraw


@@ -24,42 +17,38 @@ import im_debug
 import filters
 from hough import Hough
 
 import filters
 from hough import Hough
 

-class UsageError(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-

 Saving_dir = ''
 Saving_num = 0
 
 Saving_dir = ''
 Saving_num = 0
 

-def main(*argv):
+def main():

     """Main function of the program."""
     
     """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 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:
 
     try:

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

     except IOError, msg:
         print >>sys.stderr, msg
         return 1
     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:
         do_something(image, "original image")
 
     if show_all:
         do_something(image, "original image")
 


@@ -79,6 +68,10 @@ def main(*argv):
     im_hough = hough1.transform(im_h)
     if show_all:
         do_something(im_hough, "hough transform")
     im_hough = hough1.transform(im_h)
     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:
 
     im_h2 = filters.high_pass(im_hough, 120)
     if show_all: