faster gridf, cancel scaling

[imago.git] / src / gridf3.py

diff --git a/src/gridf3.py b/src/gridf3.py
index 8a1a216..6f6f386 100644 (file)
--- a/src/gridf3.py
+++ b/src/gridf3.py
@@ -127,7 +127,7 @@ class Line:
         elif key == 2:
             return self.c
 
-def gen_corners(d1, d2):
+def gen_corners(d1, d2, min_size):
     for c1 in d1.points:
         if c1 in d2.points:
             continue
@@ -136,6 +136,15 @@ def gen_corners(d1, d2):
             c2 = [p for p in d2.points if p in c1.l1.points][0]
             c3 = [p for p in d1.points if p in c2.l2.points][0]
             c4 = [p for p in d2.points if p in c3.l1.points][0]
+            x_min = min([c1[0], c2[0], c3[0], c4[0]])
+            x_max = max([c1[0], c2[0], c3[0], c4[0]])
+            if x_max - x_min < min_size:
+                continue
+            y_min = min([c1[1], c2[1], c3[1], c4[1]])
+            y_max = max([c1[1], c2[1], c3[1], c4[1]])
+            if y_max - y_min < min_size:
+                continue
+
         except IndexError:
             continue
             # there is not a corresponding intersection
@@ -152,6 +161,8 @@ def dst(p, l):
     return abs(a * x + b * y + c) / sqrt(a*a+b*b)
 
 def score(lines, points):
+    # TODO find whether the point actualy lies on the line or just in the same
+    # direction
     score = 0
     for p in points:
         s = min(map(lambda l: dst(p, l), lines))
@@ -227,7 +238,7 @@ def find(lines, size, l1, l2, bounds, hough, show_all, do_something, logger):
             diag2.points = ransac.filter_near(data, diag2, 2)
 
 
-            grids = list(gen_corners(diag1, diag2))
+            grids = list(gen_corners(diag1, diag2, min(size) / 3))
             
             try:
                 new_sc, new_grid = min(map(lambda g: (score(sum(g, []), data), g), grids))