Ajout de listeners sur les colonnes.

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 09b9550..0c5e2a4 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -10,11 +10,12 @@ import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 from cursors import WarpingCursor
 from colorsys import hls_to_rgb
 from gradients import gradients
 from cursors import WarpingCursor

+from eventutils import event_handler, EventDispatcher, EventHandlerMixin

 from math import floor
 import types
 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.
 from math import floor
 import types
 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.

-BORDER = 5 # 5px
+BORDER = 0 # 5px

 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 OFF_SATURATION = 1
 FIRST_HUE = 0.6
 OFF_LUMINANCE = 0.2
 OFF_SATURATION = 1


@@ -24,27 +25,7 @@ ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 1.5
 
 
 ON_COLUMN_OVERSIZING = 1.5
 
 

-def event_handler(eventType) :
-    def doRename(m) :
-        m.__name__ = 'eventHandler%s' % eventType
-        return m
-    return doRename
-
-
-class MetaRenamer(type):
-    def __new__(mcs, name, bases, dict) :
-        for k, v in dict.items() :
-            if isinstance(v, types.FunctionType) :
-                if k != v.__name__ :
-                    print 'renommage de %s en %s' % (k, v.__name__)
-                    dict[v.__name__] = v
-                    del dict[k]
-        return type.__new__(mcs, name, bases, dict)
-
-
-class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
-
-    __metaclass__ = MetaRenamer
+class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :

 
     def __init__(self, distinctNotes=[]) :
         """
 
     def __init__(self, distinctNotes=[]) :
         """


@@ -95,13 +76,12 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i

-            print hue

             c = Column(hue, rect)
             self.add(c)
     
     def _initCursor(self) :
             c = Column(hue, rect)
             self.add(c)
     
     def _initCursor(self) :

-        self.cursor = WarpingCursor()
-        #self.add(self.cursor)
+        self.cursor = WarpingCursor(blinkMode=True)
+        self.add(self.cursor)

         
         
     def highlightColumn(self, index) :
         
         
     def highlightColumn(self, index) :


@@ -111,15 +91,13 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
     
     def run(self):
         self._running = True
     
     def run(self):
         self._running = True

+        clock = pygame.time.Clock()
+        pygame.display.flip()

         while self._running :
         while self._running :

-            pygame.display.flip()
-            events = pygame.event.get()
-            for event in events:
-                self.input(event)
-
-    def input(self, event) :
-        handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
-        handler(event)
+            EventDispatcher.dispatchEvents()
+            dirty = self.draw(pygame.display.get_surface())
+            pygame.display.update(dirty)
+            clock.tick(50)

     
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
     
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :


@@ -151,7 +129,7 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         super(SongPlayingScreenTest, self).__init__([o])
     
 
         super(SongPlayingScreenTest, self).__init__([o])
     
 

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

     
     def __init__(self, hue, rect) :
         pygame.sprite.Sprite.__init__(self)
     
     def __init__(self, hue, rect) :
         pygame.sprite.Sprite.__init__(self)


@@ -177,6 +155,15 @@ class Column(pygame.sprite.Sprite) :
         else :
             self.image = self.stateOff
             self.rect = self.rectOff
         else :
             self.image = self.stateOff
             self.rect = self.rectOff

+    
+    @event_handler(pygame.MOUSEBUTTONDOWN)
+    def onMouseDown(self, event) :
+        if self.rect.collidepoint(*event.pos) :
+            self.update(True)
+
+    @event_handler(pygame.MOUSEBUTTONUP)
+    def onMouseUp(self, event) :
+        self.update(False)

         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255
         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255