X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/2644b4adc0fd0a5c7e8b726c79705f283e37d43f..b401645e5761e876866edcab680d54f1310bb0bd:/imago.py?ds=sidebyside diff --git a/imago.py b/imago.py index 3c4ca56..830a53b 100755 --- a/imago.py +++ b/imago.py @@ -15,11 +15,8 @@ except ImportError, msg: sys.exit(1) import im_debug -import filters -from hough import Hough - -Saving_dir = '' -Saving_num = 0 +import linef +import manual def main(): """Main function of the program.""" @@ -29,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: @@ -53,99 +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]) + "/" - - if verbose: - print >> sys.stderr, "preprocessing" - - if show_all: - do_something(image, "original image") - - im_l = image.convert('L') - if show_all: - do_something(im_l, "ITU-R 601-2 luma transform") - - if verbose: - print >> sys.stderr, "edge detection" - - im_edges = filters.edge_detection(im_l) - if show_all: - do_something(im_edges, "edge detection") - - im_h = filters.high_pass(im_edges, 100) - if show_all: - do_something(im_h, "high pass filters") - - if verbose: - print >> sys.stderr, "hough transform" - - hough1 = Hough(im_h.size) - im_hough = hough1.transform(im_h) - if show_all: - do_something(im_hough, "hough transform") - - im_hough = filters.peaks(im_hough) - if show_all: - do_something(im_hough, "peak extraction") - - im_h2 = filters.high_pass(im_hough, 120) - if show_all: - do_something(im_h2, "second high pass filters") - - im_h2 = filters.components(im_h2) - if show_all: - do_something(im_h2, "components centers") - - if verbose: - print >> sys.stderr, "second hough transform" - - hough2 = Hough(im_h2.size) - # im_hough might be used instead im_h2, but at the moment it brings a lot of - # noise to the second transform, which later confuses the center-finding - # mechanism (which is not very robust yet) - im_hough2 = hough2.transform(im_h2) - if show_all: - do_something(im_hough2, "second hough transform") - - im_h3 = filters.high_pass(im_hough2, 120) - if show_all: - do_something(im_h3, "third high pass filter") - - im_h3 = filters.components(im_h3) - if show_all: - do_something(im_h3, "half centers") - - if verbose: - print >> sys.stderr, "finding the grid" - - lines_m = hough2.all_lines_h(im_h3) - lines = [] - im_c = im_h2.convert('RGB').convert('RGB', (1, 0.5, 0.5, 0)) - draw_c = ImageDraw.Draw(im_c) - - for line_l in lines_m: - im_line = Image.new('L', im_h2.size) - draw = ImageDraw.Draw(im_line) - line_points = set() - for line in line_l: - draw.line(line_from_angl_dist(line, im_h2.size), fill=255, width=5) - draw_c.line(line_from_angl_dist(line, im_c.size), fill=(70, 70, 70), width=5) - for p in combine(im_h2, im_line): - line_points.add(p) - for point in line_points: - draw_c.point(point, fill=(120, 255, 120)) - lines.append(hough1.lines_from_list(line_points)) - - if show_all: - do_something(im_c, "hough x lines") - - image_g = image.copy() - draw = ImageDraw.Draw(image_g) - for line in [l for s in lines for l in s]: - draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120)) - if show_all: - do_something(image_g, "the grid") + 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() @@ -179,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() @@ -200,13 +120,6 @@ def combine(image1, image2): on_both.append((x, y)) return on_both -def line_from_angl_dist((angle, distance), size): - x1 = - size[0] / 2 - y1 = int(round((x1 * math.sin(angle) - distance) / math.cos(angle))) + size[1] / 2 - x2 = size[0] / 2 - y2 = int(round((x2 * math.sin(angle) - distance) / math.cos(angle))) + size[1] / 2 - return [(0, y1), (size[0] - 1, y2)] - def intersections_from_angl_dist(lines, size): intersections = [] for (angl1, dist1) in sorted(lines[1], key=itemgetter(1)): @@ -222,4 +135,8 @@ def intersections_from_angl_dist(lines, size): return intersections if __name__ == '__main__': - sys.exit(main()) + try: + sys.exit(main()) + except KeyboardInterrupt: + print "Interrupted." + sys.exit()