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 a28e07d..9f84ee5 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -7,36 +7,21 @@ $Id$
 $URL$
 """
 import pygame
 $URL$
 """
 import pygame

-from colorsys import hls_to_rgb
-from gradients import gradients

 from cursors import WarpingCursor
 from cursors import WarpingCursor

+from column import Column

 import events
 from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 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
 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 FONT
-from config import FONT_COLOR

 from config import DEFAULT_MIDI_VELOCITY
 
 from config import DEFAULT_MIDI_VELOCITY
 

-BACKGROUND_LAYER = 0
-FOREGROUND_LAYER = 1
-CURSOR_LAYER = 2
-PLAYING_MODES = {'EASY':0
-                ,'NORMAL':1
-                ,'ADVANCED':2
-                ,'EXPERT':3}
+from globals import BACKGROUND_LAYER
+from globals import CURSOR_LAYER
+from globals import PLAYING_MODES

 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 


@@ -150,115 +135,27 @@ class SongPlayingScreen(_PlayingScreenBase) :
     def __init__(self, synth, song, mode=PLAYING_MODES['NORMAL']) :
         super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song
     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.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()
         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)
         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.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)
+    @event_handler(events.KEYUP)
+    def handleKeyUp(self, event) :
+        self.synth.noteoff(0, self.currentColumn.tone.midi)
+        self.displayNext()
+    
\ No newline at end of file