affichage des noms de note.

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index b4d5cb4..162f182 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -15,6 +15,7 @@ from math import floor
 import types
 from musicxml import Tone
 
+from config import FRAMERATE
 from config import BORDER
 from config import FIRST_HUE
 from config import OFF_LUMINANCE
@@ -27,7 +28,7 @@ from config import ON_COLUMN_ALPHA
 from config import FONT
 from config import FONT_COLOR
 
-class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) :
+class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     def __init__(self, distinctNotes=[]) :
         """
@@ -94,7 +95,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) :
             EventDispatcher.dispatchEvents()
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
-            clock.tick(50)
+            clock.tick(FRAMERATE)
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
@@ -134,13 +135,19 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         super(SongPlayingScreenTest, self).__init__([o])
     
 
-class Column(pygame.sprite.Sprite, EventHandlerMixin) :
+class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
     
     def __init__(self, group, hue, rect, tone) :
-        pygame.sprite.Sprite.__init__(self, group)
+        pygame.sprite.DirtySprite.__init__(self, group)
+        
+        toneName = FONT.render(tone.nom, True, (0,0,0))        
         sur = pygame.surface.Surface(rect.size)
         rgba = hls_to_rgba_8bits(hue, OFF_LUMINANCE, OFF_SATURATION)
         sur.fill(rgba)
+        w, h = rect.w, rect.h
+        tw, th, = toneName.get_size()
+        toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
+        sur.blit(toneName, toneRect)
         self.stateOff = sur
         self.rectOff = rect
         
@@ -151,11 +158,13 @@ class Column(pygame.sprite.Sprite, EventHandlerMixin) :
         rectOn = pygame.Rect((onLeft, 0),
                              (onWidth, rect.height))
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
+        w, h = rectOn.w, rectOn.h
+        toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
+        self.stateOn.blit(toneName, toneRect)
         self.rectOn = rectOn
         
         self.image = self.stateOff
         self.rect = rect
-        self.toneName = FONT.render(tone.nom, True, (0,0,0))
     
     def update(self, state) :
         group = self.groups()[0]