From: pin Date: Mon, 19 Apr 2010 11:44:42 +0000 (+0000) Subject: log des paramètres de l'application (début). X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/commitdiff_plain/9096acac0bf12c658183483be6dc898db1a31756 log des paramètres de l'application (début). git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@148 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/app/log.py b/src/app/log.py index ca10200..ffcf4c6 100755 --- a/src/app/log.py +++ b/src/app/log.py @@ -55,4 +55,4 @@ _eventLogger.addHandler(_eventHandler) _eventLogger.addFilter(EventFilter()) eventLogger = EventLoggerAdapter(_eventLogger, {}) - +#eventLogger = logging.getLogger('minwii.events') diff --git a/src/app/minwii.py b/src/app/minwii.py index c5961af..fe17218 100755 --- a/src/app/minwii.py +++ b/src/app/minwii.py @@ -35,7 +35,7 @@ class MinWii(object): 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 @@ -56,7 +56,6 @@ class MinWii(object): if exit : break WT.selectWiimote(selectedWiimoteIndex) - console.info('wiimote sélectionnée : %d', selectedWiimoteIndex) WT.resume() instrumentDescription = self.selectInstrument() @@ -78,7 +77,25 @@ class MinWii(object): home.connect(QUIT, app.quit) app.run(home) app.close(home) - #console.debug('wiimote selected: %d', home.selecctedWiimoteIndex) + + + 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, @@ -112,6 +129,9 @@ class MinWii(object): class _WTFacade : + """ Classe utilitaire pour singer l'api + de pygame_wiimouse en cas d'abscence de wiimote. + """ selectWimoteIndex = 0 def pause(self): pass @@ -119,3 +139,5 @@ class _WTFacade : pass def selectWiimote(self, i): pass + def get_count(self) : + return None diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py index 8a4f6e0..4d42763 100755 --- a/src/pywiiuse/pygame_wiimouse.py +++ b/src/pywiiuse/pygame_wiimouse.py @@ -60,7 +60,6 @@ class wiimote_thread(Thread): func, args = self.queue.get_nowait() except Empty: break - print 'do:', func.__name__, args func(*args) def pause(self) : @@ -122,6 +121,10 @@ class wiimote_thread(Thread): wiiuse.disconnect(self.wiimotes[i]) self.go = False + def get_count(self): + return self.actual_nmotes + + WT = None def init(nmotes, timeout, screenResolution=(660, 370)): @@ -140,7 +143,7 @@ def init(nmotes, timeout, screenResolution=(660, 370)): def get_count(): '''How many Wiimotes were found?''' - return WT.actual_nmotes + return WT.get_count() def quit(): '''Gracefully shutdown the connection and turn off the wiimote leds''' @@ -192,7 +195,6 @@ class wiimote(object): enable |= wiiuse.ORIENT_THRESH else: disable |= wiiuse.ORIENT_THRESH - print enable, disable WT.do(wiiuse.set_flags, self.wm, enable, disable) def set_orient_thresh(self, thresh):