[tuxdroid-svn] r1224 - software/tuxgi/trunk

[Paul_R <c2m...@c2...>]

Author: Paul_R
Date: 2008-06-11 16:07:05 +0200 (Wed, 11 Jun 2008)
New Revision: 1224

Modified:
   software/tuxgi/trunk/tuxgi.py
   software/tuxgi/trunk/version.py
Log:
* Init the GUI at startup


Modified: software/tuxgi/trunk/tuxgi.py
===================================================================
--- software/tuxgi/trunk/tuxgi.py	2008-06-11 13:11:25 UTC (rev 1223)
+++ software/tuxgi/trunk/tuxgi.py	2008-06-11 14:07:05 UTC (rev 1224)
@@ -105,16 +105,47 @@
     # On new window
     #--------------------------------------------------------------------------
     def new(self):
+        self.init_gui()
         tux.event.handler.register("tts_0_sound_state", self.on_sound_on)
         tux.event.handler.register("left_led_state", self.on_left_blue_led_on)
         tux.event.handler.register("right_led_state", self.on_right_blue_led_on)
-        tux.event.handler.register("mouth_remaining_movements", self.on_mouth_stop, (0, None))
-        tux.event.handler.register("eyes_remaining_movements", self.on_eyes_stop, (0, None))
+        tux.event.handler.register(ST_NAME_MOUTH_RM, self.on_mouth_stop)
+        tux.event.handler.register(ST_NAME_EYES_RM, self.on_eyes_stop)
+        tux.event.handler.register(ST_NAME_FLIPPER_RM, self.on_flippers_stop)
         tux.event.handler.register("all", self.on_status)
         tux.tts.registerEventOnVoiceList(self.update_voice_list)
         self.update_voice_list()
         thread.start_new_thread(self.status_viewer_thread,())
 
+
+    def init_gui(self):
+        '''
+        if tux.led.right.getState() == SSV_ON:
+            self.get_widget("checkbutton2").set_active(True)
+        else:
+            self.get_widget("checkbutton2").set_active(False)
+        if tux.led.left.getState() == SSV_ON:
+            self.get_widget("checkbutton1").set_active(True)
+        else:
+            self.get_widget("checkbutton1").set_active(False)
+        '''
+        if tux.flippers.getPosition() == SSV_DOWN:
+            self.get_widget("radiobutton6").set_active(True)
+        else:
+            self.get_widget("radiobutton5").set_active(True)
+        if tux.eyes.getPosition() == SSV_OPEN:
+            self.get_widget("radiobutton1").set_active(True)
+        else:
+            self.get_widget("radiobutton2").set_active(True)
+        if tux.mouth.getPosition() == SSV_OPEN:
+            self.get_widget("radiobutton3").set_active(True)
+        else:
+            self.get_widget("radiobutton4").set_active(True)
+
+
+
+
+
     #--------------------------------------------------------------------------
     # On window destroy
     #--------------------------------------------------------------------------
@@ -159,15 +190,15 @@
         global toggled_by_event
         toggled_by_event=True
         if tux.mouth.getPosition() == SSV_CLOSE:
+            self.get_widget("radiobutton4").set_active(True)
+        else:
             self.get_widget("radiobutton3").set_active(True)
-        else:
-            self.get_widget("radiobutton4").set_active(True)
         toggled_by_event=False
 
     #--------------------------------------------------------------------------
     # On eyes stop
     #--------------------------------------------------------------------------
-    def on_eyes_stop(self):
+    def on_eyes_stop(self, value, timeout):
         global toggled_by_event
         toggled_by_event=True
         if tux.eyes.getPosition() == SSV_OPEN:
@@ -177,6 +208,18 @@
         toggled_by_event=False
 
     #--------------------------------------------------------------------------
+    # On flippers stop
+    #--------------------------------------------------------------------------
+    def on_flippers_stop(self, value, timeout):
+        global toggled_by_event
+        toggled_by_event=True
+        if tux.flippers.getPosition() == SSV_UP:
+            self.get_widget("radiobutton5").set_active(True)
+        else:
+            self.get_widget("radiobutton6").set_active(True)
+        toggled_by_event=False
+
+    #--------------------------------------------------------------------------
     # Event on status
     #--------------------------------------------------------------------------
     def on_status(self, name, value, delay):
@@ -218,7 +261,6 @@
             
             if tux.server.getConnected() != last_tuxdaemon_connect:
                 last_tuxdaemon_connect = tux.server.getConnected()
-                print last_tuxdaemon_connect
                 
                 if tux.server.getConnected():
                     self.get_widget("image2").set_from_stock(gtk.STOCK_APPLY\
@@ -383,9 +425,9 @@
     # On "Get light level" button clicked
     #--------------------------------------------------------------------------
     def on_cversion_bt_clicked(self, widget, *args):
+        print "The light level won't be displayed on the text box."
         a, b = tux.status.requestOne('light_level')
-        return a
-
+        print ("The current light level is %f"%float(a))
     #--------------------------------------------------------------------------
     # On "Ping" button clicked
     #--------------------------------------------------------------------------

Modified: software/tuxgi/trunk/version.py
===================================================================
--- software/tuxgi/trunk/version.py	2008-06-11 13:11:25 UTC (rev 1223)
+++ software/tuxgi/trunk/version.py	2008-06-11 14:07:05 UTC (rev 1224)
@@ -1 +1 @@
-app_version="0.2.3 (SVN/UNRELEASED)"
+app_version="0.3.0 (SVN/UNRELEASED)"