[tuxdroid-svn] r1344 - in software_suite_v2/software/tools/tuxController/trunk/src/GUI: . control

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

Author: Paul_R
Date: 2008-07-22 09:54:50 +0200 (Tue, 22 Jul 2008)
New Revision: 1344

Modified:
   software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
   software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Bug : spinning images.


Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java	2008-07-22 07:42:18 UTC (rev 1343)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java	2008-07-22 07:54:50 UTC (rev 1344)
@@ -89,8 +89,10 @@
                 "onMouthEvent");
         tux.event.handler.register(TuxAPIConst.ST_NAME_FLIPPERS_POSITION, this, 
                 "onFlippersEvent"); 
-        tux.event.handler.register(TuxAPIConst.ST_NAME_SPINNING_DIRECTION, this, 
-                "onSpinEvent");
+        tux.event.handler.register(TuxAPIConst.ST_NAME_SPIN_RIGHT_MOTOR_ON, this, 
+                "onSpinRightEvent", "True", null);
+        tux.event.handler.register(TuxAPIConst.ST_NAME_SPIN_LEFT_MOTOR_ON, this, 
+        		"onSpinLeftEvent", "True", null);
         tux.event.handler.register("light_level", this, 
                 "onLightLevelEvent");
         tux.event.handler.register("battery_level", this, 
@@ -536,15 +538,22 @@
     }
 
     /**
-     * Event function : Spinning events.
+     * Event function : Right spin events.
      * @param Current spinning state.
      * @param The time of the last state.
      */
-    public void onSpinEvent(String value, Double delay) {
-        if (value == null)
-            return;
-        win.refreshSpinning(value);
+    public void onSpinRightEvent(String value, Double delay) {
+        win.refreshSpinning(TuxAPIConst.SSV_RIGHT);
     }
+    
+    /**
+     * Event function : Left spin events.
+     * @param Current spinning state.
+     * @param The time of the last state.
+     */
+    public void onSpinLeftEvent(String value, Double delay) {
+        win.refreshSpinning(TuxAPIConst.SSV_LEFT);
+    }
 
     /**
      * Event function : Spinning counter events.
@@ -553,7 +562,10 @@
      */
     public void onSpinCounter(String value, Double delay) {
         if (value.equals("0"))
+        {
+            win.refreshSpinning(TuxAPIConst.SSV_OFF);
             win.resetSpinRunButton();
+        }
     }
 
     /**

Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java	2008-07-22 07:42:18 UTC (rev 1343)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java	2008-07-22 07:54:50 UTC (rev 1344)
@@ -697,11 +697,12 @@
      */
     public void refreshSpinning(String state)
     {
+    	System.out.println(state);
         if (state.equalsIgnoreCase(TuxAPIConst.SSV_LEFT))
             imgSpin.setIcon(spinLeft);
         else if (state.equalsIgnoreCase(TuxAPIConst.SSV_RIGHT))
             imgSpin.setIcon(spinRight);        
-        else if (state.equalsIgnoreCase("NONE")) //$NON-NLS-1$
+        else if (state.equalsIgnoreCase(TuxAPIConst.SSV_OFF)) //$NON-NLS-1$
             imgSpin.setIcon(spinOff);
         else if (state.equalsIgnoreCase("PLUGGED")) //$NON-NLS-1$
         {