makefile, readme

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index d648580..33e7c69 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -70,14 +70,15 @@ def main():
         if args.l_cache:
             filename = ("saved/cache/" + args.files[0][:-4] + "_" +
                        str(image.size[0]))
         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 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("saved/cache"):
-                    os.makedirs("saved/cache")
+                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()
                 d_file = open(filename, 'wb')
                 pickle.dump((lines, l1, l2, bounds, hough), d_file)
                 d_file.close()


@@ -85,13 +86,13 @@ def main():
             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,
             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)
+                                 show_all, do_something)

         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)
         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)
+            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)
 


@@ -119,12 +120,15 @@ class Imsave():
         self.saving_dir = saving_dir
         self.saving_num = 0
 
         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: