log++ qq bugfixes.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c5961af..da69dd9 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -29,13 +29,14 @@ class MinWii(object):
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)

+        console.info('résolution écran : %s', self.screenResolution)

         self.nwiimotes = 0
         self.initWiimotes()
     
     def initWiimotes(self) :
         if self.wiimoteSupport :
             from pywiiuse import pygame_wiimouse
         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
+            pygame_wiimouse.init(4, 5, self.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
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('%d wiimotes found', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT


@@ -56,10 +57,13 @@ class MinWii(object):
             if exit : break
             
             WT.selectWiimote(selectedWiimoteIndex)
             if exit : break
             
             WT.selectWiimote(selectedWiimoteIndex)

-            console.info('wiimote sélectionnée : %d', selectedWiimoteIndex)

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

+            if not instrumentDescription :
+                WT.pause()
+                continue
+            

             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             
             WT.pause()
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             
             WT.pause()


@@ -78,7 +82,28 @@ class MinWii(object):
         home.connect(QUIT, app.quit)
         app.run(home)
         app.close(home)
         home.connect(QUIT, app.quit)
         app.run(home)
         app.close(home)

-        #console.debug('wiimote selected: %d', home.selecctedWiimoteIndex)
+        
+        
+        if home.exitApp :
+            msg = "sortie de l'application"
+        else :
+            actual_wiimotes = self.WT.get_count()
+            if actual_wiimotes is None :
+                msg = 'chanson : %s\nmode : %s\nHID : souris'
+                msg = msg % (home.songFile,
+                             home.modeSelect.value)
+            elif actual_wiimotes == 0 :
+                msg = 'chanson : %s\nmode : %s\nHID : souris (pas de wiimote trouvée)'
+                msg = msg % (home.songFile,
+                             home.modeSelect.value)
+            else :
+                msg = 'chanson : %s\nmode : %s\nHID : wiimote %d'
+                msg = msg % (home.songFile,
+                             home.modeSelect.value,
+                             home.selectedWiimote.value + 1)
+        
+        console.info(msg)
+        

         return (home.exitApp,
                 home.songFile,
                 home.modeSelect.value,
         return (home.exitApp,
                 home.songFile,
                 home.modeSelect.value,


@@ -93,6 +118,9 @@ class MinWii(object):
         selector.stop()
         pygame.event.clear()
         EventDispatcher.reset()
         selector.stop()
         pygame.event.clear()
         EventDispatcher.reset()

+        if selector.selectedInstrument :
+            console.info('instrument : %(name)s\npreset : %(preset)d\nbank : %(bank)d\najustement octave : %(octave)d' % \
+                         selector.selectedInstrument)

         return selector.selectedInstrument
     
     def runPlayingScreen(self, songFile, playMode, instrumentDescription) :
         return selector.selectedInstrument
     
     def runPlayingScreen(self, songFile, playMode, instrumentDescription) :


@@ -112,6 +140,9 @@ class MinWii(object):
 
 
 class _WTFacade :
 
 
 class _WTFacade :

+    """ Classe utilitaire pour singer l'api
+        de pygame_wiimouse en cas d'abscence de wiimote.
+    """

     selectWimoteIndex = 0
     def pause(self):
         pass
     selectWimoteIndex = 0
     def pause(self):
         pass


@@ -119,3 +150,5 @@ class _WTFacade :
         pass
     def selectWiimote(self, i):
         pass
         pass
     def selectWiimote(self, i):
         pass

+    def get_count(self) :
+        return None