qq hacks.

[minwii.git] / src / app / widgets / column.py

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index c0d8455..771b1e4 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -8,8 +8,6 @@ $URL$
 import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 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 math import floor
 from globals import BACKGROUND_LAYER
 from globals import FOREGROUND_LAYER


@@ -24,7 +22,7 @@ from config import FONT
 from config import FONT_COLOR
 
 
 from config import FONT_COLOR
 
 

-class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
+class Column(pygame.sprite.DirtySprite) :

     
     def __init__(self, group, hue, rect, tone) :
         pygame.sprite.DirtySprite.__init__(self, group)
     
     def __init__(self, group, hue, rect, tone) :
         pygame.sprite.DirtySprite.__init__(self, group)


@@ -61,8 +59,6 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
         
         self.image = self.surOff
         self.rect = rect
         
         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]
     
     def update(self, state, syllabus='') :
         group = self.groups()[0]


@@ -88,35 +84,6 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
             self.rect = self.rectOff
         self.state = state
         self.dirty = 1    
             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) :
 
         
 def hls_to_rgba_8bits(h, l, s, a=1) :