ransac duo

[imago.git] / imago_pack / imago.py

diff --git a/imago_pack/imago.py b/imago_pack/imago.py
index 18f13d3..6238902 100755 (executable)
--- a/imago_pack/imago.py
+++ b/imago_pack/imago.py
@@ -78,6 +78,13 @@ def main():
     else:
         do_something = im_debug.show
 
     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)
     if args.manual_mode:
         try:
             lines = manual.find_lines(image)


@@ -93,17 +100,17 @@ def main():
                 lines, l1, l2, bounds, hough = pickle.load(open(filename))
                 print >> sys.stderr, "using cached results"
             else:
                 lines, l1, l2, bounds, hough = pickle.load(open(filename))
                 print >> sys.stderr, "using cached results"
             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, 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:
                 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 = linef.find_lines(image, 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,
 
         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)
         if show_all:
             im_g = image.copy()
             draw = ImageDraw.Draw(im_g)