better scaling

[imago.git] / src / intrsc.py

diff --git a/src/intrsc.py b/src/intrsc.py
index 73de142..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
 


@@ -65,10 +66,7 @@ def board(image, lines, show_all, do_something):
         luma = [s[0] for s in board_raw]
         saturation = [s[1] for s in board_raw]
         pyplot.scatter(luma, saturation, 
         luma = [s[0] for s in board_raw]
         saturation = [s[1] for s in board_raw]
         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()


@@ -187,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