Changeset 340:36455b73b24f for src/mlx/gui

Timestamp:

11/17/12 13:08:43 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

#142: added the reading and logging of the elevator trim

File:

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

src/mlx/gui/monitor.py

@@ -188 +188 @@
         table.attach(self._position, 7, 10, 6, 7)
 
-        self._xpdrC = gtk.Label("XPDR CHARLIE")
-        table.attach(self._xpdrC, 10, 12, 6, 7)
+        (label, self._elevatorTrim) = self._createLabeledEntry("Trim:", 5)
+        table.attach(label, 10, 11, 6, 7)
+        table.attach(self._elevatorTrim, 11, 12, 6, 7)
 
         self._apMaster = gtk.Label("AP MASTER")
@@ -207 +208 @@
         table.attach(label, 6, 7, 7, 8)
         table.attach(self._apAltitude, 7, 8, 7, 8)
+
+        self._xpdrC = gtk.Label("XPDR CHARLIE")
+        table.attach(self._xpdrC, 10, 12, 7, 8)
 
         alignment.add(table)
@@ -282 +286 @@
             self._windDirection.set_text("-")
             self._position.set_text("-")
-            self._xpdrC.set_sensitive(False)
+            self._elevatorTrim.set_text("-")
             self._apMaster.set_sensitive(False)
             self._apHeadingHold.set_sensitive(False)
@@ -288 +292 @@
             self._apAltitudeHold.set_sensitive(False)
             self._apAltitude.set_text("-")
+            self._xpdrC.set_sensitive(False)
         else:
             self._timestamp.set_text(time.strftime("%H:%M:%S",
@@ -366 +371 @@
             self._position.set_text(util.getCoordinateString((aircraftState.latitude,
                                                               aircraftState.longitude)))
-            self._xpdrC.set_sensitive(aircraftState.xpdrC)
-
+            self._elevatorTrim.set_text("%.2f" % (aircraftState.elevatorTrim,))
             self._apMaster.set_sensitive(aircraftState.apMaster)
             self._apHeadingHold.set_sensitive(aircraftState.apHeadingHold)
@@ -374 +378 @@
             self._apAltitude.set_text("%5.0f" % (aircraftState.apAltitude,))
 
+            self._xpdrC.set_sensitive(aircraftState.xpdrC)
+
 #------------------------------------------------------------------------------