pcf -- combine

[imago.git] / gridf.py

diff --git a/gridf.py b/gridf.py
index bc84ea8..50beb81 100644 (file)
--- a/gridf.py
+++ b/gridf.py
@@ -3,6 +3,7 @@ import Image, ImageDraw, ImageFilter
 from manual import lines as g_grid, l2ad, intersection, line as g_line
 from intrsc import intersections_from_angl_dist
 from linef import line_from_angl_dist
+import pcf
 
 class GridFittingFailedError(Exception):
     pass
@@ -49,12 +50,12 @@ def error_surface(lines, a, b, c, d, hough, size, v1):
     Y = []
     Z = []
     s = 0.001
-    k = 5
+    k = 200
     for i in range(-k, k):
         X.append(range(-k, k))
         Y.append(2*k*[i])
         
-    start = time.clock()
+    start = time.time()
     for x in range(0, 2*k):
         try:
             Z.append([distance(lines, get_grid(a + X[x][y] * s * v1, b + Y[x][y] * s * v1, 
@@ -62,7 +63,7 @@ def error_surface(lines, a, b, c, d, hough, size, v1):
                               size) for y in range(0, 2* k)])
         except Exception:
             Z.append(Z[-1])
-        o = ((time.clock() - start) * (2 * k - (x + 1))) / (60 * (x + 1))
+        o = ((time.time() - start) * (2 * k - (x + 1))) / (60 * (x + 1))
         print x + 1, "{0} h {1:2.2f} m".format(int(o) / 60, o % 60)
     s_file = open('surface' + str(k), 'w')
     pickle.dump((X, Y, Z), s_file)
@@ -154,7 +155,8 @@ def distance(lines, grid, size):
     for line in grid[0] + grid[1]:
         dr_g.line(line, width=1, fill=255)
     #im_g = im_g.filter(MyGaussianBlur(radius=3))
-    im_d, distance = combine(im_l, im_g)
+    #im_d, distance = combine(im_l, im_g)
+    distance = pcf.combine(im_l.tostring(), im_g.tostring())
     return distance
 
 def combine(bg, fg):