Changeset 101:35e361b4c306

Timestamp:

04/21/12 17:08:58 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Takeoff V-speeds can be entered after takeoff as well.

Location:

src/mlx

Files:

• acft.py (modified) (4 diffs)
• gui/flight.py (modified) (9 diffs)

src/mlx/acft.py

@@ -26 +26 @@
         self._minVS = 10000.0
 
+        self._v1r2LineIndex = None
         self._vrefLineIndex = None
 
@@ -140 +141 @@
                                     (aircraftState.windDirection, 
                                      aircraftState.windSpeed))
-                self.logger.message(aircraftState.timestamp,
-                                    "Speeds calculated by the pilot: V1: %s, VR: %s, V2: %s" % \
-                                    ("-" if self._flight.v1 is None
-                                     else str(self._flight.v1),
-                                     "-" if self._flight.vr is None
-                                     else str(self._flight.vr),
-                                     "-" if self._flight.v2 is None
-                                     else str(self._flight.v2)))
+                self._logV1R2()
             elif newStage==const.STAGE_TAXIAFTERLAND:
                 self.logger.message(aircraftState.timestamp, "Flight time end")
@@ -191 +185 @@
                             "Altimeter setting: %.0f hPa" % \
                             (self._aircraftState.altimeter,))
-        self._vrefLineIndex = \
-            self.logger.message(self._aircraftState.timestamp,
-                                "VRef speed calculated by the pilot: %s" % \
-                                ("-" if self._flight.vref is None
-                                 else str(self._flight.vref)))
+        self._logVRef()
         self.flight.flareStarted(flareStart, flareStartFS)
          
@@ -233 +223 @@
             if n1>=0.5: return False
         return True
+
+    def updateV1R2(self):
+        """Update the V1, Vr and V2 values from the flight, if the these values
+        have already been logged."""
+        if self._v1r2LineIndex is not None:
+            self._logV1R2()
+
+    def _logV1R2(self):
+        """Log the V1, Vr and V2 value either newly, or by updating the
+        corresponding line."""
+        message = "Speeds calculated by the pilot: V1: %s, VR: %s, V2: %s" % \
+                  ("-" if self._flight.v1 is None
+                   else str(self._flight.v1),
+                   "-" if self._flight.vr is None
+                   else str(self._flight.vr),
+                   "-" if self._flight.v2 is None
+                   else str(self._flight.v2))
+
+        if self._v1r2LineIndex is None:
+            self._v1r2LineIndex = \
+                self.logger.message(self._aircraftState.timestamp, message)
+        else:
+            self.logger.updateLine(self._v1r2LineIndex, message)
 
     def updateVRef(self):

src/mlx/gui/flight.py

@@ -1300 +1300 @@
                                           completedHelp = completedHelp)
 
+        self._forwardAllowed = False
+
         alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
                                   xscale = 0.0, yscale = 0.0)
@@ -1318 +1320 @@
         self._runway.set_width_chars(10)
         self._runway.set_tooltip_text("The runway the takeoff is performed from.")
+        self._runway.connect("changed", self._valueChanged)
         table.attach(self._runway, 1, 3, 0, 1)
         label.set_mnemonic_widget(self._runway)
@@ -1329 +1332 @@
         self._sid.set_width_chars(10)
         self._sid.set_tooltip_text("The name of the Standard Instrument Deparature procedure followed.")
+        self._sid.connect("changed", self._valueChanged)
         table.attach(self._sid, 1, 3, 1, 2)
         label.set_mnemonic_widget(self._sid)
@@ -1341 +1345 @@
         self._v1.set_width_chars(4)
         self._v1.set_tooltip_markup("The takeoff decision speed in knots.")
+        self._v1.connect("integer-changed", self._valueChanged)
         table.attach(self._v1, 2, 3, 2, 3)
         label.set_mnemonic_widget(self._v1)
@@ -1355 +1360 @@
         self._vr.set_width_chars(4)
         self._vr.set_tooltip_markup("The takeoff rotation speed in knots.")
+        self._vr.connect("integer-changed", self._valueChanged)
         table.attach(self._vr, 2, 3, 3, 4)
         label.set_mnemonic_widget(self._vr)
@@ -1369 +1375 @@
         self._v2.set_width_chars(4)
         self._v2.set_tooltip_markup("The takeoff safety speed in knots.")
+        self._v2.connect("integer-changed", self._valueChanged)
         table.attach(self._v2, 2, 3, 4, 5)
         label.set_mnemonic_widget(self._v2)
@@ -1421 +1428 @@
         self._button.set_sensitive(False)
         
-    def freezeValues(self):
-        """Freeze the values on the page, and enable the forward button."""
+    def finalize(self):
+        """Finalize the page."""
         self._runway.set_sensitive(False)
         self._sid.set_sensitive(False)
@@ -1428 +1435 @@
         self._vr.set_sensitive(False)
         self._v2.set_sensitive(False)
-        self._button.set_sensitive(True)
+        self._wizard.gui.flight.aircraft.updateV1R2()
+
+    def allowForward(self):
+        """Allow going to the next page."""
+        self._forwardAllowed = True
+        self._updateForwardButton()
+
+    def _updateForwardButton(self):
+        """Update the sensitivity of the forward button based on some conditions."""
+        sensitive = self._forwardAllowed and \
+                    self._runway.get_text()!="" and \
+                    self._sid.get_text()!="" and \
+                    self.v1 is not None and \
+                    self.vr is not None and \
+                    self.v2 is not None and \
+                    self.v1 <= self.vr and \
+                    self.vr <= self.v2
+        self._button.set_sensitive(sensitive)
+
+    def _valueChanged(self, widget, arg = None):
+        """Called when the value of some widget has changed."""
+        self._updateForwardButton()
         
     def _backClicked(self, button):
@@ -2086 +2114 @@
         """Set the flight stage to the given one."""
         if stage==const.STAGE_TAKEOFF:
-            self._takeoffPage.freezeValues()
+            self._takeoffPage.allowForward()
         elif stage==const.STAGE_END:
             self._landingPage.flightEnded()