Montée de version 1.1 -> 1.2

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

diff --git a/src/minwii/app.py b/src/minwii/app.py
index 076ca38..f36094c 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,19 +18,26 @@ 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
+

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

-    def __init__(self, wiimoteSupport=True) :
+    def __init__(self, wiimoteSupport=True, fullscreen=False) :

         envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION)
         self.wiimoteSupport = wiimoteSupport
         envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION)
         self.wiimoteSupport = wiimoteSupport

+        self.fullscreen = fullscreen

         LaunchScreen()
         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()
         envLogger.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()


@@ -38,7 +46,8 @@ class MinWii(object):
     def initWiimotes(self) :
         if self.wiimoteSupport :
             from pywiiuse import pygame_wiimouse
     def initWiimotes(self) :
         if self.wiimoteSupport :
             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(4, 5, self.screenResolution, IR_POSITION) # look for 4, 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


@@ -48,17 +57,22 @@ class MinWii(object):
 
     def run(self) :
         "séquençage de l'affichage des écrans"
 
     def run(self) :
         "séquençage de l'affichage des écrans"

-
-        pygame.display.set_mode(self.screenResolution)
-        pygame.display.set_caption('MinWii')
+        displayFlags = 0
+        if self.fullscreen :
+            displayFlags = displayFlags | pygame.FULLSCREEN
+        pygame.display.set_mode(self.screenResolution, displayFlags)
+        pygame.display.set_caption('MINWii')

         WT = self.WT
         WT = self.WT

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

 
         while True :
 
 
         while True :
 

-            exit, songFile, playMode, selectedWiimoteIndex = self.selectSongAndOptions()
+            exit, songFile, playMode, wiimoteIndex = \
+                self.selectSongAndOptions(songFile, playMode, wiimoteIndex)

             if exit : break
             
             if exit : break
             

-            WT.selectWiimote(selectedWiimoteIndex)
+            WT.selectWiimote(wiimoteIndex)

             WT.resume()
 
             instrumentDescription = self.selectInstrument()
             WT.resume()
 
             instrumentDescription = self.selectInstrument()


@@ -71,7 +85,7 @@ class MinWii(object):
             WT.pause()
     
     
             WT.pause()
     
     

-    def selectSongAndOptions(self) :
+    def selectSongAndOptions(self, songFile, playMode, 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
         """ 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


@@ -79,6 +93,9 @@ class MinWii(object):
             - 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,
+                    wiimoteIndex=wiimoteIndex,

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


@@ -106,8 +123,8 @@ class MinWii(object):
         
         return (home.exitApp,
                 home.songFile,
         
         return (home.exitApp,
                 home.songFile,

-                home.modeSelect.value,
-                home.selectedWiimote.value)
+                home.selectedPlayMode,
+                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


@@ -131,12 +148,15 @@ class MinWii(object):
             avec l'instrument midi 'instrumentDescription'.
         """
         playMode = PLAYING_MODES_DICT[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)
+        else :
+            song = musicXml2Song(songFile)
+            playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)

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