X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/fdafbd41faa31dc4d3ffccbe8583db770f08d546..36542520a974d97265a405a50d37c065f7c8db29:/src/app/widgets/playingscreen.py diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 1bf002c..09b9550 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -9,27 +9,59 @@ $URL$ import pygame from colorsys import hls_to_rgb from gradients import gradients +from cursors import WarpingCursor +from math import floor +import types # 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.1 +OFF_LUMINANCE = 0.2 OFF_SATURATION = 1 -ON_TOP_LUMINANCE = 0.9 -ON_BOTTOM_LUMINANCE = 0.6 +ON_TOP_LUMINANCE = 0.6 +ON_BOTTOM_LUMINANCE = 0.9 ON_SATURATION = 1 +ON_COLUMN_OVERSIZING = 1.5 + + +def event_handler(eventType) : + def doRename(m) : + m.__name__ = 'eventHandler%s' % eventType + 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 -class _PlayingScreenBase(object) : def __init__(self, distinctNotes=[]) : """ distinctNotes : notes disctinctes présentes dans la chanson triées du plus grave au plus aigu. """ + super(_PlayingScreenBase, self).__init__() self.distinctNotes = distinctNotes self.keyboardLength = 0 self.keyboardRects = [] + self.cursor = None self._initRects() - self.drawColumns() + self._initColumns() + self._running = False + self.draw(pygame.display.get_surface()) + self._initCursor() + def _initRects(self) : @@ -63,35 +95,90 @@ class _PlayingScreenBase(object) : hueStep = FIRST_HUE / (self.keyboardLength - 1) for i, rect in enumerate(self.keyboardRects) : hue = FIRST_HUE - hueStep * i - c = Column(hue) - + print hue + c = Column(hue, rect) + self.add(c) - def drawColumns(self) : - pass + def _initCursor(self) : + self.cursor = WarpingCursor() + #self.add(self.cursor) + + + def highlightColumn(self, index) : + for i, sprite in enumerate(self.sprites()) : + sprite.update(i==index) + self.draw(pygame.display.get_surface()) - def highLightColumn(self) : - pass + def run(self): + self._running = True + while self._running : + pygame.display.flip() + 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) + + @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) : def __init__(self, song) : super(SongPlayingScreen, self).__init__(song.distinctNotes) self.song = song - +class SongPlayingScreenTest(_PlayingScreenBase) : + def __init__(self) : + class C:pass + o = C() + o.midi=1 + super(SongPlayingScreenTest, self).__init__([o]) + class Column(pygame.sprite.Sprite) : def __init__(self, hue, rect) : pygame.sprite.Sprite.__init__(self) - sur = Surface(rect.size) - rgba = hls_to_rgb(hue, OFF_LUMINANCE, OFF_SATURATION) + (255,) + sur = pygame.surface.Surface(rect.size) + rgba = hls_to_rgba_8bits(hue, OFF_LUMINANCE, OFF_SATURATION) sur.fill(rgba) self.stateOff = sur + self.rectOff = rect + + 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) + self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba) + self.rectOn = rectOn + + self.image = self.stateOff + self.rect = rect + + def update(self, state) : + if state : + self.image = self.stateOn + self.rect = self.rectOn + else : + self.image = self.stateOff + self.rect = self.rectOff - topRgba = hls_to_rgb(hue, ON_TOP_LUMINANCE, ON_SATURATION) + (255,) - bottomRgba = hls_to_rgb(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION) + (255,) - size = rect.inflate(2*rect.width,0).size - self.stateOn = gradients.vertical(size, topRgba, bottomRgba) - \ No newline at end of file +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)