X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/145417a1698105ca84eeb57c650181f8777667e5..e3efa906f4d1c8203c88b5129cfa63598dbf3476:/linef.py?ds=inline

diff --git a/linef.py b/linef.py
old mode 100755
new mode 100644
index f46d92c..4e35781
--- a/linef.py
+++ b/linef.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 """Go image recognition lines-finding module"""
 
 import sys
@@ -45,11 +43,11 @@ def find_lines(image, show_all, do_something, verbose):
     if show_all:
         do_something(im_hough, "hough transform")
 
-    im_hough = filters.peaks(im_hough)
-    if show_all:
-        do_something(im_hough, "peak extraction")
+   # im_hough = filters.peaks(im_hough)
+   # if show_all:
+   #     do_something(im_hough, "peak extraction")
                
-    im_h2 = filters.high_pass(im_hough, 120)
+    im_h2 = filters.high_pass(im_hough, 96)
     if show_all:
         do_something(im_h2, "second high pass filters")
 
@@ -83,6 +81,7 @@ def find_lines(image, show_all, do_something, verbose):
     lines = []
     im_c = im_h2.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0))
     draw_c = ImageDraw.Draw(im_c)
+    bounds = []
 
     for line_l in lines_m:
         im_line = Image.new('L', im_h2.size)
@@ -96,6 +95,9 @@ def find_lines(image, show_all, do_something, verbose):
         for point in line_points:
             draw_c.point(point, fill=(120, 255, 120))
         lines.append(hough1.lines_from_list(line_points))
+        line_points = list(line_points)
+        line_points.sort()
+        bounds += [line_points[0], line_points[-1]]
 
     if show_all:
         do_something(im_c, "hough x lines")
@@ -105,9 +107,9 @@ def find_lines(image, show_all, do_something, verbose):
     for line in [l for s in lines for l in s]:
         draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120))
     if show_all:
-        do_something(image_g, "the grid")
-    
-    return lines
+        do_something(image_g, "lines")
+   
+    return lines, lines_m[0][0], lines_m[1][0], bounds, hough1, im_h
 
 def combine(image1, image2):
     im_l1 = image1.load()