use ransac in linef

[imago.git] / imago_pack / gridf.py

diff --git a/imago_pack/gridf.py b/imago_pack/gridf.py
index 6a80c44..3c64720 100644 (file)
--- a/imago_pack/gridf.py
+++ b/imago_pack/gridf.py
@@ -1,4 +1,4 @@
-"""Imago grid-fitting module"""
+"""Imago grid-fitting module."""

 
 import multiprocessing
 from functools import partial
 
 import multiprocessing
 from functools import partial


@@ -30,9 +30,9 @@ def job_4(x, y, w, z, im_l, v1, v2, h1, h2, dv, dh, size):
     h2 = (h2[0] + z * dh, h2[1] + z)
     return (distance(im_l, get_grid([v1, v2], [h1, h2], size), size))
 
     h2 = (h2[0] + z * dh, h2[1] + z)
     return (distance(im_l, get_grid([v1, v2], [h1, h2], size), size))
 

-def find(lines, size, l1, l2, bounds, hough, show_all, do_something):
-    l1 = line_from_angl_dist(l1, size)
-    l2 = line_from_angl_dist(l2, size)
+def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
+    logger("finding the grid")
+

     v1 = V(*l1[0]) - V(*l1[1])
     v2 = V(*l2[0]) - V(*l2[1])
     a, b, c, d = [V(*a) for a in bounds]
     v1 = V(*l1[0]) - V(*l1[1])
     v2 = V(*l2[0]) - V(*l2[1])
     a, b, c, d = [V(*a) for a in bounds]


@@ -62,7 +62,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something):
     f_dist = partial(job_4, im_l=im_l_s, v1=v1, v2=v2, h1=h1, h2=h2,
                      dv=delta_v, dh=delta_h, size=size)
 
     f_dist = partial(job_4, im_l=im_l_s, v1=v1, v2=v2, h1=h1, h2=h2,
                      dv=delta_v, dh=delta_h, size=size)
 

-    x_v, y_v, x_h, y_h = Optimizer.optimize(4, 30, f_dist, 64, 256, 4)
+    x_v, y_v, x_h, y_h = Optimizer.optimize(4, 30, f_dist, 128, 512, 1)

 
     v1 = (v1[0] + x_v * delta_v, v1[1] + x_v)
     v2 = (v2[0] + y_v * delta_v, v2[1] + y_v)
 
     v1 = (v1[0] + x_v * delta_v, v1[1] + x_v)
     v2 = (v2[0] + y_v * delta_v, v2[1] + y_v)


@@ -98,6 +98,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something):
             im_t_d.line(l, width=1, fill=(0, 255, 0))
 
         do_something(im_t, "lines and grid")
             im_t_d.line(l, width=1, fill=(0, 255, 0))
 
         do_something(im_t, "lines and grid")

+#

 ###
 
     return grid, grid_lines
 ###
 
     return grid, grid_lines