more refactoring on linef

diff --git a/imago_pack/linef.py b/imago_pack/linef.py
index 03de6bd..5eaa0d1 100644 (file)
--- a/imago_pack/linef.py
+++ b/imago_pack/linef.py
@@ -31,6 +31,24 @@ def prepare(image, show_all, do_something, verbose):
 
     return im_h
  
 
     return im_h
  

+def transform(image, hough, show_all, do_something):
+    im_hough = hough.transform(image)
+    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")
+
+    return im_h2

 
 def find_lines(image, show_all, do_something, verbose):
     """Find lines in the *image*."""
 
 def find_lines(image, show_all, do_something, verbose):
     """Find lines in the *image*."""


@@ -43,28 +61,13 @@ def find_lines(image, show_all, do_something, verbose):
         do_something(image, "original image")
 
     im_h = prepare(image, show_all, do_something, verbose)
         do_something(image, "original image")
 
     im_h = prepare(image, show_all, do_something, 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_all, do_something)

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