refactor do_something in linef

[imago.git] / imago_pack / linef.py

diff --git a/imago_pack/linef.py b/imago_pack/linef.py
index 03de6bd..fb83db4 100644 (file)
--- a/imago_pack/linef.py
+++ b/imago_pack/linef.py
@@ -13,58 +13,63 @@ except ImportError, msg:
 import filters
 from hough import Hough
 
 import filters
 from hough import Hough
 

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

     # TODO comment
     im_l = image.convert('L')
     # TODO comment
     im_l = image.convert('L')

-    if show_all:
-        do_something(im_l, "ITU-R 601-2 luma transform")
+    show_image(im_l, "ITU-R 601-2 luma transform")

 
     if verbose:
         print >> sys.stderr, "edge detection"
     im_edges = filters.edge_detection(im_l)
 
     if verbose:
         print >> sys.stderr, "edge detection"
     im_edges = filters.edge_detection(im_l)

-    if show_all:    
-        do_something(im_edges, "edge detection")
+    show_image(im_edges, "edge detection")

 
     im_h = filters.high_pass(im_edges, 100)
 
     im_h = filters.high_pass(im_edges, 100)

-    if show_all:
-        do_something(im_h, "high pass filters")
+    show_image(im_h, "high pass filters")

 
     return im_h
  
 
     return im_h
  

+def transform(image, hough, show_image):
+    # TODO comment
+    im_hough = hough.transform(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")
+               
+    im_h2 = filters.high_pass(im_hough, 96)
+    show_image(im_h2, "second high pass filters")
+
+    im_h2 = filters.components2(im_h2)
+    show_image(im_h2, "components centers")
+
+    return im_h2

 
 def find_lines(image, show_all, do_something, verbose):
     """Find lines in the *image*."""
     # TODO refactor into smaller functions
 
 
 def find_lines(image, show_all, do_something, verbose):
     """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"
 

-    if show_all:
-        do_something(image, "original image")
+    show_image(image, "original image")

 
 

-    im_h = prepare(image, show_all, do_something, verbose)
-       
+    im_h = prepare(image, show_image, verbose)

 
     hough = Hough.default(im_h)
 
     if verbose:
         print >> sys.stderr, "hough transform"
 
     hough = Hough.default(im_h)
 
     if verbose:
         print >> sys.stderr, "hough transform"

-
-    im_hough = hough.transform(im_h)
-    if show_all:
-        do_something(im_hough, "hough transform")
-
-   # im_hough.image = filters.peaks(im_hough.image)
-   # if show_all:
-   #     do_something(im_hough.image, "peak extraction")
-               
-    im_h2 = filters.high_pass(im_hough, 96)
-    if show_all:
-        do_something(im_h2, "second high pass filters")
-
-    im_h2 = filters.components2(im_h2)
-    if show_all:
-        do_something(im_h2, "components centers")
+    
+    im_h2 = transform(im_h, hough, show_image)

 
     if verbose:
         print >> sys.stderr, "second hough transform"
 
     if verbose:
         print >> sys.stderr, "second hough transform"


@@ -74,16 +79,13 @@ def find_lines(image, show_all, do_something, verbose):
     # mechanism (which is not very robust yet)
     hough2 = Hough.default(im_h2)
     im_hough2 = hough2.transform(im_h2)
     # mechanism (which is not very robust yet)
     hough2 = Hough.default(im_h2)
     im_hough2 = hough2.transform(im_h2)

-    if show_all:
-        do_something(im_hough2, "second hough transform")
+    show_image(im_hough2, "second hough transform")

 
     im_h3 = filters.high_pass(im_hough2, 120)
 
     im_h3 = filters.high_pass(im_hough2, 120)

-    if show_all:
-        do_something(im_h3, "third high pass filter")
+    show_image(im_h3, "third high pass filter")

      
     im_h3 = filters.components(im_h3)
      
     im_h3 = filters.components(im_h3)

-    if show_all:
-        do_something(im_h3, "half centers")
+    show_image(im_h3, "half centers")

 
     if verbose:
         print >> sys.stderr, "finding the grid"
 
     if verbose:
         print >> sys.stderr, "finding the grid"


@@ -111,15 +113,13 @@ def find_lines(image, show_all, do_something, verbose):
         line_points.sort()
         bounds += [line_points[0], line_points[-1]]
 
         line_points.sort()
         bounds += [line_points[0], line_points[-1]]
 

-    if show_all:
-        do_something(im_c, "hough x lines")
+    show_image(im_c, "hough x lines")

 
     image_g = image.copy()
     draw = ImageDraw.Draw(image_g)
     for line in [l for s in lines for l in s]:
         draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120))
 
     image_g = image.copy()
     draw = ImageDraw.Draw(image_g)
     for line in [l for s in lines for l in s]:
         draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120))

-    if show_all:
-        do_something(image_g, "lines")
+    show_image(image_g, "lines")

    
     return lines, lines_m[0][0], lines_m[1][0], bounds, hough
 
    
     return lines, lines_m[0][0], lines_m[1][0], bounds, hough