improved code style

[imago.git] / imago.py

diff --git a/imago.py b/imago.py
index d234fec..13702b0 100755 (executable)
--- a/imago.py
+++ b/imago.py
@@ -1,21 +1,26 @@
 #!/usr/bin/env python
 
 #!/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
 
 import sys
 import math

+

 try:
     import Image, ImageDraw
 except ImportError, msg:
     print >>sys.stderr, msg
     sys.exit(1)
 try:
     import Image, ImageDraw
 except ImportError, msg:
     print >>sys.stderr, msg
     sys.exit(1)

+

 import im_debug
 import im_debug

-import filter
+import filters

 from hough import Hough
 
 class UsageError(Exception):
 from hough import Hough
 
 class UsageError(Exception):


@@ -47,37 +52,37 @@ def main(*argv):
         print >>sys.stderr, msg
         return 1
     if show_all:
         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_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")
 
     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:
     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")
 
     
     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:
     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")
 
 
     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:
     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)
 
      
     lines = hough2.find_angle_distance(im_h3)
 


@@ -86,9 +91,9 @@ def main(*argv):
     draw = ImageDraw.Draw(im_lines)
 
     for line in lines:
     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:
     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:
 
     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:
     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")
 
 
     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]):
     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
                 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()
 
 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]):
 
     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):
     return im_n
 
 def line_from_angl_dist((angle, distance), size):