X-Git-Url: http://git.tomasm.cz/imago.git/blobdiff_plain/763884f1a5fd3c98e53112f2d136b7e5ecea3343..16a9526d24fbdad7bbc544aeae9fd7ba067b3d91:/imago_pack/filters.py diff --git a/imago_pack/filters.py b/imago_pack/filters.py index 3a64039..a879ee9 100644 --- a/imago_pack/filters.py +++ b/imago_pack/filters.py @@ -1,8 +1,15 @@ +"""Image filters module. + +All filters return a filtered copy of the image, the original image is +preserved. +""" + from PIL import Image, ImageFilter import pcf def color_enhance(image): + """Stretch all color channels to their full range.""" image_l = image.load() min_r, min_g, min_b = 999, 999, 999 max_r, max_g, max_b = -1, -1, -1 @@ -25,11 +32,11 @@ def color_enhance(image): g = (g - min_g) * 255 / (max_g - min_g) b = (b - min_b) * 255 / (max_b - min_b) new_image_l[x, y] = (r, g, b) - # print min_r, max_r, r, g, b return new_image def edge_detection(image): + """Edge detection (on BW images).""" new_image = image.filter(ImageFilter.GaussianBlur()) # GaussianBlur is undocumented class, it might not work in future versions # of PIL @@ -38,6 +45,7 @@ def edge_detection(image): return new_image def peaks(image): + """Peak filter (on BW images).""" image_l = image.load() new_image = Image.new('L', image.size) new_image_l = new_image.load() @@ -57,6 +65,7 @@ def peaks(image): return new_image def high_pass(image, height): + """High pass filter (on BW images).""" image_l = image.load() new_image = Image.new('L', image.size) new_image_l = new_image.load() @@ -70,7 +79,9 @@ def high_pass(image, height): return new_image -def components(image): +def components(image, diameter): + # TODO comment + # TODO refactor image_l = image.load() new_image = Image.new('L', image.size) new_image_l = new_image.load() @@ -78,88 +89,67 @@ def components(image): components = [None] comp_counter = 1 - for y in xrange(1, image.size[1] - 1): - for x in xrange(1, image.size[0] - 1): - if image_l[x, y]: - s = {0} - s.add(new_image_l[x - 1, y - 1]) - s.add(new_image_l[x, y - 1]) - s.add(new_image_l[x + 1, y - 1]) - s.add(new_image_l[x - 1, y]) - if len(s) == 1: - components.append(set()) - new_image_l[x, y] = comp_counter - components[comp_counter].add((x, y)) - comp_counter += 1 - elif len(s) == 2: - s.remove(0) - c = s.pop() - new_image_l[x, y] = c - components[c].add((x,y)) - else: - s.remove(0) - c1, c2 = s.pop(), s.pop() - components[c2].add((x, y)) - for (x1, y1) in components[c2]: - new_image_l[x1, y1] = c1 - components[c1] = components[c1] | components[c2] - components[c2] = None - - new_image = Image.new('L', image.size) - new_image_l = new_image.load() - - for component in components: - if component: - x_c = 0 - y_c = 0 - c = 0 - for (x, y) in component: - x_c += x - y_c += y - c += 1 - new_image_l[int(round(float(x_c)/c)), int(round(float(y_c)/c))] = 255 - - - return new_image - -def components2(image): - image_l = image.load() - new_image = Image.new('L', image.size) - new_image_l = new_image.load() - - components = [None] - comp_counter = 1 - - for y in xrange(2, image.size[1] - 2): - for x in xrange(2, image.size[0] - 2): - if image_l[x, y]: - - s = {0} - for (a, b) in [(a,b) for a in range(x - 2, x + 3) - for b in range(y - 2, y + 1)]: - if not (b == y and a >= x): - s.add(new_image_l[a, b]) - - if len(s) == 1: - components.append(set()) - new_image_l[x, y] = comp_counter - components[comp_counter].add((x, y)) - comp_counter += 1 - elif len(s) == 2: - s.remove(0) - c = s.pop() - new_image_l[x, y] = c - components[c].add((x,y)) - else: - s.remove(0) - c1 = s.pop() - components[c1].add((x, y)) - new_image_l[x, y] = c1 - for c2 in s: + if diameter == 1: + for y in xrange(1, image.size[1] - 1): + for x in xrange(1, image.size[0] - 1): + if image_l[x, y]: + s = {0} + s.add(new_image_l[x - 1, y - 1]) + s.add(new_image_l[x, y - 1]) + s.add(new_image_l[x + 1, y - 1]) + s.add(new_image_l[x - 1, y]) + if len(s) == 1: + components.append(set()) + new_image_l[x, y] = comp_counter + components[comp_counter].add((x, y)) + comp_counter += 1 + elif len(s) == 2: + s.remove(0) + c = s.pop() + new_image_l[x, y] = c + components[c].add((x,y)) + else: + s.remove(0) + c1, c2 = s.pop(), s.pop() + components[c2].add((x, y)) for (x1, y1) in components[c2]: new_image_l[x1, y1] = c1 components[c1] = components[c1] | components[c2] components[c2] = None + elif diameter == 2: + for y in xrange(2, image.size[1] - 2): + for x in xrange(2, image.size[0] - 2): + if image_l[x, y]: + + s = {0} + for (a, b) in [(a,b) for a in range(x - 2, x + 3) + for b in range(y - 2, y + 1)]: + if not (b == y and a >= x): + s.add(new_image_l[a, b]) + + if len(s) == 1: + components.append(set()) + new_image_l[x, y] = comp_counter + components[comp_counter].add((x, y)) + comp_counter += 1 + elif len(s) == 2: + s.remove(0) + c = s.pop() + new_image_l[x, y] = c + components[c].add((x,y)) + else: + s.remove(0) + c1 = s.pop() + components[c1].add((x, y)) + new_image_l[x, y] = c1 + for c2 in s: + for (x1, y1) in components[c2]: + new_image_l[x1, y1] = c1 + components[c1] = components[c1] | components[c2] + components[c2] = None + else: + pass #TODO error + new_image = Image.new('L', image.size) new_image_l = new_image.load() @@ -176,3 +166,4 @@ def components2(image): new_image_l[int(round(float(x_c)/c)), int(round(float(y_c)/c))] = 255 return new_image +