Changeset 398:d49b2b524194 for src/mlx

Timestamp:

12/23/12 06:06:36 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed trouble with None values (re #167)

File:

• src/mlx/gui/monitor.py (modified) (3 diffs)

src/mlx/gui/monitor.py

@@ -315 +315 @@
             self._stalled.set_sensitive(aircraftState.stalled)
             self._onTheGround.set_sensitive(aircraftState.onTheGround)
-            self._antiIceOn.set_sensitive(aircraftState.antiIceOn)
+            self._antiIceOn.set_sensitive(aircraftState.antiIceOn is True)
             self._zfw.set_text("%.0f" % (aircraftState.zfw,))
             self._grossWeight.set_text("%.0f" % (aircraftState.grossWeight,))
@@ -363 +363 @@
             self._reverser.set_text(reverserStr)
 
-            self._navLightsOn.set_sensitive(aircraftState.navLightsOn)
+            self._navLightsOn.set_sensitive(aircraftState.navLightsOn is True)
             self._antiCollisionLightsOn.set_sensitive(aircraftState.antiCollisionLightsOn)
             self._strobeLightsOn.set_sensitive(aircraftState.strobeLightsOn)
@@ -387 +387 @@
                                                               aircraftState.longitude)))
             self._elevatorTrim.set_text("%.2f" % (aircraftState.elevatorTrim,))
-            self._apMaster.set_sensitive(aircraftState.apMaster)
-            self._apHeadingHold.set_sensitive(aircraftState.apHeadingHold)
-            self._apHeading.set_text("%03.0f" % (aircraftState.apHeading,))
-            self._xpdrC.set_sensitive(aircraftState.xpdrC)
-            self._apAltitudeHold.set_sensitive(aircraftState.apAltitudeHold)
-            self._apAltitude.set_text("%5.0f" % (aircraftState.apAltitude,))
+            self._apMaster.set_sensitive(aircraftState.apMaster is True)
+            self._apHeadingHold.set_sensitive(aircraftState.apHeadingHold is True)
+            self._apHeading.set_text("-" if aircraftState.apHeading is None
+                                     else "%03.0f" % (aircraftState.apHeading,))
+            self._xpdrC.set_sensitive(aircraftState.xpdrC is True)
+            self._apAltitudeHold.set_sensitive(aircraftState.apAltitudeHold is True)
+            self._apAltitude.set_text("-" if aircraftState.apAltitude is None
+                                      else "%5.0f" % (aircraftState.apAltitude,))
 
             self._adf1.set_text("-" if aircraftState.adf1 is None else aircraftState.adf1)