création d'un dispatcher d'événement central.

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index a9b62d2..248f0bb 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -9,7 +9,10 @@ $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

+from cursors import WarpingCursor
+from eventutils import event_handler, EventDispatcher, EventHandlerMixin

 from math import floor
 from math import floor

+import types

 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.
 BORDER = 5 # 5px
 # TODO : positionner cette constance en fonction de la résolution d'affichage
 # externaliser la conf.
 BORDER = 5 # 5px


@@ -21,19 +24,25 @@ ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 1.5
 
 ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 1.5
 

-class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
+
+class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
+

     def __init__(self, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
         """
     def __init__(self, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
         """

+        print '__init__ _PlayingScreenBase'

         super(_PlayingScreenBase, self).__init__()
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
         super(_PlayingScreenBase, self).__init__()
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []

+        self.cursor = None

         self._initRects()
         self._initColumns()
         self._running = False
         self._initRects()
         self._initColumns()
         self._running = False

+        self.draw(pygame.display.get_surface())
+        self._initCursor()

             
     
     
             
     
     


@@ -68,10 +77,13 @@ 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)
             c = Column(hue, rect)
             self.add(c)

-            
+    
+    def _initCursor(self) :
+        self.cursor = WarpingCursor()
+        #self.add(self.cursor)
+        

         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :
         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :


@@ -80,11 +92,26 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
     
     def run(self):
         self._running = True
     
     def run(self):
         self._running = True

+        clock = pygame.time.Clock()

         while self._running :
             pygame.display.flip()
         while self._running :
             pygame.display.flip()

-            events = pygame.event.get()
-            for event in events:
-                self.input(event)
+            EventDispatcher.dispatchEvents()
+            clock.tick(50)
+    
+    @event_handler(pygame.KEYDOWN)       
+    def handleKeyDown(self, event) :
+        if event.key == pygame.K_q:
+            self._running = False
+        uni = event.unicode
+        
+        if uni.isdigit() and int(uni) <=8 :
+            self.highlightColumn(int(uni))
+    
+    @event_handler(pygame.MOUSEMOTION)
+    def handleMouseMotion(self, event) :
+        pass
+        
+        

     
 
 class SongPlayingScreen(_PlayingScreenBase) :
     
 
 class SongPlayingScreen(_PlayingScreenBase) :


@@ -95,19 +122,11 @@ class SongPlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreenTest(_PlayingScreenBase) :
     def __init__(self) :
 
 class SongPlayingScreenTest(_PlayingScreenBase) :
     def __init__(self) :

+        print '__init__ SongPlayingScreenTest'

         class C:pass
         o = C()
         o.midi=1
         super(SongPlayingScreenTest, self).__init__([o])
         class C:pass
         o = C()
         o.midi=1
         super(SongPlayingScreenTest, self).__init__([o])

-        
-    def input(self, event) :
-        if event.type == pygame.KEYDOWN:
-            if event.key == pygame.K_q:
-                self._running = False
-            uni = event.unicode
-
-            if uni.isdigit() and int(uni) <=8 :
-                self.highlightColumn(int(uni))

     
 
 class Column(pygame.sprite.Sprite) :
     
 
 class Column(pygame.sprite.Sprite) :


@@ -141,4 +160,3 @@ def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255
     rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (1,)]
     return tuple(rgba)
     #convert to rgb ranging from 0 to 255
     rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (1,)]
     return tuple(rgba)

-        
\ No newline at end of file