comments to the specification

[imago.git] / src / intrsc.py

diff --git a/src/intrsc.py b/src/intrsc.py
index cbf922a..68b18a0 100644 (file)
--- a/src/intrsc.py
+++ b/src/intrsc.py
@@ -30,6 +30,11 @@ def board(image, lines, show_all, do_something):
     # TODO refactor show_all, do_something
     # TODO refactor this into smaller functions
     lines = [dst_sort(l) for l in lines]
     # TODO refactor show_all, do_something
     # TODO refactor this into smaller functions
     lines = [dst_sort(l) for l in lines]

+    an0 = (sum([l[0] for l in lines[0]]) / len(lines[0]) - pi / 2)
+    an1 = (sum([l[0] for l in lines[1]]) / len(lines[1]) - pi / 2)
+    if an0 > an1:
+        lines = [lines[1], lines[0]]
+

     intersections = intersections_from_angl_dist(lines, image.size)
 
     if show_all:
     intersections = intersections_from_angl_dist(lines, image.size)
 
     if show_all:


@@ -113,7 +118,7 @@ def board(image, lines, show_all, do_something):
     return output.Board(19, board_r)
 
 def mean_luma(cluster):
     return output.Board(19, board_r)
 
 def mean_luma(cluster):

-    """Return mean luma of the *cluster* of points."""
+    """Return mean luminanace of the *cluster* of points."""

     return sum(c[0][0] for c in cluster) / float(len(cluster))
 
 def to_general(line, size):
     return sum(c[0][0] for c in cluster) / float(len(cluster))
 
 def to_general(line, size):


@@ -129,10 +134,11 @@ def intersection(l1, l2):
     y = (c1 * a2 - a1 * c2) / delim
     return x, y
 
     y = (c1 * a2 - a1 * c2) / delim
     return x, y
 

+# TODO remove the parameter get_all

 def intersections_from_angl_dist(lines, size, get_all=True):
     """Take grid-lines and size of the image. Return intersections."""
 def intersections_from_angl_dist(lines, size, get_all=True):
     """Take grid-lines and size of the image. Return intersections."""

-    lines1 = map(lambda l: to_general(l, size), lines[1])

     lines0 = map(lambda l: to_general(l, size), lines[0])
     lines0 = map(lambda l: to_general(l, size), lines[0])

+    lines1 = map(lambda l: to_general(l, size), lines[1])

     intersections = []
     for l1 in lines1:
         line = []
     intersections = []
     for l1 in lines1:
         line = []


@@ -142,7 +148,7 @@ def intersections_from_angl_dist(lines, size, get_all=True):
     return intersections
    
 def rgb2lumsat(color):
     return intersections
    
 def rgb2lumsat(color):

-    """Convert RGB to luma and HSI model saturation."""
+    """Convert RGB to luminance and HSI model saturation."""

     r, g, b = color
     luma = (0.30 * r + 0.59 * g + 0.11 * b) / 255.0
     max_diff = max(color) - min(color)
     r, g, b = color
     luma = (0.30 * r + 0.59 * g + 0.11 * b) / 255.0
     max_diff = max(color) - min(color)