c'est bof... on va essayer autre chose.

[minwii.git] / src / app / widgets / playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index a9b62d2..9f84ee5 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -7,45 +7,53 @@ $Id$
 $URL$
 """
 import pygame
 $URL$
 """
 import pygame

-from colorsys import hls_to_rgb
-from gradients import gradients
-from math import floor
-# 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 cursors import WarpingCursor
+from column import Column
+import events
+from eventutils import event_handler, EventDispatcher, EventHandlerMixin
+import types
+from musicxml import Tone

 
 

-class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
-    def __init__(self, distinctNotes=[]) :
+from config import FRAMERATE
+from config import BORDER
+from config import FIRST_HUE
+from config import DEFAULT_MIDI_VELOCITY
+
+from globals import BACKGROUND_LAYER
+from globals import CURSOR_LAYER
+from globals import PLAYING_MODES
+
+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__()
         """
         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.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []

+        self.cursor = None

         self._initRects()
         self._initRects()

+        self.columns = {}

         self._initColumns()
         self._running = False
         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.
         """
     
     
     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()
 
         
         screen = pygame.display.get_surface()
 


@@ -68,77 +76,86 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
         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 highlightColumn(self, index) :
-        for i, sprite in enumerate(self.sprites()) :
-            sprite.update(i==index)
-        self.draw(pygame.display.get_surface())

     
     

+    def _initCursor(self) :
+        self.cursor = WarpingCursor(blinkMode=True)
+        self.add(self.cursor, layer=CURSOR_LAYER)
+        

     def run(self):
         self._running = True
     def run(self):
         self._running = True

+        clock = pygame.time.Clock()
+        pygame.display.flip()
+        pygame.mouse.set_visible(False)

         while self._running :
         while self._running :

-            pygame.display.flip()
-            events = pygame.event.get()
-            for event in events:
-                self.input(event)
-    
+            EventDispatcher.dispatchEvents()
+            dirty = self.draw(pygame.display.get_surface())
+            pygame.display.update(dirty)
+            clock.tick(FRAMERATE)

 
 

-class SongPlayingScreen(_PlayingScreenBase) :
+        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
+        
+        
+class PlayingScreen(_PlayingScreenBase) :
+    "fenêtre de jeu pour improvisation"

     
     

-    def __init__(self, song) :
-        super(SongPlayingScreen, self).__init__(song.distinctNotes)
-        self.song = song
+    scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]

 
 

-class SongPlayingScreenTest(_PlayingScreenBase) :
-    def __init__(self) :
-        class C:pass
-        o = C()
-        o.midi=1
-        super(SongPlayingScreenTest, self).__init__([o])
+    def __init__(self, synth) :
+        distinctNotes = []
+        for midi in self.scale :
+            tone = Tone(midi)
+            distinctNotes.append(tone)

         
         

-    def input(self, event) :
-        if event.type == pygame.KEYDOWN:
-            if event.key == pygame.K_q:
-                self._running = False
-            uni = event.unicode
+        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)

 
 

-            if uni.isdigit() and int(uni) <=8 :
-                self.highlightColumn(int(uni))
-    

 
 

-class Column(pygame.sprite.Sprite) :
+class SongPlayingScreen(_PlayingScreenBase) :

     
     

-    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 __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.displayNext()

     
     

-    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)
-        
\ No newline at end of file
+    def displayNext(self) :
+        if self.currentColumn:
+            self.currentColumn.update(False)
+        note, verseIndex = self.noteIterator.next()
+        syllabus = note.lyrics[verseIndex].syllabus(encoding="iso-8859-1")
+        column = self.columns[note.midi]
+        column.update(True, syllabus)
+        self.currentColumn = column
+    
+    @event_handler(events.KEYDOWN)
+    def handleKeyDown(self, event) :
+        col = event.column
+        if col == self.currentColumn:
+            self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY)
+    
+    @event_handler(events.KEYUP)
+    def handleKeyUp(self, event) :
+        self.synth.noteoff(0, self.currentColumn.tone.midi)
+        self.displayNext()
+    
\ No newline at end of file