use ransac in linef

diff --git a/imago_pack/gridf.py b/imago_pack/gridf.py
index fc64772..3c64720 100644 (file)
--- a/imago_pack/gridf.py
+++ b/imago_pack/gridf.py
@@ -33,8 +33,6 @@ def job_4(x, y, w, z, im_l, v1, v2, h1, h2, dv, dh, size):
 def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
     logger("finding the grid")
 
-    l1 = line_from_angl_dist(l1, size)
-    l2 = line_from_angl_dist(l2, size)
     v1 = V(*l1[0]) - V(*l1[1])
     v2 = V(*l2[0]) - V(*l2[1])
     a, b, c, d = [V(*a) for a in bounds]
@@ -100,6 +98,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
             im_t_d.line(l, width=1, fill=(0, 255, 0))
 
         do_something(im_t, "lines and grid")
+#
 ###
 
     return grid, grid_lines

diff --git a/imago_pack/hough.py b/imago_pack/hough.py
index 6235b5d..3a3a755 100644 (file)
--- a/imago_pack/hough.py
+++ b/imago_pack/hough.py
@@ -37,6 +37,7 @@ class Hough:
     def lines_from_list(self, p_list):
         """Take a list of transformed points and return a list of corresponding
         lines as (angle, distance) tuples."""
+        # TODO! why is distance allways integer?
         lines = []
         for p in p_list:
             lines.append(self.angle_distance(p))

diff --git a/imago_pack/linef.py b/imago_pack/linef.py
index ccf209e..2e40fca 100644 (file)
--- a/imago_pack/linef.py
+++ b/imago_pack/linef.py
@@ -12,6 +12,7 @@ except ImportError, msg:
 
 import filters
 from hough import Hough
+import ransac
 
 def prepare(image, show_image, logger):
     # TODO comment
@@ -43,6 +44,30 @@ def transform(image, hough, show_image):
 
     return im_h2
 
+def run_ransac(image):
+    # TODO comment
+    # TODO vizualize this
+    image_l = image.load()
+    width, height = image.size
+
+    data = []
+
+    for y in xrange(0, height):
+        for x in xrange(0, width):
+            if image_l[x, y] > 128:
+                data.append((x, y))
+
+    dist = 3 
+    (line, points), (line2, points2) = ransac.ransac_duo(data, dist, 75, 15)
+    line_to_points = lambda (a, b, c), x: (x, (a*x + c) / (- b))
+    # TODO width should not be here vvv
+    # TODO refactor gridf to use standard equations instead of points
+    line = [line_to_points(line, 0), line_to_points(line, width - 1)]
+    line2 = [line_to_points(line2, 0), line_to_points(line2, width - 1)]
+    return [sorted(points), sorted(points2)], line, line2
+
+
+
 def find_lines(image, show_image, logger):
     """Find lines in the *image*."""
     # TODO refactor into smaller functions
@@ -58,55 +83,24 @@ def find_lines(image, show_image, logger):
     
     im_h2 = transform(im_h, hough, show_image)
 
-    logger("second hough transform")
+    logger("finding the lines")
 
-    # 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)
-    hough2 = Hough.default(im_h2)
-    im_hough2 = hough2.transform(im_h2)
-    show_image(im_hough2, "second hough transform")
+    r_lines, l1, l2 = run_ransac(im_h2) 
 
-    im_h3 = filters.high_pass(im_hough2, 120)
-    show_image(im_h3, "third high pass filter")
-     
-    im_h3 = filters.components(im_h3, 1)
-    show_image(im_h3, "half centers")
+    lines = map(hough.lines_from_list, r_lines)
 
-    logger("finding the lines")
-
-    lines_m = hough2.all_lines_h(im_h3)
-    lines = []
-    im_c = im_h2.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0))
-    draw_c = ImageDraw.Draw(im_c)
-    bounds = []
-
-    for line_l in lines_m:
-        im_line = Image.new('L', im_h2.size)
-        draw = ImageDraw.Draw(im_line)
-        line_points = set()
-        for line in line_l:
-            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, im_line):
-                line_points.add(p)
-        for point in line_points:
-            draw_c.point(point, fill=(120, 255, 120))
-        lines.append(hough.lines_from_list(line_points))
-        line_points = list(line_points)
-        line_points.sort()
-        bounds += [line_points[0], line_points[-1]]
-
-    show_image(im_c, "hough x lines")
+    # TODO refactor gridf to get rid of this:
+    bounds = sum(map(lambda l: [l[0], l[-1]], r_lines), []) 
+    # sum(list, []) = flatten list
 
+    # TODO do this only if show_all is true:
     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))
     show_image(image_g, "lines")
-   
-    return lines, lines_m[0][0], lines_m[1][0], bounds, hough
+
+    return lines, l1, l2, bounds, hough # TODO
 
 def combine(image1, image2):
     """Return a list of points that are present in both images."""