X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/ccd80f6896303234addbb0f619335b6e59df7746..f6ca219fa69085fbbf9feff7ab72c51e805bc9bb:/src/app/widgets/column.py?ds=sidebyside

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index c0d8455..e55b935 100755
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -6,13 +6,11 @@ $Id$
 $URL$
 """
 import pygame
-from colorsys import hls_to_rgb
 from gradients import gradients
-import events
-from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 from globals import BACKGROUND_LAYER
 from globals import FOREGROUND_LAYER
+from globals import hls_to_rgba_8bits
 from config import OFF_LUMINANCE
 from config import OFF_SATURATION
 from config import ON_TOP_LUMINANCE
@@ -24,9 +22,9 @@ from config import FONT
 from config import FONT_COLOR
 
 
-class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
+class Column(pygame.sprite.DirtySprite) :
     
-    def __init__(self, group, hue, rect, tone) :
+    def __init__(self, group, hue, rect, tone, atBorder) :
         pygame.sprite.DirtySprite.__init__(self, group)
         self.state = False
         
@@ -53,6 +51,9 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
         onLeft = rect.centerx - onWidth / 2
         rectOn = pygame.Rect((onLeft, 0),
                              (onWidth, rect.height))
+        if atBorder :
+            setattr(rectOn, atBorder, getattr(rect, atBorder))
+
         self.surOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         w, h = rectOn.w, rectOn.h
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
@@ -61,8 +62,6 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
         
         self.image = self.surOff
         self.rect = rect
-        #EventDispatcher.addEventListener(pygame.MOUSEBUTTONDOWN, self.onMouseDown)
-        #EventDispatcher.addEventListener(pygame.MOUSEBUTTONUP, self.onMouseUp)
     
     def update(self, state, syllabus='') :
         group = self.groups()[0]
@@ -88,38 +87,4 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
             self.rect = self.rectOff
         self.state = state
         self.dirty = 1    
-    
-    #@event_handler(pygame.MOUSEBUTTONDOWN)
-    def onMouseDown(self, event) :
-        if self.rect.collidepoint(*event.pos) and self.state :
-            self.raiseKeyDown()
-
-    @event_handler(pygame.MOUSEBUTTONUP)
-    def onMouseUp(self, event) :
-        self.raiseKeyUp()
-    
-    def raiseKeyDown(self) :
-        evt = pygame.event.Event(events.KEYDOWN, column=self)
-        pygame.event.post(evt)
-        print 'down', self.tone.nom
 
-    def raiseKeyUp(self) :
-        if self.state :
-            evt = pygame.event.Event(events.KEYUP, column=self)
-            pygame.event.post(evt)
-            print 'up', self.tone.nom
-    
-#    def raiseNoteOn(self) :
-#        evt = pygame.event.Event(events.NOTEON, tone=self.tone)
-#        pygame.event.post(evt)
-#
-#    def raiseNoteOff(self) :
-#        evt = pygame.event.Event(events.NOTEOFF, tone=self.tone)
-#        pygame.event.post(evt)
-
-
-        
-def hls_to_rgba_8bits(h, l, s, a=1) :
-    #convert to rgb ranging from 0 to 255
-    rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (a,)]
-    return tuple(rgba)