X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/f6002686fef1bd826f3a1777998416b93d909d56..f16fe1e775f2159741146264a6494e63b0e2d618:/imago.py

diff --git a/imago.py b/imago.py
index 1e5166c..66c758f 100755
--- a/imago.py
+++ b/imago.py
@@ -4,7 +4,6 @@
 
 import sys
 import os
-import math
 import argparse
 
 try:
@@ -26,10 +25,12 @@ def main():
     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")
-    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")
@@ -53,7 +54,7 @@ def main():
                               image.size[1])), Image.ANTIALIAS)
     do_something = im_debug.show
     if args.saving:
-        do_something = imsave("saved/" + args.files[0][:-4] + "_" +
+        do_something = Imsave("saved/" + args.files[0][:-4] + "_" +
                                str(image.size[0]) + "/").save
 
     if args.manual_mode:
@@ -63,8 +64,9 @@ def main():
             #TODO ask user to try again
             return 1
     else:
-        lines = linef.find_lines(image, show_all, do_something, verbose)
-        grid = gridf.find(lines, image.size, None, None)
+        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)
@@ -93,7 +95,7 @@ def main():
 
     return 0
 
-class imsave():
+class Imsave():
     def __init__(self, saving_dir):
         self.saving_dir = saving_dir
         self.saving_num = 0