removed some unused code

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index 61e2558..decc7a6 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -15,11 +15,8 @@ except ImportError, msg:
     sys.exit(1)
 
 import im_debug
     sys.exit(1)
 
 import im_debug

-import filters
-from hough import Hough
-
-Saving_dir = ''
-Saving_num = 0
+import linef
+import manual

 
 def main():
     """Main function of the program."""
 
 def main():
     """Main function of the program."""


@@ -29,17 +26,17 @@ def main():
                         help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
                         help="scale image to the specified width before analysis")
                         help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
                         help="scale image to the specified width before analysis")

+    parser.add_argument('-m', '--manual', dest='manual_mode', action='store_true',
+                        help="manual grid selection")

     parser.add_argument('-d', '--debug', dest='show_all', action='store_true',
                         help="show every step of the computation")
     parser.add_argument('-d', '--debug', dest='show_all', action='store_true',
                         help="show every step of the computation")

-    parser.add_argument('-s', '--save', dest='do_something', action='store_const',
-                        const=image_save, default=im_debug.show,
+    parser.add_argument('-s', '--save', dest='saving', action='store_true',

                         help="save images instead of displaying them")
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
                         help="report progress")
     args = parser.parse_args()
 
     show_all = args.show_all
                         help="save images instead of displaying them")
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
                         help="report progress")
     args = parser.parse_args()
 
     show_all = args.show_all

-    do_something = args.do_something

     verbose = args.verbose
 
     try:
     verbose = args.verbose
 
     try:


@@ -47,89 +44,33 @@ def main():
     except IOError, msg:
         print >> sys.stderr, msg
         return 1
     except IOError, msg:
         print >> sys.stderr, msg
         return 1

+    if image.mode == 'P':
+        image = image.convert('RGB')
+    

     if image.size[0] > args.w:
         image = image.resize((args.w, int((float(args.w)/image.size[0]) *
                               image.size[1])), Image.ANTIALIAS)
     if image.size[0] > args.w:
         image = image.resize((args.w, int((float(args.w)/image.size[0]) *
                               image.size[1])), Image.ANTIALIAS)

-    global Saving_dir
-    Saving_dir = "saved/" + args.file[0][:-4] + "_" + str(image.size[0]) + "/"
-    
-    if verbose:
-        print >> sys.stderr, "preprocessing"
-
-    if show_all:
-        do_something(image, "original image")
-
-    im_l = image.convert('L')
-    if show_all:
-        do_something(im_l, "ITU-R 601-2 luma transform")
-
-    if verbose:
-        print >> sys.stderr, "edge detection"
-
-    im_edges = filters.edge_detection(im_l)
-    if show_all:    
-        do_something(im_edges, "edge detection")
-
-    im_h = filters.high_pass(im_edges, 100)
-    if show_all:
-        do_something(im_h, "high pass filters")
-    
-    if verbose:
-        print >> sys.stderr, "hough transform"
-
-    hough1 = Hough(im_h.size)
-    im_hough = hough1.transform(im_h)
-    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_h2 = filters.high_pass(im_hough, 120)
-    if show_all:
-        do_something(im_h2, "second high pass filters")
-
-    im_h2 = filters.components(im_h2)
-    if show_all:
-        do_something(im_h2, "components centers")
-
-    if verbose:
-        print >> sys.stderr, "second hough transform"
-
-    hough2 = Hough(im_h2.size)
-    im_hough2 = hough2.transform(im_h2)
-    if show_all:
-        do_something(im_hough2, "second hough transform")
+    do_something = im_debug.show
+    if args.saving:
+        do_something = imsave("saved/" + args.file[0][:-4] + "_" +
+                               str(image.size[0]) + "/").save
+
+    if args.manual_mode:
+        try:
+            lines = manual.find_lines(image)
+        except manual.UserQuitError:
+            #TODO ask user to try again
+            return 1
+    else:
+        lines = linef.find_lines(image, show_all, do_something, verbose)

 
 

-    im_h3 = filters.high_pass(im_hough2, 120)
-    if show_all:
-        do_something(im_h3, "third high pass filter")
-     
-    im_h3 = filters.half_centers(im_h3)
+    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:
     if show_all:

-        do_something(im_h3, "half centers")
-
-    if verbose:
-        print >> sys.stderr, "finding the grid"
-
-    lines_m = hough2.all_lines(im_h3)
-    lines = []
-
-    for line in lines_m:
-        im_line = Image.new('L', im_h2.size)
-        draw = ImageDraw.Draw(im_line)
-        draw.line(line_from_angl_dist(line, im_h2.size), fill=255, width=5)
-        if show_all:
-            do_something(im_line, "line")
-        im_c = combine(im_h2, im_line)
-        if show_all:
-            do_something(im_c, "hough x lines")
-        lines.append(hough1.all_lines(im_c))
-
-    print lines[0]
-    print lines[1]
-
+        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)


@@ -142,7 +83,7 @@ def main():
                        line])
 
     if show_all:
                        line])
 
     if show_all:

-        do_something(image_g, "the grid")
+        do_something(image_g, "intersections")

 
     return 0
 
 
     return 0
 


@@ -150,7 +91,10 @@ def stone_color(image, (x, y)):
     suma = 0.
     for i in range(-2, 3):
         for j in range(-2, 3):
     suma = 0.
     for i in range(-2, 3):
         for j in range(-2, 3):

-            suma += sum(image.getpixel((x + i, y + j)))
+            try:
+                suma += sum(image.getpixel((x + i, y + j)))
+            except IndexError:
+                pass

     suma /= 3 * 25
     if suma < 55:
         return 'B'
     suma /= 3 * 25
     if suma < 55:
         return 'B'


@@ -159,46 +103,35 @@ def stone_color(image, (x, y)):
     else:
         return 'W'
 
     else:
         return 'W'
 

-def image_save(image, title=''):
-    global Saving_dir
-    global Saving_num
-    filename = Saving_dir + "{0:0>2}".format(Saving_num) + '.jpg'
-    if not os.path.isdir(Saving_dir):
-        os.makedirs(Saving_dir)
-    image.save(filename, 'JPEG')
-    Saving_num += 1
-
-def combine(image1, image2):
-    im_l1 = image1.load()
-    im_l2 = image2.load()
-
-    im_n = Image.new('L', image1.size)
-    im_nl = im_n.load()
-
-    for x in xrange(image1.size[0]):
-        for y in xrange(image1.size[1]):
-            if im_l1[x, y] and im_l2[x, y]:
-                im_nl[x, y] = 255
-    return im_n
-
-def line_from_angl_dist((angle, distance), size):
-    x1 = - size[0] / 2
-    y1 = int(round((x1 * math.sin(angle) - distance) / math.cos(angle))) + size[1] / 2
-    x2 = size[0] / 2 
-    y2 = int(round((x2 * math.sin(angle) - distance) / math.cos(angle))) + size[1] / 2
-    return [(0, y1), (size[0] - 1, y2)]
+class imsave():
+    def __init__(self, saving_dir):
+        self.saving_dir = saving_dir
+        self.saving_num = 0
+
+    def save(self, image, title=''):
+        filename = self.saving_dir + "{0:0>2}".format(self.saving_num) + '.jpg'
+        if not os.path.isdir(self.saving_dir):
+            os.makedirs(self.saving_dir)
+        image.save(filename, 'JPEG')
+        self.saving_num += 1

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

-        for (angl2, dist2) in lines[0]:
+        for (angl2, dist2) in sorted(lines[0], key=itemgetter(1)):

             if abs(angl1 - angl2) > 0.4:
                 x =  - ((dist2 / math.cos(angl2))-(dist1 / math.cos(angl1))) / (math.tan(angl1) - math.tan(angl2))
                 y = (math.tan(angl1) * x) - (dist1 / math.cos(angl1))
             if abs(angl1 - angl2) > 0.4:
                 x =  - ((dist2 / math.cos(angl2))-(dist1 / math.cos(angl1))) / (math.tan(angl1) - math.tan(angl2))
                 y = (math.tan(angl1) * x) - (dist1 / math.cos(angl1))

-                line.append((int(x + size[0] / 2), int(y + size[1] / 2)))
+                if (-size[0] / 2 < x < size[0] / 2 and 
+                    -size[1] / 2 < y < size[1] / 2):
+                    line.append((int(x + size[0] / 2), int(y + size[1] / 2)))

         intersections.append(line)
     return intersections
 
 if __name__ == '__main__':
         intersections.append(line)
     return intersections
 
 if __name__ == '__main__':

-    sys.exit(main())
+    try:
+        sys.exit(main())
+    except KeyboardInterrupt:
+        print "Interrupted."
+        sys.exit()