Changeset 86:285443d1c1e2

Timestamp:

04/15/12 13:06:47 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The IntegerEntry widget is used for the VRef as well on the landing page

Location:

src/mlx

Files:

• acft.py (modified) (1 diff)
• flight.py (modified) (1 diff)
• gui/common.py (modified) (1 diff)
• gui/flight.py (modified) (21 diffs)
• gui/gui.py (modified) (1 diff)

src/mlx/acft.py

@@ -175 +175 @@
                             "Altimeter setting: %.0f hPa" % \
                             (self._aircraftState.altimeter,))
+        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.flight.flareStarted(flareStart, flareStartFS)
          

src/mlx/flight.py

@@ -75 +75 @@
         return self._gui.v2
 
+    @property
+    def vref(self):
+        """Get the VRef speed of the flight."""
+        return self._gui.vref
+
     def setStage(self, timestamp, stage):
         """Set the flight stage.

src/mlx/gui/common.py

@@ -85 +85 @@
         gtk.Entry.__init__(self)
 
+        self.set_alignment(1.0)
+
         self._defaultValue = defaultValue
         self._currentInteger = defaultValue

src/mlx/gui/flight.py

@@ -686 +686 @@
         self._cargoWeight = IntegerEntry(defaultValue = 0)
         self._cargoWeight.set_width_chars(6)
-        self._cargoWeight.set_alignment(1.0)
         self._cargoWeight.connect("integer-changed", self._cargoWeightChanged)
         self._cargoWeight.set_tooltip_text("The weight of the cargo for your flight.")
@@ -1210 +1209 @@
             buffer.set_text(metar)
 
-    def finalize(self):
-        """Finalize the page."""
-        if not self._departure:
-            self._button.set_use_stock(True)
-            self._button.set_label(gtk.STOCK_GO_FORWARD)
-
     def _backClicked(self, button):
         """Called when the Back button is pressed."""
@@ -1225 +1218 @@
             if not self._finalized:
                 self._wizard.gui.startMonitoring()
+                self._button.set_use_stock(True)
+                self._button.set_label(gtk.STOCK_GO_FORWARD)
                 self._finalized = True
 
@@ -1278 +1273 @@
 
         self._v1 = IntegerEntry()
-        self._v1.set_width_chars(1)
+        self._v1.set_width_chars(4)
         self._v1.set_tooltip_markup("The takeoff decision speed in knots.")
         table.attach(self._v1, 2, 3, 2, 3)
@@ -1285 +1280 @@
         table.attach(gtk.Label("knots"), 3, 4, 2, 3)
         
-        label = gtk.Label("V<sub>_r</sub>:")
+        label = gtk.Label("V<sub>_R</sub>:")
         label.set_use_markup(True)
         label.set_use_underline(True)
@@ -1292 +1287 @@
 
         self._vr = IntegerEntry()
-        self._vr.set_width_chars(1)
+        self._vr.set_width_chars(4)
         self._vr.set_tooltip_markup("The takeoff rotation speed in knots.")
         table.attach(self._vr, 2, 3, 3, 4)
@@ -1306 +1301 @@
 
         self._v2 = IntegerEntry()
-        self._v2.set_width_chars(1)
+        self._v2.set_width_chars(4)
         self._v2.set_tooltip_markup("The takeoff safety speed in knots.")
         table.attach(self._v2, 2, 3, 4, 5)
@@ -1344 +1339 @@
         self._v1.set_int(None)
         self._v1.set_sensitive(True)
+        self._vr.set_int(None)
         self._vr.set_sensitive(True)
+        self._v2.set_int(None)
         self._v2.set_sensitive(True)
         self._button.set_sensitive(False)
@@ -1372 +1369 @@
         """Construct the landing page."""
         help = "Enter the STAR and/or transition, runway,\n" \
-               "approach type and V<sub>ref</sub> used."
+               "approach type and V<sub>Ref</sub> used."
 
         super(LandingPage, self).__init__(wizard, "Landing", help)
@@ -1379 +1376 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = gtk.Table(5, 4)
+        table = gtk.Table(5, 5)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -1400 +1397 @@
         self._star.connect("changed", self._updateForwardButton)
         self._star.set_sensitive(False)
-        table.attach(self._star, 2, 3, 0, 1)
+        table.attach(self._star, 2, 4, 0, 1)
         label.set_mnemonic_widget(self._starButton)
 
@@ -1417 +1414 @@
         self._transition.connect("changed", self._updateForwardButton)
         self._transition.set_sensitive(False)
-        table.attach(self._transition, 2, 3, 1, 2)
+        table.attach(self._transition, 2, 4, 1, 2)
         label.set_mnemonic_widget(self._transitionButton)
 
@@ -1429 +1426 @@
         self._runway.set_tooltip_text("The runway the landing is performed on.")
         self._runway.connect("changed", self._updateForwardButton)
-        table.attach(self._runway, 2, 3, 2, 3)
+        table.attach(self._runway, 2, 4, 2, 3)
         label.set_mnemonic_widget(self._runway)
 
@@ -1441 +1438 @@
         self._approachType.set_tooltip_text("The type of the approach, e.g. ILS or VISUAL.")
         self._approachType.connect("changed", self._updateForwardButton)
-        table.attach(self._approachType, 2, 3, 3, 4)
+        table.attach(self._approachType, 2, 4, 3, 4)
         label.set_mnemonic_widget(self._approachType)
 
-        label = gtk.Label("V<sub>_ref</sub>:")
+        label = gtk.Label("V<sub>_Ref</sub>:")
         label.set_use_markup(True)
         label.set_use_underline(True)
@@ -1450 +1447 @@
         table.attach(label, 1, 2, 5, 6)
 
-        self._vref = gtk.SpinButton()
-        self._vref.set_increments(step = 1, page = 10)
-        self._vref.set_range(min = 50, max = 300)
-        self._vref.set_value(140)
-        self._vref.set_numeric(True)
+        self._vref = IntegerEntry()
+        self._vref.set_width_chars(5)
         self._vref.set_tooltip_markup("The approach reference speed in knots.")
-        table.attach(self._vref, 2, 3, 5, 6)
+        self._vref.connect("integer-changed", self._vrefChanged)
+        table.attach(self._vref, 3, 4, 5, 6)
         label.set_mnemonic_widget(self._vref)
         
-        table.attach(gtk.Label("knots"), 3, 4, 5, 6)
+        table.attach(gtk.Label("knots"), 4, 5, 5, 6)
         
         button = self.addButton(gtk.STOCK_GO_BACK)
@@ -1472 +1467 @@
         self._starButton.set_active(True)
         self._transitionButton.set_active(True)
+
+    @property
+    def vref(self):
+        """Return the landing reference speed."""
+        return self._vref.get_int()
 
     def activate(self):
@@ -1489 +1489 @@
         self._approachType.set_sensitive(True)
 
-        self._vref.set_value(140)
+        self._vref.set_int(None)
         self._vref.set_sensitive(True)
 
@@ -1522 +1522 @@
         if active:
             self._transition.grab_focus()        
-        self._updateForwardButton()
+        self._updateForwardButton()    
 
     def _updateForwardButton(self, widget = None):
@@ -1533 +1533 @@
                      not self._transitionButton.get_active()) and \
                     self._runway.get_text()!="" and \
-                    self._approachType.get_text()!=""
+                    self._approachType.get_text()!="" and \
+                    self.vref is not None
         self._button.set_sensitive(sensitive)
+
+    def _vrefChanged(self, widget, value):
+        """Called when the Vref has changed."""
+        self._updateForwardButton()
 
     def _backClicked(self, button):
@@ -1571 +1576 @@
         self._takeoffPage = TakeoffPage(self) 
         self._pages.append(self._takeoffPage)
-        self._pages.append(LandingPage(self))
+        self._landingPage = LandingPage(self) 
+        self._pages.append(self._landingPage)
         
         maxWidth = 0
@@ -1629 +1635 @@
     def v1(self):
         """Get the V1 speed."""
-        return None if self._bookedFlight is None else self._takeoffPage.v1
+        return self._takeoffPage.v1
 
     @property
     def vr(self):
         """Get the Vr speed."""
-        return None if self._bookedFlight is None else self._takeoffPage.vr
+        return self._takeoffPage.vr
 
     @property
     def v2(self):
         """Get the V2 speed."""
-        return None if self._bookedFlight is None else self._takeoffPage.v2
+        return self._takeoffPage.v2
+
+    @property
+    def vref(self):
+        """Get the Vref speed."""
+        return self._landingPage.vref
 
     def nextPage(self, finalize = True):

src/mlx/gui/gui.py

@@ -133 +133 @@
         """Get the V2 speed calculated for the flight."""
         return self._wizard.v2
+        
+    @property
+    def vref(self):
+        """Get the Vref speed calculated for the flight."""
+        return self._wizard.vref
         
     def run(self):