X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/9845b232ab53ef98733306299e1a52afbabb4e70..6b0b3c12e74171acf85694f61a2814082af8d7ca:/src/minwii/widgets/playingscreen.py

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index 9c1ebfb..70d9aa6 100755
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -27,7 +27,7 @@ from column import Column
 
 class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
-    def __init__(self, synth, distinctNotes=[]) :
+    def __init__(self, synth, distinctNotes=[], displayNotes=True) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
@@ -35,6 +35,7 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         super(PlayingScreenBase, self).__init__()
         self.synth = synth
         self.distinctNotes = distinctNotes
+        self.displayNotes = displayNotes
         self.keyboardLength = 0
         self.keyboardRects = []
         self.cursor = None
@@ -59,11 +60,16 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         columnWidth = int(round(float(dispWidth) / self.keyboardLength))
 
         rects = []
-        for i in range(self.keyboardLength) :
+        for i in range(self.keyboardLength - 1) :
             upperLeftCorner = (i*columnWidth, 0)
             rect = pygame.Rect(upperLeftCorner, (columnWidth, dispHeight))
             rects.append(rect)
         
+        # la dernière colonne à la largeur du reste
+        upperLeftCorner = ((i+1) * columnWidth, 0)
+        rect = pygame.Rect(upperLeftCorner, (dispWidth - (self.keyboardLength - 1) * columnWidth , dispHeight))
+        rects.append(rect)
+        
         self.keyboardRects = rects
     
     def _initColumns(self) :
@@ -72,7 +78,7 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
-            c = Column(self, i, hue, rect, tone)
+            c = Column(self, i, hue, rect, tone, displayNote=self.displayNotes)
             self.add(c, layer=BACKGROUND_LAYER)
             self.columns[tone.midi] = c
         
@@ -100,9 +106,8 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q or \
-            event.unicode == u'q' or \
-            pygame.K_ESCAPE:
+        if event.key in (pygame.K_q, pygame.K_ESCAPE) or \
+            event.unicode == u'q' :
             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
@@ -161,14 +166,14 @@ class PlayingScreen(PlayingScreenBase) :
     
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
 
-    def __init__(self, synth) :
+    def __init__(self, synth, displayNotes=True) :
         distinctNotes = []
         self.currentColumn = None
         for midi in self.scale :
             tone = Tone(midi)
             distinctNotes.append(tone)
         
-        super(PlayingScreen, self).__init__(synth, distinctNotes)
+        super(PlayingScreen, self).__init__(synth, distinctNotes, displayNotes=displayNotes)
             
     @event_handler(events.COLDOWN)
     def noteon(self, event) :
@@ -186,10 +191,11 @@ class PlayingScreen(PlayingScreenBase) :
 
 class SongPlayingScreen(PlayingScreenBase) :
     
-    def __init__(self, synth, song, mode=PLAYING_MODES_DICT['NORMAL']) :
-        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
+    def __init__(self, synth, song, mode=PLAYING_MODES_DICT['NORMAL'], displayNotes=True, tempoTrim=0) :
+        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes, displayNotes=displayNotes)
         self.song = song
         self.quarterNoteDuration = song.quarterNoteDuration
+        self.tempoTrim = tempoTrim
         self.currentColumn = None
         self.noteIterator = self.song.iterNotes()
         self.displayNext()
@@ -224,10 +230,7 @@ class SongPlayingScreen(PlayingScreenBase) :
         col = event.column
         if col.state and not self.currentNotePlayed :
             self.playnote(col, event.pos)
-            SongPlayingScreen.setNoteTimeout(
-                        int(self.currentNote.duration * \
-                            self.quarterNoteDuration)
-                                            )
+            self.setNoteTimeout()
             self.currentNotePlayed = True
 
     def handleEasyColumnOver(self, event) :
@@ -236,10 +239,7 @@ class SongPlayingScreen(PlayingScreenBase) :
            self.cursor.pressed and \
            not self.currentNotePlayed :
             self.playnote(col, event.pos)
-            SongPlayingScreen.setNoteTimeout(
-                        int(self.currentNote.duration * \
-                            self.quarterNoteDuration)
-                                            )
+            self.setNoteTimeout()
             self.currentNotePlayed = True
 
     
@@ -262,10 +262,7 @@ class SongPlayingScreen(PlayingScreenBase) :
         if col.state and \
            not self.currentNotePlayed :
             self.playnote(col, event.pos)
-            SongPlayingScreen.setNoteTimeout(
-                        int(self.currentNote.duration * \
-                            self.quarterNoteDuration)
-                                            )
+            self.setNoteTimeout()
             self.currentNotePlayed = True
 
 
@@ -322,10 +319,20 @@ class SongPlayingScreen(PlayingScreenBase) :
         self.synth.noteoff(0, self.currentNote.midi)
         self.displayNext()
     
-    @staticmethod
-    def setNoteTimeout(delay) :
+    def setNoteTimeout(self) :
+        delay = self.currentNote.duration * self.quarterNoteDuration
+        delay = delay + delay * self.tempoTrim
+        delay = int(delay)
+        if delay < 1 :
+            delay = 1 # durée minimale, car 0 désactiverait le timer.
         pygame.time.set_timer(events.NOTEEND, delay)
     
+    def tempoTrimUp(self, step=0.1) :
+        self.tempoTrim = round(self.tempoTrim - step, 1)
+    
+    def tempoTrimDown(self, step=0.1) :
+        self.tempoTrim = round(self.tempoTrim + step, 1)
+    
     def stop(self) :
         pygame.time.set_timer(events.NOTEEND, 0)
         super(SongPlayingScreen, self).stop()