X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/a1cb64098e2a34d115378fdced1044da37e94395..ea641d921996c040ee1af76c71ea98d75fa853af:/src/app/widgets/playingscreen.py?ds=inline

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 23f2643..91b73a7 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -7,53 +7,63 @@ $Id$
 $URL$
 """
 import pygame
-from colorsys import hls_to_rgb
-from gradients import gradients
+#from colorsys import hls_to_rgb
+#from gradients import gradients
 from cursors import WarpingCursor
-from eventutils import event_handler, EventHandlerMixin
-from math import floor
+from column import Column
+import events
+from eventutils import event_handler, EventDispatcher, EventHandlerMixin
+#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.2
-OFF_SATURATION = 1
-ON_TOP_LUMINANCE = 0.6
-ON_BOTTOM_LUMINANCE = 0.9
-ON_SATURATION = 1
-ON_COLUMN_OVERSIZING = 1.5
+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
 
-class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
+from globals import BACKGROUND_LAYER
+from globals import CURSOR_LAYER
+from globals import PLAYING_MODES
 
-    def __init__(self, distinctNotes=[]) :
+class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
+
+    def __init__(self, synth, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
         """
         super(_PlayingScreenBase, self).__init__()
+        self.synth = synth
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
         self.cursor = None
         self._initRects()
+        self.columns = {}
         self._initColumns()
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initCursor()
-            
     
     
     def _initRects(self) :
         """ création des espaces réservés pour
             afficher les colonnes.
         """
-        ambitus = self.distinctNotes[-1].midi - self.distinctNotes[0].midi
-        if ambitus <= 12 :
-            self.keyboardLength = 8
-        else :
-            self.keyboardLength = 11
+        #ambitus = self.distinctNotes[-1].midi - self.distinctNotes[0].midi
+        #if ambitus <= 12 :
+        #    self.keyboardLength = 8
+        #else :
+        #    self.keyboardLength = 11
+        self.keyboardLength = len(self.distinctNotes)
         
         screen = pygame.display.get_surface()
 
@@ -76,90 +86,175 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
-            print hue
-            c = Column(hue, rect)
-            self.add(c)
+            tone = self.distinctNotes[i]
+            c = Column(self, hue, rect, tone)
+            self.add(c, layer=BACKGROUND_LAYER)
+            self.columns[tone.midi] = c
+        
     
     def _initCursor(self) :
-        self.cursor = WarpingCursor()
-        #self.add(self.cursor)
-        
+        self.cursor = WarpingCursor(blinkMode=True)
+        self.add(self.cursor, layer=CURSOR_LAYER)
         
-    def highlightColumn(self, index) :
-        for i, sprite in enumerate(self.sprites()) :
-            sprite.update(i==index)
-        self.draw(pygame.display.get_surface())
-    
     def run(self):
         self._running = True
+        clock = pygame.time.Clock()
+        pygame.display.flip()
+        pygame.mouse.set_visible(False)
         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)
-    
+            EventDispatcher.dispatchEvents()
+            dirty = self.draw(pygame.display.get_surface())
+            pygame.display.update(dirty)
+            clock.tick(FRAMERATE)
+
+        pygame.mouse.set_visible(True)
+        self.cursor._stopBlink()
+
     @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 PlayingScreen(_PlayingScreenBase) :
+    "fenêtre de jeu pour improvisation"
     
+    scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
+
+    def __init__(self, synth) :
+        distinctNotes = []
+        for midi in self.scale :
+            tone = Tone(midi)
+            distinctNotes.append(tone)
+        
+        super(PlayingScreen, self).__init__(synth, distinctNotes)
+            
+    @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 SongPlayingScreen(_PlayingScreenBase) :
     
-    def __init__(self, song) :
-        super(SongPlayingScreen, self).__init__(song.distinctNotes)
+    def __init__(self, synth, song, mode=PLAYING_MODES['NORMAL']) :
+        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song
-
-class SongPlayingScreenTest(_PlayingScreenBase) :
-    def __init__(self) :
-        class C:pass
-        o = C()
-        o.midi=1
-        super(SongPlayingScreenTest, self).__init__([o])
+        self.noteIterator = self.song.iterNotes()
+        self.play()
     
-
-class Column(pygame.sprite.Sprite) :
+    def play(self) :
+        note, verseIndex = self.noteIterator.next()
+        syllabus = note.lyrics[verseIndex].syllabus()
+        column = self.columns[note.midi]
+        column.update(True, syllabus)
     
-    def __init__(self, hue, rect) :
-        pygame.sprite.Sprite.__init__(self)
-        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
-        
-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)
+    @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