X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/6aaf4a5689bd6323945dd3f1e28c4e995b091d99..3b16ad256b097d7e910682bf7708bb4f2f135ebe:/src/app/widgets/playingscreen.py diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index f5cbdb6..4638267 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -21,7 +21,7 @@ from config import DEFAULT_MIDI_VELOCITY from globals import BACKGROUND_LAYER from globals import CURSOR_LAYER -from globals import PLAYING_MODES +from globals import PLAYING_MODES_DICT class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : @@ -57,8 +57,8 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : screen = pygame.display.get_surface() # taille de la zone d'affichage utile (bordure autour) - dispWidth = screen.get_width() - 2 * BORDER - dispHeight = screen.get_height() - 2 * BORDER + self.dispWidth = dispWidth = screen.get_width() - 2 * BORDER + self.dispHeight = dispHeight = screen.get_height() - 2 * BORDER columnWidth = int(round(float(dispWidth) / self.keyboardLength)) @@ -169,17 +169,17 @@ class PlayingScreen(_PlayingScreenBase) : class SongPlayingScreen(_PlayingScreenBase) : - def __init__(self, synth, song, mode=PLAYING_MODES['EASY']) : + def __init__(self, synth, song, mode=PLAYING_MODES_DICT['EASY']) : super(SongPlayingScreen, self).__init__(synth, song.distinctNotes) self.song = song self.quarterNoteDuration = song.quarterNoteDuration self.currentColumn = None self.noteIterator = self.song.iterNotes() self.displayNext() - if mode == PLAYING_MODES['NORMAL'] : + if mode == PLAYING_MODES_DICT['NORMAL'] : EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown) EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp) - elif mode == PLAYING_MODES['EASY'] : + elif mode == PLAYING_MODES_DICT['EASY'] : EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver)