less parameters for manual.lines

[imago.git] / filters.py

diff --git a/filters.py b/filters.py
index e770724..825834f 100644 (file)
--- a/filters.py
+++ b/filters.py
@@ -1,22 +1,20 @@
-from PIL import Image
-
-from commons import clear
+from PIL import Image, ImageFilter
 
 def edge_detection(image):
-    clear()
-    print "edge detection"
-
+    image = image.filter(ImageFilter.GaussianBlur())
+    # GaussianBlur is undocumented class, it might not work in future versions
+    # of PIL
     image_l = image.load()
     new_image = Image.new('L', image.size)
     new_image_l = new_image.load()
     
-    for x in range(2, image.size[0] - 2):
-        for y in range(2, image.size[1] - 2):
+    for x in xrange(2, image.size[0] - 2):
+        for y in xrange(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]))
+                - (25  * image_l[x, y]))
             if pix > 255:
                 pix = 255
             if pix < 0:
@@ -25,9 +23,6 @@ def edge_detection(image):
     return new_image
 
 def peaks(image):
-    clear()
-    print "peak extraction"
-
     image_l = image.load()
     new_image = Image.new('L', image.size)
     new_image_l = new_image.load()
@@ -47,9 +42,6 @@ def peaks(image):
     return new_image
 
 def high_pass(image, height):
-    clear()
-    print "high pass filter"
-
     image_l = image.load()
     new_image = Image.new('L', image.size)
     new_image_l = new_image.load()
@@ -64,15 +56,12 @@ def high_pass(image, height):
     return new_image
 
 def components(image):
-    clear()
-    print "components center filter"
-
     image_l = image.load()
     new_image = Image.new('L', image.size)
     new_image_l = new_image.load()
 
-    components = []
-    comp_counter = 0
+    components = [None]
+    comp_counter = 1
 
     for y in xrange(1, image.size[1] - 1):
         for x in xrange(1, image.size[0] - 1):
@@ -113,7 +102,63 @@ def components(image):
                 x_c += x
                 y_c += y
                 c += 1
-        new_image_l[int(round(float(x_c)/c)), int(round(float(y_c)/c))] = 255
+            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:
+                        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
\ No newline at end of file
+    return new_image