components and hough2 combined

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index 511027b..87b522e 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -77,11 +77,10 @@ def main():
     if show_all:
         do_something(im_h2, "second high pass filters")
 
-    im_c = filters.components(im_h2)
+    im_h2 = filters.components(im_h2)
     if show_all:
-        do_something(im_c, "components centers")
+        do_something(im_h2, "components centers")
 
-    """
     hough2 = Hough(im_h2.size)
     im_hough2 = hough2.transform(im_h2)
     if show_all:
@@ -98,7 +97,7 @@ def main():
     draw = ImageDraw.Draw(im_lines)
 
     for line in lines:
-        draw.line(line_from_angl_dist(line, im_h2.size), fill=255)
+        draw.line(line_from_angl_dist(line, im_h2.size), fill=255, width=5)
     if show_all:
         do_something(im_lines, "lines")
 
@@ -109,7 +108,6 @@ def main():
     collapse(im_c)
     if show_all:
         do_something(im_c, "optimalised hough")
-    """
 
     lines = hough1.all_lines(im_c)
     draw = ImageDraw.Draw(image)