Correction de typage.

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

diff --git a/src/minwii/app.py b/src/minwii/app.py
index dad8f6b..ab10bdf 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -7,6 +7,7 @@ $URL$
 """
 
 import pygame
 """
 
 import pygame

+from pgu.gui import Theme

 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from minwii.widgets.launch import LaunchScreen
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from minwii.widgets.launch import LaunchScreen


@@ -17,8 +18,18 @@ from minwii.synth import Synth
 from minwii.eventutils import EventDispatcher
 from minwii.musicxml import musicXml2Song
 from minwii.config import SONG_FILE_PATH
 from minwii.eventutils import EventDispatcher
 from minwii.musicxml import musicXml2Song
 from minwii.config import SONG_FILE_PATH

+from minwii.config import SCREEN_RESOLUTION

 from minwii.globals import PLAYING_MODES_DICT
 from minwii.log import console, LOG_FORMAT_VERSION, envLogger
 from minwii.globals import PLAYING_MODES_DICT
 from minwii.log import console, LOG_FORMAT_VERSION, envLogger

+import os.path
+
+wiiuse = None
+pygame_wiimouse = None
+
+SCREEN_HOME         = 0
+SCREEN_INSTRUMENTS  = 1
+SCREEN_PLAY         = 2
+

 
 
 class MinWii(object):
 
 
 class MinWii(object):


@@ -28,60 +39,104 @@ class MinWii(object):
         self.wiimoteSupport = wiimoteSupport
         self.fullscreen = fullscreen
         LaunchScreen()
         self.wiimoteSupport = wiimoteSupport
         self.fullscreen = fullscreen
         LaunchScreen()

-        self.app = Desktop()
+        themedir = __file__.split(os.path.sep)[:-1] + ['widgets', 'data', 'minwii_theme']
+        themedir = os.path.sep.join(themedir)
+        theme = Theme(themedir)
+        self.app = Desktop(theme=theme)

         self.synth = Synth()
         self.synth = Synth()

-        self.screenResolution = (1024,768)
+        self.screenResolution = SCREEN_RESOLUTION

         envLogger.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()
         self.firstSong = True
         envLogger.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()
         self.firstSong = True

+        self.screen = SCREEN_HOME
+        self.playingScreen = None

     
     def initWiimotes(self) :
         if self.wiimoteSupport :
     
     def initWiimotes(self) :
         if self.wiimoteSupport :

+            global wiiuse
+            from pywiiuse import PyWiiUse as wiiuse
+            global pygame_wiimouse

             from pywiiuse import pygame_wiimouse
             from pywiiuse import pygame_wiimouse

-            pygame_wiimouse.init(4, 5, self.screenResolution) # look for 4, wait 5 seconds
+            from minwii.config import IR_POSITION
+            pygame_wiimouse.init(5, 5, self.screenResolution, IR_POSITION) # look for 5, wait 5 seconds

             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT

+            WT.setEventCallBack(self._wiimotesEventCallBack)

             WT.pause()
         else :
             self.WT = _WTFacade()
             WT.pause()
         else :
             self.WT = _WTFacade()

+    
+    def _wiimotesEventCallBack(self, wt, id, wmp) :
+        if self.screen == SCREEN_PLAY :
+            pygame_wiimouse._default_event_cb(wt, id, wmp)
+            
+            wm = wmp[0]
+            if id == self.nwiimotes - 1 :
+                # le bouton Home de la télécommande permet de sortir
+                # (envoi d'un événement clavier « q »)
+                if wiiuse.is_just_pressed(wm, wiiuse.button['Home']) :
+                    event = pygame.event.Event(pygame.KEYDOWN,
+                                               key = pygame.K_q,
+                                               unicode = u'q')
+                    pygame.event.post(event)
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['+']) :
+                    self.synth.inc_gain()
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['-']) :
+                    self.synth.dec_gain()
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['1']) and self.playingScreen :
+                    self.playingScreen.tempoTrimUp()
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['2']) and self.playingScreen :
+                    self.playingScreen.tempoTrimDown()

 
 

+        elif self.screen in (SCREEN_HOME, SCREEN_INSTRUMENTS) :
+            pygame_wiimouse._full_mouse_event_cb(wt, id, wmp)
+    

     def run(self) :
         "séquençage de l'affichage des écrans"
         displayFlags = 0
         if self.fullscreen :
             displayFlags = displayFlags | pygame.FULLSCREEN
         pygame.display.set_mode(self.screenResolution, displayFlags)
     def run(self) :
         "séquençage de l'affichage des écrans"
         displayFlags = 0
         if self.fullscreen :
             displayFlags = displayFlags | pygame.FULLSCREEN
         pygame.display.set_mode(self.screenResolution, displayFlags)

-        pygame.display.set_caption('MinWii')
+        pygame.display.set_caption('MINWii')

         WT = self.WT
         WT = self.WT

+        
+        songFile, playMode, displayNotes, wiimoteIndex = '', 'NORMAL', True, 0

 
         while True :
 
         while True :

-
-            exit, songFile, playMode, selectedWiimoteIndex = self.selectSongAndOptions()
+            WT.resume()
+            WT.selectWiimote(self.nwiimotes - 1) # la télécommande est la souris
+            self.screen = SCREEN_HOME
+            exit, songFile, playMode, displayNotes, wiimoteIndex = \
+                self.selectSongAndOptions(songFile, playMode, displayNotes, wiimoteIndex)

             if exit : break
             
             if exit : break
             

-            WT.selectWiimote(selectedWiimoteIndex)
-            WT.resume()
-
+            
+            self.screen = SCREEN_INSTRUMENTS

             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :
             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :

-                WT.pause()

                 continue
             
                 continue
             

-            self.runPlayingScreen(songFile, playMode, instrumentDescription)
-            
+            self.screen = SCREEN_PLAY
+            WT.selectWiimote(wiimoteIndex)
+            self.runPlayingScreen(songFile, playMode, displayNotes, instrumentDescription)

             WT.pause()
     
     
             WT.pause()
     
     

-    def selectSongAndOptions(self) :
+    def selectSongAndOptions(self, songFile, playMode, displayNotes, wiimoteIndex) :

         """ lance l'écran de paramétrage et retourne un tuple comportant :
             - drapeau de sortie de l'application (booléen)
             - chemin du fichier de la chanson
             - mode (entier)
         """ lance l'écran de paramétrage et retourne un tuple comportant :
             - drapeau de sortie de l'application (booléen)
             - chemin du fichier de la chanson
             - mode (entier)

+            - affichage des notes (booléen)

             - wiimote sélectionnée (entier)
         """
         home = Home(songPath=SONG_FILE_PATH,
             - wiimote sélectionnée (entier)
         """
         home = Home(songPath=SONG_FILE_PATH,

+                    songFile=songFile,
+                    playMode=playMode,
+                    displayNotes=displayNotes,
+                    wiimoteIndex=wiimoteIndex,

                     nwiimotes=self.nwiimotes)
         app = self.app
         home.connect(QUIT, app.quit)
                     nwiimotes=self.nwiimotes)
         app = self.app
         home.connect(QUIT, app.quit)


@@ -109,8 +164,9 @@ class MinWii(object):
         
         return (home.exitApp,
                 home.songFile,
         
         return (home.exitApp,
                 home.songFile,

-                home.modeSelect.value,
-                home.selectedWiimote.value)
+                home.selectedPlayMode,
+                home.displayNotes,
+                home.selectedWiimoteIndex)

     
     def selectInstrument(self) :
         """ lance l'écran de sélection de l'instrument et retourne
     
     def selectInstrument(self) :
         """ lance l'écran de sélection de l'instrument et retourne


@@ -129,20 +185,24 @@ class MinWii(object):
             console.info('ajustement octave : %d', instru['octave'])
         return instru
     
             console.info('ajustement octave : %d', instru['octave'])
         return instru
     

-    def runPlayingScreen(self, songFile, playMode, instrumentDescription) :
+    def runPlayingScreen(self, songFile, playMode, displayNotes, instrumentDescription) :

         """ Lance l'écran de jeu principal avec la chanson 'songFile' dans le mode 'playMode'
             avec l'instrument midi 'instrumentDescription'.
         """
         playMode = PLAYING_MODES_DICT[playMode]
         """ Lance l'écran de jeu principal avec la chanson 'songFile' dans le mode 'playMode'
             avec l'instrument midi 'instrumentDescription'.
         """
         playMode = PLAYING_MODES_DICT[playMode]

-        song = musicXml2Song(songFile)

         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
         octave = instrumentDescription['octave']
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)
         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
         octave = instrumentDescription['octave']
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)

-        playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
+        if playMode == PLAYING_MODES_DICT['IMPRO'] :
+            playingScreen = PlayingScreen(self.synth, displayNotes=displayNotes)
+        else :
+            song = musicXml2Song(songFile)
+            self.playingScreen = playingScreen = SongPlayingScreen(self.synth, song, mode=playMode, displayNotes=displayNotes)

         playingScreen.run()
         pygame.event.clear()
         EventDispatcher.reset()
         playingScreen.run()
         pygame.event.clear()
         EventDispatcher.reset()

+        self.playingScreen = None

 
 
 class _WTFacade :
 
 
 class _WTFacade :