removed some unused code

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index 830a53b..decc7a6 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -64,6 +64,13 @@ def main():
     else:
         lines = linef.find_lines(image, show_all, do_something, verbose)
 
     else:
         lines = linef.find_lines(image, show_all, do_something, verbose)
 

+    image_g = image.copy()
+    draw = ImageDraw.Draw(image_g)
+    for line in [l for s in lines for l in s]:
+        draw.line(linef.line_from_angl_dist(line, image.size), fill=(120, 255, 120))
+    if show_all:
+        do_something(image_g, "the grid")
+ 

     intersections = intersections_from_angl_dist(lines, image.size)
     image_g = image.copy()
     draw = ImageDraw.Draw(image_g)
     intersections = intersections_from_angl_dist(lines, image.size)
     image_g = image.copy()
     draw = ImageDraw.Draw(image_g)


@@ -108,18 +115,6 @@ class imsave():
         image.save(filename, 'JPEG')
         self.saving_num += 1
 
         image.save(filename, 'JPEG')
         self.saving_num += 1
 

-def combine(image1, image2):
-    im_l1 = image1.load()
-    im_l2 = image2.load()
-
-    on_both = []
-
-    for x in xrange(image1.size[0]):
-        for y in xrange(image1.size[1]):
-            if im_l1[x, y] and im_l2[x, y]:
-                on_both.append((x, y))
-    return on_both
-

 def intersections_from_angl_dist(lines, size):
     intersections = []
     for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):
 def intersections_from_angl_dist(lines, size):
     intersections = []
     for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)):