Affichage des wiimotes réellement disponibles.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@137 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c609246..4f29319 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -33,14 +33,15 @@ class MinWii(object):
             from pywiiuse import pygame_wiimouse
             from pywiiuse.PyWiiUse import IR_BELOW
             pygame_wiimouse.init(4, 5) # look for 4, wait 5 seconds
             from pywiiuse import pygame_wiimouse
             from pywiiuse.PyWiiUse import IR_BELOW
             pygame_wiimouse.init(4, 5) # look for 4, wait 5 seconds

-            n = pygame_wiimouse.get_count()
-            print '%d wiimotes' % n
+            nwiimotes = pygame_wiimouse.get_count()
+            print '%d wiimotes' % nwiimotes

             WT = pygame_wiimouse.WT
             WT.pause()
             wm = pygame_wiimouse.Wiimote(0) # access the wiimote object
             wm.enable_accels(0) # turn on acceleration reporting
             wm.enable_ir(1, vres = modeResolution, position=IR_BELOW)
         else :
             WT = pygame_wiimouse.WT
             WT.pause()
             wm = pygame_wiimouse.Wiimote(0) # access the wiimote object
             wm.enable_accels(0) # turn on acceleration reporting
             wm.enable_ir(1, vres = modeResolution, position=IR_BELOW)
         else :

+            nwiimotes = 0

             class _WTFacade :
                 def pause(self):
                     pass
             class _WTFacade :
                 def pause(self):
                     pass


@@ -53,7 +54,8 @@ class MinWii(object):
 
         while True :
             # sélection de la chanson
 
         while True :
             # sélection de la chanson

-            home = Home(songPath=SONG_FILE_PATH)
+            home = Home(songPath=SONG_FILE_PATH,
+                        nwiimotes=nwiimotes)

             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)

diff --git a/src/app/widgets/home.py b/src/app/widgets/home.py
index 1aa74d3..86d6ab4 100755 (executable)
--- a/src/app/widgets/home.py
+++ b/src/app/widgets/home.py
@@ -10,6 +10,8 @@ from pgu.gui import Spacer
 from pgu.gui import Label
 from pgu.gui import Button
 from pgu.gui import Switch
 from pgu.gui import Label
 from pgu.gui import Button
 from pgu.gui import Switch

+from pgu.gui import Radio
+from pgu.gui import Group

 from pgu.gui import Select
 from pgu.gui import CLICK
 from pgu.gui import QUIT
 from pgu.gui import Select
 from pgu.gui import CLICK
 from pgu.gui import QUIT


@@ -27,6 +29,7 @@ class Home(Table) :
     def __init__(self,**params):
         Table.__init__(self,**params)
         self.songPath = params.get('songPath', '.')
     def __init__(self,**params):
         Table.__init__(self,**params)
         self.songPath = params.get('songPath', '.')

+        self.nwiimotes = params.get('nwiimotes', 0)

         self.songFile = None
         self.spaceSize = (100,100)
         self.font = pygame.font.Font(None,70)
         self.songFile = None
         self.spaceSize = (100,100)
         self.font = pygame.font.Font(None,70)


@@ -63,14 +66,14 @@ class Home(Table) :
 
         # choix des wiimotes
         self.tr()
 
         # choix des wiimotes
         self.tr()

-        self.td(self.createLabel("Joueurs :", self.font))
+        self.td(self.createLabel("Wiimote :", self.font))

         playerTable = Table()
         playerTable = Table()

-        self.activeWiimoteSwitches = []
-        for i in range(4):
-            s = Switch(False)
-            playerTable.td(s)
+        
+        self.selectedWiimote = Group(name='selectedWiimote', value=0)
+        for i in range(self.nwiimotes):
+            r = Radio(self.selectedWiimote, i)
+            playerTable.td(r)

             playerTable.td(self.createLabel(" %d " % (i+1)))
             playerTable.td(self.createLabel(" %d " % (i+1)))

-            self.activeWiimoteSwitches.append(s)

         self.td(playerTable,colspan = 3)
         
         self.tr()
         self.td(playerTable,colspan = 3)
         
         self.tr()