X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/33b793fe326a2706173b38d2fc4b454982fbf900..78ff145bbc5a1323c889b174d0f93ab30bfc0efe:/src/imago.py?ds=sidebyside

diff --git a/src/imago.py b/src/imago.py
index 0dd970a..18e7bba 100755
--- a/src/imago.py
+++ b/src/imago.py
@@ -133,10 +133,12 @@ def main():
                 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, logger)
+    intersections = intrsc.b_intersects(image, lines, show_all, do_something, logger)
+    board = intrsc.board(image, intersections, show_all, do_something, logger)
 
     logger("finished")
 
+    # TODO! refactor this mess:
     if len(args.files) == 1:
 
         if args.sgf_output:
@@ -156,7 +158,10 @@ def main():
                 print >> sys.stderr, "Opening", f
             if image.mode == 'P':
                 image = image.convert('RGB')
-            board = intrsc.board(image, lines, show_all, do_something, logger)
+            if image.size[0] > args.w:
+                image = image.resize((args.w, int((float(args.w)/image.size[0]) *
+                              image.size[1])), Image.ANTIALIAS)
+            board = intrsc.board(image, intersections, show_all, do_something, logger)
             if args.sgf_output:
                 game.addMove(board)
             else:
@@ -173,14 +178,15 @@ class Imsave():
         self.saving_num = 0
 
     def save(self, image, title='', name=None):
+        im_format = ('.png', 'PNG')
         if name:
-            filename = self.saving_dir + name + '.jpg'
+            filename = self.saving_dir + name + im_format[0]
         else:
-            filename = self.saving_dir + "{0:0>2}".format(self.saving_num) + '.jpg'
+            filename = self.saving_dir + "{0:0>2}".format(self.saving_num) + im_format[0]
             self.saving_num += 1
         if not os.path.isdir(self.saving_dir):
             os.makedirs(self.saving_dir)
-        image.save(filename, 'JPEG')
+        image.save(filename, im_format[1])
 
 if __name__ == '__main__':
     try: