X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/801adea375f57a51cf6dd23cd4cda496cfc47bfd..16a9526d24fbdad7bbc544aeae9fd7ba067b3d91:/imago_pack/imago.py

diff --git a/imago_pack/imago.py b/imago_pack/imago.py
index 7c6c1f2..6238902 100755
--- a/imago_pack/imago.py
+++ b/imago_pack/imago.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
-"""Go image recognition."""
+"""Go image recognition.
+
+This is the main UI module of Imago.
+"""
 
 import sys
 import os
@@ -43,6 +46,7 @@ def argument_parser():
     return parser
  
 
+# TODO factor this into smaller functions
 def main():
     """Main function of the program."""
     
@@ -63,11 +67,24 @@ def main():
     if image.size[0] > args.w:
         image = image.resize((args.w, int((float(args.w)/image.size[0]) *
                               image.size[1])), Image.ANTIALIAS)
-    do_something = im_debug.show
-    if args.saving:
+
+    if not show_all:
+        def nothing(a, b):
+            pass
+        do_something = nothing
+    elif args.saving:
         do_something = Imsave("saved/" + args.files[0][:-4] + "_" +
                                str(image.size[0]) + "/").save
+    else:
+        do_something = im_debug.show
 
+    if verbose:
+        def logger(m):
+            print >> sys.stderr, m
+    else:
+        def logger(m):
+            pass
+        
     if args.manual_mode:
         try:
             lines = manual.find_lines(image)
@@ -82,19 +99,18 @@ def main():
             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)
+                lines, l1, l2, bounds, hough = linef.find_lines(image, do_something, logger)
                 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)
+            lines, l1, l2, bounds, hough = linef.find_lines(image, do_something, logger)
 
         grid, lines = gridf.find(lines, image.size, l1, l2, bounds, hough,
-                                 show_all, do_something)
+                                 show_all, do_something, logger)
         if show_all:
             im_g = image.copy()
             draw = ImageDraw.Draw(im_g)