modifications pour code auto-documenté.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 6f277a7..c5961af 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,6 +9,7 @@ $URL$
 import pygame
 from pgu.gui import Desktop
 from pgu.gui import QUIT
+from widgets.launch import LaunchScreen
 from widgets.home import Home
 from widgets.playingscreen import SongPlayingScreen, PlayingScreen
 from widgets.instrumentselector import InstrumentSelector
@@ -16,28 +17,105 @@ from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH
+from globals import PLAYING_MODES_DICT
+from log import console
+
 
 class MinWii(object):
     
-    def __init__(self) :
-        app = Desktop()
-        synth = Synth()
+    def __init__(self, wiimoteSupport=True) :
+        self.wiimoteSupport = wiimoteSupport
+        LaunchScreen()
+        self.app = Desktop()
+        self.synth = Synth()
+        self.screenResolution = (1024,768)
+        self.nwiimotes = 0
+        self.initWiimotes()
+    
+    def initWiimotes(self) :
+        if self.wiimoteSupport :
+            from pywiiuse import pygame_wiimouse
+            pygame_wiimouse.init(4, 5, screenResolution) # look for 4, wait 5 seconds
+            self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
+            console.debug('%d wiimotes found', nwiimotes)
+            self.WT = WT = pygame_wiimouse.WT
+            WT.pause()
+        else :
+            self.WT = _WTFacade()
+
+    def run(self) :
+        "manage the screen sequence display"
+
+        pygame.display.set_mode(self.screenResolution)
+        pygame.display.set_caption('MinWii')
+        WT = self.WT
 
         while True :
-            home = Home(songPath=SONG_FILE_PATH)
-            home.connect(QUIT, app.quit)
-            app.run(home)
-            app.close(home)
+
+            exit, songFile, playMode, selectedWiimoteIndex = self.selectSongAndOptions()
+            if exit : break
             
-            selector = InstrumentSelector()
-            selector.run()
-            selector.stop()
-            pygame.event.clear()
-            EventDispatcher.reset()
+            WT.selectWiimote(selectedWiimoteIndex)
+            console.info('wiimote sélectionnée : %d', selectedWiimoteIndex)
+            WT.resume()
+
+            instrumentDescription = self.selectInstrument()
+            self.runPlayingScreen(songFile, playMode, instrumentDescription)
             
-            song = musicXml2Song(home.songFile, printNotes=True)
-            synth.program_select(0, 0, 0)
-            playingScreen = SongPlayingScreen(synth, song)
-            playingScreen.run()
-            pygame.event.clear()
-            EventDispatcher.reset()
+            WT.pause()
+    
+    
+    def selectSongAndOptions(self) :
+        """ 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)
+            - wiimote sélectionnée (entier)
+        """
+        home = Home(songPath=SONG_FILE_PATH,
+                    nwiimotes=self.nwiimotes)
+        app = self.app
+        home.connect(QUIT, app.quit)
+        app.run(home)
+        app.close(home)
+        #console.debug('wiimote selected: %d', home.selecctedWiimoteIndex)
+        return (home.exitApp,
+                home.songFile,
+                home.modeSelect.value,
+                home.selectedWiimote.value)
+    
+    def selectInstrument(self) :
+        """ lance l'écran de sélection de l'instrument et retourne
+            un dictionnaire comportant la description de l'instrument
+        """
+        selector = InstrumentSelector()
+        selector.run()
+        selector.stop()
+        pygame.event.clear()
+        EventDispatcher.reset()
+        return selector.selectedInstrument
+    
+    def runPlayingScreen(self, songFile, playMode, 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]
+        song = musicXml2Song(songFile)
+        bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
+        octave = instrumentDescription.get('octave', 0)
+        self.synth.adjust_octave(0, octave)
+        self.synth.program_select(0, bank, preset)
+        playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
+        playingScreen.run()
+        pygame.event.clear()
+        EventDispatcher.reset()
+
+
+class _WTFacade :
+    selectWimoteIndex = 0
+    def pause(self):
+        pass
+    def resume(self):
+        pass
+    def selectWiimote(self, i):
+        pass