From: pin Date: Fri, 19 Feb 2010 15:32:41 +0000 (+0000) Subject: Gestion des événements funky. X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/a08d887d02d2ba5f61f3c7b0eeb8dae1ba4deddf Gestion des événements funky. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@46 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index a9b62d2..955a3ab 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -10,6 +10,7 @@ import pygame from colorsys import hls_to_rgb from gradients import gradients from math import floor +import types # TODO : positionner cette constance en fonction de la résolution d'affichage # externaliser la conf. BORDER = 5 # 5px @@ -21,7 +22,29 @@ ON_BOTTOM_LUMINANCE = 0.9 ON_SATURATION = 1 ON_COLUMN_OVERSIZING = 1.5 + +def rename_method(newName) : + def doRename(m) : + m.__name__ = newName + 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 + def __init__(self, distinctNotes=[]) : """ distinctNotes : notes disctinctes présentes dans la chanson @@ -85,6 +108,21 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) : 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) + + @rename_method('eventHandler%s' % 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)) + + class SongPlayingScreen(_PlayingScreenBase) : @@ -99,15 +137,6 @@ 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) : @@ -141,4 +170,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) - \ No newline at end of file