fix capture.py, add imago-camera, imago-timer

[imago.git] / src / gridf3.py

diff --git a/src/gridf3.py b/src/gridf3.py
index 6f6f386..ca8decb 100644 (file)
--- a/src/gridf3.py
+++ b/src/gridf3.py
@@ -172,7 +172,6 @@ def score(lines, points):
 
 
 def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
 
 
 def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):

-    logger("finding the grid")

     new_lines1 = map(lambda l: Line.from_ad(l, size), lines[0])
     new_lines2 = map(lambda l: Line.from_ad(l, size), lines[1])
     for l1 in new_lines1:
     new_lines1 = map(lambda l: Line.from_ad(l, size), lines[0])
     new_lines2 = map(lambda l: Line.from_ad(l, size), lines[1])
     for l1 in new_lines1:


@@ -191,8 +190,9 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
         return sqrt(x * x + y * y)
 
     for n_tries in xrange(3):
         return sqrt(x * x + y * y)
 
     for n_tries in xrange(3):

+        logger("finding the diagonals")

         model = Diagonal_model(points)
         model = Diagonal_model(points)

-        diag_lines = ransac.ransac_multi(6, points, 2, 800, model=model)
+        diag_lines = ransac.ransac_multi(6, points, 2, 400, 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 +206,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


@@ -227,6 +227,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
             image_p = Image.fromstring('RGB', size_f, buff, 'raw')
             do_something(image_p, "finding diagonals")
 
             image_p = Image.fromstring('RGB', size_f, buff, 'raw')
             do_something(image_p, "finding diagonals")
 

+        logger("finding the grid")

         data = sum(points, [])
         # TODO what if lines are missing?
         sc = float("inf")
         data = sum(points, [])
         # TODO what if lines are missing?
         sc = float("inf")