more refactoring

[imago.git] / imago_pack / imago.py

diff --git a/imago_pack/imago.py b/imago_pack/imago.py
index 806ddcc..18f13d3 100755 (executable)
--- a/imago_pack/imago.py
+++ b/imago_pack/imago.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-"""Go image recognition."""
+"""Go image recognition.
+
+This is the main UI module of Imago.
+"""

 
 import sys
 import os
 
 import sys
 import os


@@ -43,6 +46,7 @@ def argument_parser():
     return parser
  
 
     return parser
  
 

+# TODO factor this into smaller functions

 def main():
     """Main function of the program."""
     
 def main():
     """Main function of the program."""
     


@@ -63,10 +67,16 @@ 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)
     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
         do_something = Imsave("saved/" + args.files[0][:-4] + "_" +
                                str(image.size[0]) + "/").save

+    else:
+        do_something = im_debug.show

 
     if args.manual_mode:
         try:
 
     if args.manual_mode:
         try:


@@ -90,7 +100,7 @@ def main():
                 pickle.dump((lines, l1, l2, bounds, hough), d_file)
                 d_file.close()
         else:
                 pickle.dump((lines, l1, l2, bounds, hough), d_file)
                 d_file.close()
         else:

-            lines, l1, l2, bounds, hough = linef.find_lines(image, show_all, do_something, verbose)
+            lines, l1, l2, bounds, hough = linef.find_lines(image, do_something, verbose)

 
         grid, lines = gridf.find(lines, image.size, l1, l2, bounds, hough,
                                  show_all, do_something)
 
         grid, lines = gridf.find(lines, image.size, l1, l2, bounds, hough,
                                  show_all, do_something)