X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/890c6fc05c289fa41d3db2f17037f3b7428151fb..b401645e5761e876866edcab680d54f1310bb0bd:/imago.py

diff --git a/imago.py b/imago.py
index ea9ee6c..830a53b 100755
--- a/imago.py
+++ b/imago.py
@@ -16,9 +16,7 @@ except ImportError, msg:
 
 import im_debug
 import linef
-
-Saving_dir = ''
-Saving_num = 0
+import manual
 
 def main():
     """Main function of the program."""
@@ -28,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")
+    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('-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
-    do_something = args.do_something
     verbose = args.verbose
 
     try:
@@ -52,10 +50,19 @@ def main():
     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]) + "/"
-    
-    lines = linef.find_lines(image, show_all, do_something, verbose)
+    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)
 
     intersections = intersections_from_angl_dist(lines, image.size)
     image_g = image.copy()
@@ -89,14 +96,17 @@ def stone_color(image, (x, y)):
     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
+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 combine(image1, image2):
     im_l1 = image1.load()