X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/ea641d921996c040ee1af76c71ea98d75fa853af..bf4fd0cf6bb79dffd32e4995f0b312fb1a32502f:/src/app/widgets/playingscreen.py diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 91b73a7..571a3d9 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -7,26 +7,16 @@ $Id$ $URL$ """ import pygame -#from colorsys import hls_to_rgb -#from gradients import gradients from cursors import WarpingCursor from column import Column import events from eventutils import event_handler, EventDispatcher, EventHandlerMixin -#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 -#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 -#from config import ON_COLUMN_ALPHA from config import DEFAULT_MIDI_VELOCITY from globals import BACKGROUND_LAYER @@ -51,8 +41,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : self._initColumns() self._running = False self.draw(pygame.display.get_surface()) - self._initCursor() - + self._initCursor() def _initRects(self) : """ création des espaces réservés pour @@ -114,7 +103,31 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : def handleKeyDown(self, event) : if event.key == pygame.K_q: self._running = False - + + @event_handler(pygame.MOUSEBUTTONDOWN) + def onMouseDown(self, event) : + # TODO à cleaner : on vire le dernier élément + # parce qu'il s'agit du curseur + for col in reversed(self.sprites()[:-1]) : + if col.rect.collidepoint(*event.pos): + self.raiseKeyDown(col) + break + + @event_handler(pygame.MOUSEBUTTONUP) + def onMouseUp(self, event) : + for col in reversed(self.sprites()[:-1]) : + if col.rect.collidepoint(*event.pos) : + self.raiseKeyUp(col) + break + + def raiseKeyDown(self, col) : + evt = pygame.event.Event(events.COLDOWN, column=col) + pygame.event.post(evt) + + def raiseKeyUp(self, col) : + evt = pygame.event.Event(events.COLUP, column=col) + pygame.event.post(evt) + class PlayingScreen(_PlayingScreenBase) : "fenêtre de jeu pour improvisation" @@ -145,116 +158,29 @@ class SongPlayingScreen(_PlayingScreenBase) : def __init__(self, synth, song, mode=PLAYING_MODES['NORMAL']) : super(SongPlayingScreen, self).__init__(synth, song.distinctNotes) self.song = song + self.currentColumn = None self.noteIterator = self.song.iterNotes() - self.play() + self.displayNext() - def play(self) : + def displayNext(self) : + if self.currentColumn: + self.currentColumn.update(False) note, verseIndex = self.noteIterator.next() - syllabus = note.lyrics[verseIndex].syllabus() + syllabus = note.lyrics[verseIndex].syllabus(encoding="iso-8859-1") column = self.columns[note.midi] column.update(True, syllabus) + self.currentColumn = column + self.currentNotePlayed = False + @event_handler(events.COLDOWN) + def handleColumnDown(self, event) : + col = event.column + if col.state: + self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY) + self.currentNotePlayed = True - @event_handler(events.NOTEON) - def noteon(self, evt) : - tone = evt.tone - self.synth.noteon(0, tone.midi, DEFAULT_MIDI_VELOCITY) - - @event_handler(events.NOTEOFF) - def noteoff(self, evt) : - tone = evt.tone - self.synth.noteoff(0, tone.midi) - - - -#class Column(pygame.sprite.DirtySprite, EventHandlerMixin) : -# -# def __init__(self, group, hue, rect, tone) : -# pygame.sprite.DirtySprite.__init__(self, group) -# self.state = False -# -# # nom de l'intonation -# self.tone = tone -# toneName = FONT.render(tone.nom, True, (0,0,0)) -# -# # état off : surface unie et nom de l'intonation -# 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.surOff = sur -# self.rectOff = rect -# -# -# # état on : surface dégradée avec nom de la note avec largeur agrandie -# topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION, ON_COLUMN_ALPHA) -# bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION, ON_COLUMN_ALPHA) -# onWidth = rect.width * ON_COLUMN_OVERSIZING -# onLeft = rect.centerx - onWidth / 2 -# rectOn = pygame.Rect((onLeft, 0), -# (onWidth, rect.height)) -# self.surOn = gradients.vertical(rectOn.size, topRgba, bottomRgba) -# w, h = rectOn.w, rectOn.h -# toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th)) -# self.surOn.blit(toneName, toneRect) -# self.rectOn = rectOn -# -# self.image = self.surOff -# self.rect = rect -# #EventDispatcher.addEventListener(pygame.MOUSEBUTTONDOWN, self.onMouseDown) -# #EventDispatcher.addEventListener(pygame.MOUSEBUTTONUP, self.onMouseUp) -# -# def update(self, state, syllabus='') : -# group = self.groups()[0] -# if state == self.state : -# # no changes -# return -# if state : -# group.change_layer(self, FOREGROUND_LAYER) -# sur = self.surOn -# if syllabus : -# sur = sur.copy() -# renderedSyl = FONT.render(syllabus, True, (0,0,0)) -# sw, sh, = renderedSyl.get_size() -# w, h = self.rectOn.w, self.rectOn.h -# sylRect = pygame.Rect(((w - sw) / 2, (h - sh) / 2), (sw, sh)) -# sur.blit(renderedSyl, sylRect) -# -# self.image = sur -# self.rect = self.rectOn -# else : -# group.change_layer(self, BACKGROUND_LAYER) -# self.image = self.surOff -# self.rect = self.rectOff -# self.state = state -# self.dirty = 1 -# -# @event_handler(pygame.MOUSEBUTTONDOWN) -# def onMouseDown(self, event) : -# if self.rect.collidepoint(*event.pos) : -# self.update(True) -# self.raiseNoteOn() -# -# @event_handler(pygame.MOUSEBUTTONUP) -# def onMouseUp(self, event) : -# self.update(False) -# self.raiseNoteOff() -# -# def raiseNoteOn(self) : -# evt = pygame.event.Event(events.NOTEON, tone=self.tone) -# pygame.event.post(evt) -# -# def raiseNoteOff(self) : -# evt = pygame.event.Event(events.NOTEOFF, tone=self.tone) -# pygame.event.post(evt) -# -# -# -#def hls_to_rgba_8bits(h, l, s, a=1) : -# #convert to rgb ranging from 0 to 255 -# rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (a,)] -# return tuple(rgba) -# \ No newline at end of file + @event_handler(events.COLUP) + def handleColumnUp(self, event) : + if self.currentNotePlayed : + self.synth.noteoff(0, self.currentColumn.tone.midi) + self.displayNext()