From: Tomas Musil Date: Sat, 7 Apr 2012 11:12:55 +0000 (+0200) Subject: improved code style X-Git-Url: http://git.tomasm.cz/imago.git/commitdiff_plain/cb5eb5a01ee68e22c9ac02a6feaf52c46bfc6c0e?ds=sidebyside;hp=15a3ebaaddc23a2f69048d1def5a7f960d141d6b improved code style Tabs (accidentaly introduced in previous commit) converted to spaces, long lines split up, etc. --- diff --git a/filter.py b/filters.py similarity index 74% rename from filter.py rename to filters.py index c350ef5..df3b49f 100644 --- a/filter.py +++ b/filters.py @@ -1,4 +1,5 @@ from PIL import Image + from commons import clear def edge_detection(image): @@ -9,7 +10,11 @@ def edge_detection(image): print "edge detection" for x in range(2, image.size[0] - 2): for y in range(2, image.size[1] - 2): - pix = sum([sum([image_l[a, b] for b in range(y - 2, y + 3)]) for a in range(x - 2, x + 3)]) - (25 * image_l[x, y]) + pix = (sum([sum( + [image_l[a, b] + for b in range(y - 2, y + 3)]) + for a in range(x - 2, x + 3)]) + - (25 * image_l[x, y])) if pix > 255: pix = 255 if pix < 0: @@ -17,7 +22,7 @@ def edge_detection(image): new_image_l[x, y] = pix return new_image -def high_pass(image, high_pass): +def high_pass(image, height): image_l = image.load() new_image = Image.new('L', image.size) new_image_l = new_image.load() @@ -25,7 +30,7 @@ def high_pass(image, high_pass): print "high pass filter" for x in xrange(image.size[0]): for y in xrange(image.size[1]): - if image_l[x, y] < high_pass: + if image_l[x, y] < height: new_image_l[x, y] = 0 else: new_image_l[x, y] = image_l[x, y] diff --git a/greyscale_test.py b/greyscale_test.py index 52286e4..160bc78 100755 --- a/greyscale_test.py +++ b/greyscale_test.py @@ -1,8 +1,8 @@ #!/usr/bin/env python import Image, ImageMath + import im_debug -import sys im = Image.open('./image.jpg') im_debug.show(im, 'Original image') diff --git a/hough.py b/hough.py index 5fca93f..d01416a 100644 --- a/hough.py +++ b/hough.py @@ -1,10 +1,12 @@ -from PIL import Image from math import sin, cos, pi + +from PIL import Image + from commons import clear class Hough: def __init__(self, size): - self.size = size + self.size = size self.dt = pi / size[1] self.initial_angle = (pi / 4) + (self.dt / 2) @@ -30,7 +32,8 @@ class Hough: distance = (((x - (size[0] / 2)) * sin((dt * a) + initial_angle)) + ((y - (size[1] / 2)) * -cos((dt * a) + initial_angle)) + size[0] / 2) - column = int(round(distance)) # column of the matrix closest to the distance + # column of the matrix closest to the distance + column = int(round(distance)) if column >= 0 and column < size[0]: matrix[column][a] += 1 @@ -48,12 +51,12 @@ class Hough: return new_image def all_lines(self, image): - im_l = image.load() - lines = [] - for x in xrange(image.size[0]): + im_l = image.load() + lines = [] + for x in xrange(image.size[0]): for y in xrange(image.size[1]): - if im_l[x, y]: - lines.append(self.angle_distance((x, y))) + if im_l[x, y]: + lines.append(self.angle_distance((x, y))) return lines def find_angle_distance(self, image): @@ -86,5 +89,5 @@ class Hough: return [self.angle_distance(p) for p in points] def angle_distance(self, point): - return (self.dt * point[1] + self.initial_angle, point[0] - self.size[0] / 2) - + return (self.dt * point[1] + self.initial_angle, point[0] - self.size[0] / 2) + diff --git a/im_debug.py b/im_debug.py index 44ee17c..0ac72aa 100644 --- a/im_debug.py +++ b/im_debug.py @@ -1,6 +1,5 @@ try: import pygame - import Image except ImportError, msg: import sys print >>sys.stderr, msg diff --git a/imago.py b/imago.py index d234fec..13702b0 100755 --- a/imago.py +++ b/imago.py @@ -1,21 +1,26 @@ #!/usr/bin/env python -"""Usage: imago.py file - analyses the given file - imago.py file --debug - shows every step of the computation - imago.py --help - shows this help""" +"""Usage: +imago.py file + analyses the given file +imago.py file --debug + shows every step of the computation +imago.py --help + shows this help + +""" import sys import math + try: import Image, ImageDraw except ImportError, msg: print >>sys.stderr, msg sys.exit(1) + import im_debug -import filter +import filters from hough import Hough class UsageError(Exception): @@ -47,37 +52,37 @@ def main(*argv): print >>sys.stderr, msg return 1 if show_all: - im_debug.show(image, "original image") + im_debug.show(image, "original image") im_l = image.convert('L') if show_all: im_debug.show(im_l, "ITU-R 601-2 luma transform") - im_edges = filter.edge_detection(im_l) + im_edges = filters.edge_detection(im_l) if show_all: im_debug.show(im_edges, "edge detection") - im_h = filter.high_pass(im_edges, 100) + im_h = filters.high_pass(im_edges, 100) if show_all: - im_debug.show(im_h, "high pass filter") + im_debug.show(im_h, "high pass filters") hough1 = Hough(im_h.size) im_hough = hough1.transform(im_h) if show_all: im_debug.show(im_hough, "hough transform") - im_h2 = filter.high_pass(im_hough, 120) + im_h2 = filters.high_pass(im_hough, 120) if show_all: - im_debug.show(im_h2, "second high pass filter") + im_debug.show(im_h2, "second high pass filters") hough2 = Hough(im_h2.size) im_hough2 = hough2.transform(im_h2) if show_all: im_debug.show(im_hough2, "second hough transform") - im_h3 = filter.high_pass(im_hough2, 120) + im_h3 = filters.high_pass(im_hough2, 120) if show_all: - im_debug.show(im_h3, "third high pass filter") + im_debug.show(im_h3, "third high pass filters") lines = hough2.find_angle_distance(im_h3) @@ -86,9 +91,9 @@ def main(*argv): draw = ImageDraw.Draw(im_lines) for line in lines: - draw.line(line_from_angl_dist(line, im_h2.size), fill=255) + draw.line(line_from_angl_dist(line, im_h2.size), fill=255) if show_all: - im_debug.show(im_lines, "lines") + im_debug.show(im_lines, "lines") im_c = combine(im_h2, im_lines) if show_all: @@ -101,7 +106,7 @@ def main(*argv): lines = hough1.all_lines(im_c) draw = ImageDraw.Draw(image) for line in lines: - draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120)) + draw.line(line_from_angl_dist(line, image.size), fill=(120, 255, 120)) im_debug.show(image, "the grid") @@ -112,14 +117,14 @@ def collapse(image): im_l = image.load() last = False for y in xrange(image.size[1]): - for x in xrange(image.size[0]): - if im_l[x,y] and last: + for x in xrange(image.size[0]): + if im_l[x, y] and last: im_l[x, y] = 0 - last = False - elif im_l[x, y]: - last = True - elif last: - last = False + last = False + elif im_l[x, y]: + last = True + elif last: + last = False def combine(image1, image2): im_l1 = image1.load() @@ -130,8 +135,8 @@ def combine(image1, image2): for x in xrange(image1.size[0]): for y in xrange(image1.size[1]): - if im_l1[x, y] and im_l2[x, y]: - im_nl[x, y] = 255 + if im_l1[x, y] and im_l2[x, y]: + im_nl[x, y] = 255 return im_n def line_from_angl_dist((angle, distance), size):