better peak extraction

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index 830a53b..4b87f0f 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -4,9 +4,8 @@
 
 import sys
 import os
 
 import sys
 import os

-import math

 import argparse
 import argparse

-from operator import itemgetter
+import pickle

 
 try:
     import Image, ImageDraw
 
 try:
     import Image, ImageDraw


@@ -17,21 +16,27 @@ except ImportError, msg:
 import im_debug
 import linef
 import manual
 import im_debug
 import linef
 import manual

+import intrsc
+import gridf

 
 def main():
     """Main function of the program."""
     
     parser = argparse.ArgumentParser(description=__doc__)
 
 def main():
     """Main function of the program."""
     
     parser = argparse.ArgumentParser(description=__doc__)

-    parser.add_argument('file', metavar='file', nargs=1,
+    parser.add_argument('files', metavar='file', nargs='+',

                         help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
                         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="scale image to the specified width before analysis")
+    parser.add_argument('-m', '--manual', dest='manual_mode',
+                        action='store_true',

                         help="manual grid selection")
                         help="manual grid selection")

-    parser.add_argument('-d', '--debug', dest='show_all', action='store_true',
+    parser.add_argument('-d', '--debug', dest='show_all',
+                        action='store_true',

                         help="show every step of the computation")
     parser.add_argument('-s', '--save', dest='saving', action='store_true',
                         help="save images instead of displaying them")
                         help="show every step of the computation")
     parser.add_argument('-s', '--save', dest='saving', action='store_true',
                         help="save images instead of displaying them")

+    parser.add_argument('-c', '--cache', dest='l_cache', action='store_true',
+                        help="use cached lines")

     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
                         help="report progress")
     args = parser.parse_args()
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
                         help="report progress")
     args = parser.parse_args()


@@ -40,7 +45,7 @@ def main():
     verbose = args.verbose
 
     try:
     verbose = args.verbose
 
     try:

-        image = Image.open(args.file[0])
+        image = Image.open(args.files[0])

     except IOError, msg:
         print >> sys.stderr, msg
         return 1
     except IOError, msg:
         print >> sys.stderr, msg
         return 1


@@ -52,7 +57,7 @@ def main():
                               image.size[1])), Image.ANTIALIAS)
     do_something = im_debug.show
     if args.saving:
                               image.size[1])), Image.ANTIALIAS)
     do_something = im_debug.show
     if args.saving:

-        do_something = imsave("saved/" + args.file[0][:-4] + "_" +
+        do_something = Imsave("saved/" + args.files[0][:-4] + "_" +

                                str(image.size[0]) + "/").save
 
     if args.manual_mode:
                                str(image.size[0]) + "/").save
 
     if args.manual_mode:


@@ -62,77 +67,68 @@ def main():
             #TODO ask user to try again
             return 1
     else:
             #TODO ask user to try again
             return 1
     else:

-        lines = linef.find_lines(image, show_all, do_something, verbose)
-
-    intersections = intersections_from_angl_dist(lines, image.size)
-    image_g = image.copy()
-    draw = ImageDraw.Draw(image_g)
-    for line in intersections:
-        for (x, y) in line:
-            draw.point((x , y), fill=(120, 255, 120))
+        if args.l_cache:
+            filename = ("saved/cache/" + args.files[0][:-4] + "_" +
+                       str(image.size[0]))
+            cache_dir = "/".join(filename.split('/')[:-1])
+            if os.path.exists(filename):
+                lines, l1, l2, bounds, hough = pickle.load(open(filename))
+                print >> sys.stderr, "using cached results"
+                im_h = None
+            else:
+                lines, l1, l2, bounds, hough, im_h = linef.find_lines(image, show_all, do_something, verbose)
+                if not os.path.isdir(cache_dir):
+                    os.makedirs(cache_dir)
+                d_file = open(filename, 'wb')
+                pickle.dump((lines, l1, l2, bounds, hough), d_file)
+                d_file.close()
+        else:
+            lines, l1, l2, bounds, hough, im_h = linef.find_lines(image, show_all, do_something, verbose)
+
+        grid, lines = gridf.find(lines, image.size, l1, l2, bounds, hough,
+                                 do_something, im_h)
+        if show_all:
+            im_g = image.copy()
+            draw = ImageDraw.Draw(im_g)
+            for l in grid[0] + grid[1]:
+                draw.line(l, fill=(64, 255, 64), width=1)
+            do_something(im_g, "grid", name="grid")
+
+    board = intrsc.board(image, lines, show_all, do_something)
+
+    #simple ASCII output:
+    for line in board:
+        print ' '.join(line)

     
     

-    for line in intersections:
-        print ' '.join([stone_color(image, intersection) for intersection in
-                       line])
-
-    if show_all:
-        do_something(image_g, "intersections")
+    if len(args.files) > 1:
+        for f in args.files[1:]:
+            try:
+                image = Image.open(f)
+            except IOError, msg:
+                print >> sys.stderr, msg
+                continue
+            if image.mode == 'P':
+                image = image.convert('RGB')
+            board = intrsc.board(image, lines, show_all, do_something)
+            for line in board:
+                print ' '.join(line)

 
     return 0
 
 
     return 0
 

-def stone_color(image, (x, y)):
-    suma = 0.
-    for i in range(-2, 3):
-        for j in range(-2, 3):
-            try:
-                suma += sum(image.getpixel((x + i, y + j)))
-            except IndexError:
-                pass
-    suma /= 3 * 25
-    if suma < 55:
-        return 'B'
-    elif suma < 200: 
-        return '.'
-    else:
-        return 'W'
-
-class imsave():
+class Imsave():

     def __init__(self, saving_dir):
         self.saving_dir = saving_dir
         self.saving_num = 0
 
     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'
+    def save(self, image, title='', name=None):
+        if name:
+            filename = self.saving_dir + name + '.jpg'
+        else:
+            filename = self.saving_dir + "{0:0>2}".format(self.saving_num) + '.jpg'
+            self.saving_num += 1

         if not os.path.isdir(self.saving_dir):
             os.makedirs(self.saving_dir)
         image.save(filename, 'JPEG')
         if not os.path.isdir(self.saving_dir):
             os.makedirs(self.saving_dir)
         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)):
-        line = []
-        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 (-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__':
     try:
 
 if __name__ == '__main__':
     try: