better peak extraction

[imago.git] / imago.py

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

-import math

 import argparse
 import argparse

+import pickle

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


@@ -17,6 +17,7 @@ import im_debug
 import linef
 import manual
 import intrsc
 import linef
 import manual
 import intrsc

+import gridf

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


@@ -25,13 +26,17 @@ def main():
     parser.add_argument('files', metavar='file', nargs='+',
                         help="image to analyse")
     parser.add_argument('-w', type=int, default=640,
     parser.add_argument('files', metavar='file', nargs='+',
                         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()


@@ -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,7 +67,32 @@ 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)
+        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)
 
 
     board = intrsc.board(image, lines, show_all, do_something)
 


@@ -85,17 +115,20 @@ def main():
 
     return 0
 
 
     return 0
 

-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

 
 if __name__ == '__main__':
     try:
 
 if __name__ == '__main__':
     try: