Changeset 391:0f2e90eae832 for src/mlx

Timestamp:

12/22/12 08:42:13 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for logging the state of the anti-ice system (re #159)

Location:

src/mlx

Files:

• acft.py (modified) (6 diffs)
• flight.py (modified) (2 diffs)
• gui/flight.py (modified) (12 diffs)
• gui/gui.py (modified) (3 diffs)

src/mlx/acft.py

@@ -76 +76 @@
         self._v1r2LineIndex = None
         self._derateLineID = None
+        self._takeoffAntiIceLineID = None
         self._vrefLineIndex = None
+        self._landingAntiIceLineID = None
 
         self.humanWeight = 82.0
@@ -294 +296 @@
                 self._logV1R2(aircraftState)
                 self._logDerate(aircraftState)
+                self._logTakeoffAntiIce(aircraftState)
             elif newStage==const.STAGE_DESCENT or newStage==const.STAGE_LANDING:
                 self._logRadios(aircraftState)
@@ -351 +354 @@
                             (self._aircraftState.altimeter,))
         self._logVRef()
+        self._logLandingAntiIce(self._aircraftState)
         self.flight.flareStarted(flareStart, flareStartFS)
         fs.sendMessage(const.MESSAGETYPE_INFORMATION, "Flare-time", 3)
@@ -409 +413 @@
             self._logDerate()
 
+    def updateTakeoffAntiIce(self):
+        """Update the take-off anti-ice setting."""
+        if self._takeoffAntiIceLineID is not None:
+            self._logTakeoffAntiIce()
+
     def _appendLightsLoggers(self):
         """Append the loggers needed for the lights.
@@ -475 +484 @@
         else:
             self.logger.updateLine(self._derateLineID, message)
+
+    def _logTakeoffAntiIce(self, state = None):
+        """Log the take-off anti-ice setting either newly or by updating the
+        corresponding line."""
+        antiIceOn = self._flight.takeoffAntiIceOn
+        if state is not None:
+            antiIceOn = antiIceOn or state.antiIceOn is True
+            self._flight.takeoffAntiIceOn = antiIceOn
+
+        message = "Anti-ice was turned %s" % \
+                  ("ON" if antiIceOn else "OFF")
+
+        if self._takeoffAntiIceLineID is None:
+            if state is None:
+                state = self._aircraftState
+            self._takeoffAntiIceLineID = \
+                self.logger.message(state.timestamp, message)
+        else:
+            self.logger.updateLine(self._takeoffAntiIceLineID, message)
 
     def updateVRef(self):
@@ -492 +520 @@
         else:
             self.logger.updateLine(self._vrefLineIndex, message)
+
+    def updateLandingAntiIce(self):
+        """Update the landing anti-ice setting."""
+        if self._landingAntiIceLineID is not None:
+            self._logLandingAntiIce()
+
+    def _logLandingAntiIce(self, state = None):
+        """Log the landing anti-ice setting either newly or by updating the
+        corresponding line."""
+        antiIceOn = self._flight.landingAntiIceOn
+        if state is not None:
+            antiIceOn = antiIceOn or state.antiIceOn is True
+            self._flight.landingAntiIceOn = antiIceOn
+
+        message = "Anti-ice was turned %s" % \
+                  ("ON" if antiIceOn else "OFF")
+
+        if self._landingAntiIceLineID is None:
+            if state is None:
+                state = self._aircraftState
+            self._landingAntiIceLineID = \
+                self.logger.message(state.timestamp, message)
+        else:
+            self.logger.updateLine(self._landingAntiIceLineID, message)
 
     def _fleetRetrieved(self, fleet):

src/mlx/flight.py

@@ -183 +183 @@
 
     @property
+    def takeoffAntiIceOn(self):
+        """Get whether the anti-ice system was on during takeoff."""
+        return self._gui.takeoffAntiIceOn
+
+    @takeoffAntiIceOn.setter
+    def takeoffAntiIceOn(self, value):
+        """Set whether the anti-ice system was on during takeoff."""
+        self._gui.takeoffAntiIceOn = value
+
+    @property
     def derate(self):
         """Get the derate value of the flight."""
@@ -211 +221 @@
         """Get the VRef speed of the flight."""
         return self._gui.vref
+
+    @property
+    def landingAntiIceOn(self):
+        """Get whether the anti-ice system was on during landing."""
+        return self._gui.landingAntiIceOn
+
+    @landingAntiIceOn.setter
+    def landingAntiIceOn(self, value):
+        """Set whether the anti-ice system was on during landing."""
+        self._gui.landingAntiIceOn = value
 
     @property

src/mlx/gui/flight.py

@@ -1999 +1999 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = gtk.Table(7, 4)
+        table = gtk.Table(8, 4)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -2102 +2102 @@
         table.attach(self._derateUnit, 3, 4, 5, 6)
 
+        self._antiIceOn = gtk.CheckButton(xstr("takeoff_antiice"))
+        self._antiIceOn.set_use_underline(True)
+        self._antiIceOn.set_tooltip_text(xstr("takeoff_antiice_tooltip"))
+        table.attach(self._antiIceOn, 2, 4, 6, 7)
+
         self._rto = gtk.CheckButton(xstr("takeoff_rto"))
         self._rto.set_use_underline(True)
         self._rto.set_tooltip_text(xstr("takeoff_rto_tooltip"))
         self._rto.connect("toggled", self._rtoToggled)
-        table.attach(self._rto, 2, 4, 6, 7, ypadding = 8)
+        table.attach(self._rto, 2, 4, 7, 8, ypadding = 8)
 
         self.addCancelFlightButton()
@@ -2147 +2152 @@
         else:
             return None
+
+    @property
+    def antiIceOn(self):
+        """Get whether the anti-ice system has been turned on."""
+        return self._antiIceOn.get_active()
+
+    @antiIceOn.setter
+    def antiIceOn(self, value):
+        """Set the anti-ice indicator."""
+        self._antiIceOn.set_active(value)
 
     @property
@@ -2213 +2228 @@
         self._vr.reset()
         self._v2.reset()
-
         self._hasDerate = False
+        self._antiIceOn.set_active(False)
 
     def setRTOEnabled(self, enabled):
@@ -2259 +2274 @@
     def _forwardClicked(self, button):
         """Called when the forward button is clicked."""
-        self._wizard.gui.flight.aircraft.updateV1R2()
+        aircraft = self._wizard.gui.flight.aircraft
+        aircraft.updateV1R2()
         if self._hasDerate:
-            self._wizard.gui.flight.aircraft.updateDerate()
+            aircraft.updateDerate()
+        aircraft.updateTakeoffAntiIce()
         self._wizard.nextPage()
 
@@ -2393 +2410 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = gtk.Table(5, 5)
+        table = gtk.Table(6, 5)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -2462 +2479 @@
         label.set_use_underline(True)
         label.set_alignment(0.0, 0.5)
-        table.attach(label, 1, 2, 5, 6)
+        table.attach(label, 1, 2, 4, 5)
 
         self._vref = IntegerEntry()
@@ -2468 +2485 @@
         self._vref.set_tooltip_markup(xstr("landing_vref_tooltip_knots"))
         self._vref.connect("integer-changed", self._vrefChanged)
-        table.attach(self._vref, 3, 4, 5, 6)
+        table.attach(self._vref, 3, 4, 4, 5)
         label.set_mnemonic_widget(self._vref)
 
         self._vrefUnit = gtk.Label(xstr("label_knots"))
-        table.attach(self._vrefUnit, 4, 5, 5, 6)
+        table.attach(self._vrefUnit, 4, 5, 4, 5)
+
+        self._antiIceOn = gtk.CheckButton(xstr("landing_antiice"))
+        self._antiIceOn.set_use_underline(True)
+        self._antiIceOn.set_tooltip_text(xstr("landing_antiice_tooltip"))
+        table.attach(self._antiIceOn, 3, 5, 5, 6)
 
         self.addCancelFlightButton()
@@ -2510 +2532 @@
         return self._vref.get_int()
 
+    @property
+    def antiIceOn(self):
+        """Get whether the anti-ice system has been turned on."""
+        return self._antiIceOn.get_active()
+
+    @antiIceOn.setter
+    def antiIceOn(self, value):
+        """Set the anti-ice indicator."""
+        self._antiIceOn.set_active(value)
+
     def reset(self):
         """Reset the page if the wizard is reset."""
         super(LandingPage, self).reset()
         self._vref.reset()
+        self._antiIceOn.set_active(False)
         self._flightEnded = False
 
@@ -2595 +2628 @@
     def _forwardClicked(self, button):
         """Called when the forward button is clicked."""
-        self._wizard.gui.flight.aircraft.updateVRef()
+        aircraft = self._wizard.gui.flight.aircraft
+        aircraft.updateVRef()
+        aircraft.updateLandingAntiIce()
         if self._wizard.gui.config.onlineGateSystem and \
            self._wizard.loggedIn and not self._completed and \
@@ -3187 +3222 @@
 
     @property
+    def takeoffAntiIceOn(self):
+        """Get whether the anti-ice system was on during take-off."""
+        return self._takeoffPage.antiIceOn
+
+    @takeoffAntiIceOn.setter
+    def takeoffAntiIceOn(self, value):
+        """Set anti-ice on indicator."""
+        self._takeoffPage.antiIceOn = value
+
+    @property
     def rtoIndicated(self):
         """Get whether the pilot has indicated that an RTO has occured."""
@@ -3215 +3260 @@
         """Get the Vref speed."""
         return self._landingPage.vref
+
+    @property
+    def landingAntiIceOn(self):
+        """Get whether the anti-ice system was on during landing."""
+        return self._landingPage.antiIceOn
+
+    @landingAntiIceOn.setter
+    def landingAntiIceOn(self, value):
+        """Set anti-ice on indicator."""
+        self._landingPage.antiIceOn = value
 
     @property

src/mlx/gui/gui.py

@@ -313 +313 @@
 
     @property
+    def takeoffAntiIceOn(self):
+        """Get whether the anti-ice system was on during take-off."""
+        return self._wizard.takeoffAntiIceOn
+
+    @takeoffAntiIceOn.setter
+    def takeoffAntiIceOn(self, value):
+        """Set the anti-ice on indicator."""
+        gobject.idle_add(self._setTakeoffAntiIceOn, value)
+
+    @property
     def rtoIndicated(self):
         """Get whether the pilot has indicated than an RTO has occured."""
@@ -341 +351 @@
         """Get the Vref speed calculated for the flight."""
         return self._wizard.vref
+
+    @property
+    def landingAntiIceOn(self):
+        """Get whether the anti-ice system was on during landing."""
+        return self._wizard.landingAntiIceOn
+
+    @landingAntiIceOn.setter
+    def landingAntiIceOn(self, value):
+        """Set the anti-ice on indicator."""
+        gobject.idle_add(self._setLandingAntiIceOn, value)
 
     @property
@@ -1438 +1458 @@
         """Show the about URL."""
         webbrowser.open(url = link, new = 1)
+
+    def _setTakeoffAntiIceOn(self, value):
+        """Set the anti-ice on indicator."""
+        self._wizard.takeoffAntiIceOn = value
+
+    def _setLandingAntiIceOn(self, value):
+        """Set the anti-ice on indicator."""
+        self._wizard.landingAntiIceOn = value