better scaling

[imago.git] / src / intrsc.py

diff --git a/src/intrsc.py b/src/intrsc.py
index 68b18a0..2488d14 100644 (file)
--- a/src/intrsc.py
+++ b/src/intrsc.py
@@ -2,6 +2,7 @@
 
 from math import cos, tan, pi
 from operator import itemgetter
 
 from math import cos, tan, pi
 from operator import itemgetter

+import colorsys

 
 import ImageDraw
 
 
 import ImageDraw
 


@@ -57,18 +58,15 @@ def board(image, lines, show_all, do_something):
     board_raw = sum(board_raw, [])
 
     ### Show color distribution
     board_raw = sum(board_raw, [])
 
     ### Show color distribution

-    luma = [s[0] for s in board_raw]
-    saturation = [s[1] for s in board_raw]

 
     if show_all:
         import matplotlib.pyplot as pyplot
         import Image
         fig = pyplot.figure(figsize=(8, 6))
 
     if show_all:
         import matplotlib.pyplot as pyplot
         import Image
         fig = pyplot.figure(figsize=(8, 6))

+        luma = [s[0] for s in board_raw]
+        saturation = [s[1] for s in board_raw]

         pyplot.scatter(luma, saturation, 
         pyplot.scatter(luma, saturation, 

-                       color=[(s[2][0]/255.,
-                               s[2][1]/255.,
-                               s[2][2]/255., 1.) 
-                                   for s in board_raw])
+                       color=[s[2] for s in board_raw])

         pyplot.xlim(0,1)
         pyplot.ylim(0,1)
         fig.canvas.draw()
         pyplot.xlim(0,1)
         pyplot.ylim(0,1)
         fig.canvas.draw()


@@ -77,7 +75,15 @@ def board(image, lines, show_all, do_something):
         image_p = Image.fromstring('RGB', size, buff, 'raw')
         do_something(image_p, "color distribution")
 
         image_p = Image.fromstring('RGB', size, buff, 'raw')
         do_something(image_p, "color distribution")
 

-    clusters = k_means.cluster(3, 2,zip(zip(luma, saturation), range(len(luma))),
+    max_s0 = max(s[0] for s in board_raw)
+    min_s0 = min(s[0] for s in board_raw)
+    norm_s0 = lambda x: (x - min_s0) / (max_s0 - min_s0)
+    max_s1 = max(s[1] for s in board_raw)
+    min_s1 = min(s[1] for s in board_raw)
+    norm_s1 = lambda x: (x - min_s1) / (max_s1 - min_s1)
+    color_data = [(norm_s0(s[0]), norm_s1(s[1])) for s in board_raw]
+
+    clusters = k_means.cluster(3, 2,zip(color_data, range(len(color_data))),

                                [[0., 0.5], [0.5, 0.5], [1., 0.5]])
 
     if show_all:
                                [[0., 0.5], [0.5, 0.5], [1., 0.5]])
 
     if show_all:


@@ -179,8 +185,9 @@ def stone_color_raw(image, (x, y)):
     norm = float(len(points))
     if norm == 0:
         return 0, 0, (0, 0, 0) #TODO trow exception here
     norm = float(len(points))
     if norm == 0:
         return 0, 0, (0, 0, 0) #TODO trow exception here

+    norm = float(norm*255)

     color = (sum(p[0] for p in points) / norm,
              sum(p[1] for p in points) / norm,
              sum(p[2] for p in points) / norm)
     color = (sum(p[0] for p in points) / norm,
              sum(p[1] for p in points) / norm,
              sum(p[2] for p in points) / norm)

-    luma, saturation = rgb2lumsat(color)
+    hue, luma, saturation = colorsys.rgb_to_hls(*color)

     return luma, saturation, color
     return luma, saturation, color