From: pin Date: Thu, 4 Mar 2010 11:32:26 +0000 (+0000) Subject: affichage des noms de note. X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/commitdiff_plain/e4e71a016e3c9457744817ed104b0b497aaa5ddd?ds=inline affichage des noms de note. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@64 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/app/config.py b/src/app/config.py index aaf51a0..8251872 100755 --- a/src/app/config.py +++ b/src/app/config.py @@ -9,6 +9,7 @@ import pygame pygame.font.init() # playingscreen +FRAMERATE = 50 BORDER = 0 # 5px FIRST_HUE = 0.6 OFF_LUMINANCE = 0.2 @@ -17,6 +18,6 @@ ON_TOP_LUMINANCE = 0.6 ON_BOTTOM_LUMINANCE = 0.9 ON_SATURATION = 1 ON_COLUMN_OVERSIZING = 1.75 -ON_COLUMN_ALPHA = 0.98 +ON_COLUMN_ALPHA = 1 FONT = pygame.font.Font(None, 80) FONT_COLOR = (0,0,0) diff --git a/src/app/widgets/cursors.py b/src/app/widgets/cursors.py index 863b757..9315211 100755 --- a/src/app/widgets/cursors.py +++ b/src/app/widgets/cursors.py @@ -12,7 +12,7 @@ from eventutils import EventHandlerMixin, event_handler from events import TIMEOUT from itertools import cycle -class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin): +class WarpingCursor(pygame.sprite.DirtySprite, EventHandlerMixin): ''' The class for animating the warping cursor ''' @@ -28,7 +28,7 @@ class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin): def __init__(self, theme='black', duration=50, blinkMode=True): - pygame.sprite.Sprite.__init__(self) + pygame.sprite.DirtySprite.__init__(self) pygame.mouse.set_visible(False) imagesPath, images = WarpingCursor._get_theme_images(theme) flashImage = images.pop(images.index('flash.png')) @@ -66,15 +66,18 @@ class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin): @event_handler(TIMEOUT) def loadNext(self, event) : if self._blinking : + self.dirty = 1 self.image = self.iterator.next() @event_handler(pygame.MOUSEBUTTONDOWN) def flashOn(self, event) : + self.dirty = 1 self._blinking = False self.image = self.flashImage @event_handler(pygame.MOUSEBUTTONUP) def flashOff(self, event) : + self.dirty = 1 if self.blinkMode : self._blinking = True self.loadNext(event) @@ -83,4 +86,5 @@ class WarpingCursor(pygame.sprite.Sprite, EventHandlerMixin): @event_handler(pygame.MOUSEMOTION) def move(self, event) : + self.dirty = 1 self.rect.move_ip(event.rel) diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index b4d5cb4..162f182 100755 --- 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]