more refactoring

diff --git a/imago_pack/imago.py b/imago_pack/imago.py
index 33e6181..18f13d3 100755 (executable)
--- a/imago_pack/imago.py
+++ b/imago_pack/imago.py
@@ -67,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:


@@ -94,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)

diff --git a/imago_pack/linef.py b/imago_pack/linef.py
index fb83db4..77383b7 100644 (file)
--- a/imago_pack/linef.py
+++ b/imago_pack/linef.py
@@ -34,8 +34,7 @@ def transform(image, hough, show_image):
     show_image(im_hough, "hough transform")
 
    # im_hough.image = filters.peaks(im_hough.image)
     show_image(im_hough, "hough transform")
 
    # im_hough.image = filters.peaks(im_hough.image)

-   # if show_all:
-   #     do_something(im_hough.image, "peak extraction")
+   # show_image(im_hough.image, "peak extraction")

                
     im_h2 = filters.high_pass(im_hough, 96)
     show_image(im_h2, "second high pass filters")
                
     im_h2 = filters.high_pass(im_hough, 96)
     show_image(im_h2, "second high pass filters")


@@ -45,18 +44,10 @@ def transform(image, hough, show_image):
 
     return im_h2
 
 
     return im_h2
 

-def find_lines(image, show_all, do_something, verbose):
+def find_lines(image, show_image, verbose):

     """Find lines in the *image*."""
     # TODO refactor into smaller functions
 
     """Find lines in the *image*."""
     # TODO refactor into smaller functions
 

-    def nothing(a, b):
-        pass
-
-    if show_all:
-        show_image = do_something
-    else:
-        show_image = nothing
-

     if verbose:
         print >> sys.stderr, "preprocessing"
 
     if verbose:
         print >> sys.stderr, "preprocessing"