Changeset 680:965523af85d4

Timestamp:

09/17/15 07:12:01 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Children:

681:6d454f3c68c8, 722:229787f24665

Phase:

public

Message:

Added the ILS frequency and the various courses to the data monitor

File:

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

src/mlx/gui/monitor.py

@@ -230 +230 @@
         table.attach(label, 2, 3, 8, 9)
         table.attach(self._cog, 3, 4, 8, 9)
+
+        (label, self._ils) = self._createLabeledEntry("ILS:", 7)
+        table.attach(label, 4, 5, 8, 9)
+        table.attach(self._ils, 5, 6, 8, 9)
+
+        (label, self._crs1) = self._createLabeledEntry("CRS1:", 7)
+        table.attach(label, 6, 7, 8, 9)
+        table.attach(self._crs1, 7, 8, 8, 9)
+
+        (label, self._crs2) = self._createLabeledEntry("CRS2:", 7)
+        table.attach(label, 8, 9, 8, 9)
+        table.attach(self._crs2, 9, 10, 8, 9)
+
+        (label, self._crsi) = self._createLabeledEntry("CRSI:", 7)
+        table.attach(label, 10, 11, 8, 9)
+        table.attach(self._crsi, 11, 12, 8, 9)
 
         alignment.add(table)
@@ -317 +333 @@
             self._qnh.set_text("-")
             self._cog.set_text("-")
+            self._ils.set_text("-")
+            self._crs1.set_text("-")
+            self._crs2.set_text("-")
+            self._crsi.set_text("-")
         else:
             self._timestamp.set_text(time.strftime("%H:%M:%S",
@@ -411 +431 @@
             self._cog.set_text("%.2f%%" % (aircraftState.cog*100.0,))
 
+            self._ils.set_text("-" if aircraftState.ils is None else aircraftState.ils)
+
+            self._crs1.set_text("-" if aircraftState.nav1_obs is None else str(aircraftState.nav1_obs))
+            self._crs2.set_text("-" if aircraftState.nav2_obs is None else str(aircraftState.nav2_obs))
+            self._crsi.set_text("-" if aircraftState.ils_obs is None else str(aircraftState.ils_obs))
+
 #------------------------------------------------------------------------------