X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/cd9c8148f1d4c6ea534b92bef5fd97bcc1afb0b2..9d4a748a0863cd7f9dd919362fb2c989e41f5f06:/src/app/widgets/playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index a9b62d2..f881433 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -9,19 +9,23 @@ $URL$
 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
-# TODO : positionner cette constance en fonction de la résolution d'affichage
-# externaliser la conf.
-BORDER = 5 # 5px
-FIRST_HUE = 0.6
-OFF_LUMINANCE = 0.2
-OFF_SATURATION = 1
-ON_TOP_LUMINANCE = 0.6
-ON_BOTTOM_LUMINANCE = 0.9
-ON_SATURATION = 1
-ON_COLUMN_OVERSIZING = 1.5
+import types
+
+from config import BORDER
+from config import FIRST_HUE
+from config import OFF_LUMINANCE
+from config import OFF_SATURATION
+from config import ON_TOP_LUMINANCE
+from config import ON_BOTTOM_LUMINANCE
+from config import ON_SATURATION
+from config import ON_COLUMN_OVERSIZING
+
+
+class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) :
 
-class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
     def __init__(self, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
@@ -31,9 +35,12 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
+        self.cursor = None
         self._initRects()
         self._initColumns()
         self._running = False
+        self.draw(pygame.display.get_surface())
+        self._initCursor()
             
     
     
@@ -68,10 +75,13 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         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)
-            
+            self.add(c, layer=0)
+    
+    def _initCursor(self) :
+        self.cursor = WarpingCursor(blinkMode=True)
+        self.add(self.cursor, layer=2)
+        
         
     def highlightColumn(self, index) :
         for i, sprite in enumerate(self.sprites()) :
@@ -80,11 +90,28 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
     
     def run(self):
         self._running = True
+        clock = pygame.time.Clock()
+        pygame.display.flip()
         while self._running :
-            pygame.display.flip()
-            events = pygame.event.get()
-            for event in events:
-                self.input(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) :
+        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) :
@@ -99,18 +126,9 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         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, EventHandlerMixin) :
     
     def __init__(self, hue, rect) :
         pygame.sprite.Sprite.__init__(self)
@@ -122,7 +140,10 @@ class Column(pygame.sprite.Sprite) :
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)
-        rectOn = rect.inflate(ON_COLUMN_OVERSIZING * rect.width, 0)
+        onWidth = rect.width * ON_COLUMN_OVERSIZING
+        onLeft = rect.centerx - onWidth / 2
+        rectOn = pygame.Rect((onLeft, 0),
+                             (onWidth, rect.height))
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         self.rectOn = rectOn
         
@@ -130,15 +151,26 @@ class Column(pygame.sprite.Sprite) :
         self.rect = rect
     
     def update(self, state) :
+        group = self.groups()[0]
         if state :
+            group.change_layer(self, 1)
             self.image = self.stateOn
             self.rect = self.rectOn
         else :
+            group.change_layer(self, 0)
             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
     rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (1,)]
     return tuple(rgba)
-        
\ No newline at end of file