parameters

[imago.git] / src / gridf3.py

diff --git a/src/gridf3.py b/src/gridf3.py
index 16d9d7b..5f90cb8 100644 (file)
--- a/src/gridf3.py
+++ b/src/gridf3.py
@@ -2,9 +2,10 @@ import random
 from math import sqrt
 
 from intrsc import intersections_from_angl_dist
 from math import sqrt
 
 from intrsc import intersections_from_angl_dist

-import linef as linef
-import ransac as ransac
-import manual as manual
+import linef
+import params
+import ransac
+import manual_lines as manual

 from geometry import l2ad
 
 # TODO comments, refactoring, move methods to appropriate modules
 from geometry import l2ad
 
 # TODO comments, refactoring, move methods to appropriate modules


@@ -192,7 +193,8 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
     for n_tries in xrange(3):
         logger("finding the diagonals")
         model = Diagonal_model(points)
     for n_tries in xrange(3):
         logger("finding the diagonals")
         model = Diagonal_model(points)

-        diag_lines = ransac.ransac_multi(6, points, 2, 400, model=model)
+        diag_lines = ransac.ransac_multi(6, points, 2,
+                                         params.ransac_diagonal_iter, model=model)

         diag_lines = [l[0] for l in diag_lines]
         centers = []
         cen_lin = []
         diag_lines = [l[0] for l in diag_lines]
         centers = []
         cen_lin = []


@@ -206,7 +208,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
 
         if show_all:
             import matplotlib.pyplot as pyplot
 
         if show_all:
             import matplotlib.pyplot as pyplot

-            import Image
+            from PIL import Image

 
             def plot_line_g((a, b, c), max_x):
                 find_y = lambda x: - (c + a * x) / b
 
             def plot_line_g((a, b, c), max_x):
                 find_y = lambda x: - (c + a * x) / b