more refactoring

[imago.git] / imago_pack / linef.py

diff --git a/imago_pack/linef.py b/imago_pack/linef.py
index b098257..77383b7 100644 (file)
--- a/imago_pack/linef.py
+++ b/imago_pack/linef.py
@@ -13,55 +13,54 @@ 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)
+   # show_image(im_hough.image, "peak extraction")
+               
+    im_h2 = filters.high_pass(im_hough, 96)
+    show_image(im_h2, "second high pass filters")

 
 

-def find_lines(image, show_all, do_something, verbose):
+    im_h2 = filters.components2(im_h2)
+    show_image(im_h2, "components centers")
+
+    return im_h2
+
+def find_lines(image, show_image, verbose):

     """Find lines in the *image*."""
     # TODO refactor into smaller functions
 
     if verbose:
         print >> sys.stderr, "preprocessing"
 
     """Find lines in the *image*."""
     # TODO refactor into smaller functions
 
     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)
-       
-    if verbose:
-        print >> sys.stderr, "hough transform"
-
-    im_hough = Hough.Transform(im_h)
-    if show_all:
-        do_something(im_hough.image, "hough transform")
+    im_h = prepare(image, show_image, verbose)

 
 

-   # im_hough.image = filters.peaks(im_hough.image)
-   # if show_all:
-   #     do_something(im_hough.image, "peak extraction")
-               
-    im_h2 = im_hough.apply_filter(partial(filters.high_pass, height=96))
-    if show_all:
-        do_something(im_h2.image, "second high pass filters")
+    hough = Hough.default(im_h)

 
 

-    im_h2 = im_h2.apply_filter(filters.components2)
-    if show_all:
-        do_something(im_h2.image, "components centers")
+    if verbose:
+        print >> sys.stderr, "hough transform"
+    
+    im_h2 = transform(im_h, hough, show_image)

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


@@ -69,24 +68,22 @@ def find_lines(image, show_all, do_something, verbose):
     # im_hough might be used instead im_h2, but at the moment it brings a lot of
     # noise to the second transform, which later confuses the center-finding
     # mechanism (which is not very robust yet)
     # im_hough might be used instead im_h2, but at the moment it brings a lot of
     # noise to the second transform, which later confuses the center-finding
     # mechanism (which is not very robust yet)

-    im_hough2 = Hough.Transform(im_h2.image)
-    if show_all:
-        do_something(im_hough2.image, "second hough transform")
+    hough2 = Hough.default(im_h2)
+    im_hough2 = hough2.transform(im_h2)
+    show_image(im_hough2, "second hough transform")

 
 

-    im_h3 = im_hough2.apply_filter(partial(filters.high_pass, height=120))
-    if show_all:
-        do_something(im_h3.image, "third high pass filter")
+    im_h3 = filters.high_pass(im_hough2, 120)
+    show_image(im_h3, "third high pass filter")

      
      

-    im_h3 = im_h3.apply_filter(filters.components)
-    if show_all:
-        do_something(im_h3.image, "half centers")
+    im_h3 = filters.components(im_h3)
+    show_image(im_h3, "half centers")

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

-    lines_m = im_h3.all_lines_h()
+    lines_m = hough2.all_lines_h(im_h3)

     lines = []
     lines = []

-    im_c = im_h2.image.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0))
+    im_c = im_h2.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0))

     draw_c = ImageDraw.Draw(im_c)
     bounds = []
 
     draw_c = ImageDraw.Draw(im_c)
     bounds = []
 


@@ -98,26 +95,24 @@ def find_lines(image, show_all, do_something, verbose):
             draw.line(line_from_angl_dist(line, im_h2.size), fill=255, width=7)
             draw_c.line(line_from_angl_dist(line, im_c.size),
                         fill=(70, 70, 70), width=7)
             draw.line(line_from_angl_dist(line, im_h2.size), fill=255, width=7)
             draw_c.line(line_from_angl_dist(line, im_c.size),
                         fill=(70, 70, 70), width=7)

-            for p in combine(im_h2.image, im_line):
+            for p in combine(im_h2, im_line):

                 line_points.add(p)
         for point in line_points:
             draw_c.point(point, fill=(120, 255, 120))
                 line_points.add(p)
         for point in line_points:
             draw_c.point(point, fill=(120, 255, 120))

-        lines.append(im_hough.lines_from_list(line_points))
+        lines.append(hough.lines_from_list(line_points))

         line_points = list(line_points)
         line_points.sort()
         bounds += [line_points[0], line_points[-1]]
 
         line_points = list(line_points)
         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, im_hough
+    return lines, lines_m[0][0], lines_m[1][0], bounds, hough

 
 def combine(image1, image2):
     """Return a list of points that are present in both images."""
 
 def combine(image1, image2):
     """Return a list of points that are present in both images."""