Changeset 262:16f4855e111a

Timestamp:

06/27/12 17:31:51 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The PIREP constructor gets the flight object instead of the GUI

Location:

src/mlx

Files:

• flight.py (modified) (5 diffs)
• gui/flight.py (modified) (2 diffs)
• pirep.py (modified) (2 diffs)

src/mlx/flight.py

@@ -83 +83 @@
 
     @property
+    def cargoWeight(self):
+        """Get the cargo weight for the flight."""
+        return self._gui.cargoWeight
+
+    @property
     def zfw(self):
         """Get the Zero-Fuel Weight of the flight."""
@@ -88 +93 @@
 
     @property
+    def filedCruiseAltitude(self):
+        """Get the filed cruise altitude."""
+        return self._gui.filedCruiseAltitude
+
+    @property
     def cruiseAltitude(self):
         """Get the cruise altitude of the flight."""
@@ -93 +103 @@
 
     @property
+    def route(self):
+        """Get the route of the flight."""
+        return self._gui.route
+
+    @property
+    def departureMETAR(self):
+        """Get the departure METAR of the flight."""
+        return self._gui.departureMETAR
+
+    @property
+    def arrivalMETAR(self):
+        """Get the arrival METAR of the flight."""
+        return self._gui.arrivalMETAR
+
+    @property
+    def departureRunway(self):
+        """Get the departure runway."""
+        return self._gui.departureRunway
+
+    @property
+    def sid(self):
+        """Get the SID followed."""
+        return self._gui.sid
+
+    @property
     def v1(self):
         """Get the V1 speed of the flight."""
@@ -108 +143 @@
 
     @property
+    def star(self):
+        """Get the STAR planned."""
+        return self._gui.star
+
+    @property
+    def transition(self):
+        """Get the transition planned."""
+        return self._gui.transition
+
+    @property
+    def approachType(self):
+        """Get the approach type."""
+        return self._gui.approachType
+
+    @property
+    def arrivalRunway(self):
+        """Get the arrival runway."""
+        return self._gui.arrivalRunway
+
+    @property
     def vref(self):
         """Get the VRef speed of the flight."""
@@ -116 +171 @@
         """Get the touchdown rate if known, None otherwise."""
         return self._tdRate
+
+    @property
+    def flightType(self):
+        """Get the type of the flight."""
+        return self._gui.flightType
+
+    @property
+    def online(self):
+        """Get whether the flight was an online flight."""
+        return self._gui.online
+
+    @property
+    def comments(self):
+        """Get the comments made by the pilot."""
+        return self._gui.comments
+
+    @property
+    def flightDefects(self):
+        """Get the flight defects reported by the pilot."""
+        return self._gui.flightDefects
+
+    @property
+    def delayCodes(self):
+        """Get the delay codes."""
+        return self._gui.delayCodes
 
     @property

src/mlx/gui/flight.py

@@ -2546 +2546 @@
 
         if result==RESPONSETYPE_OK:
-            pirep = PIREP(gui)
+            pirep = PIREP(gui.flight)
 
             self._lastSavePath = text2unicode(dialog.get_filename())
@@ -2603 +2603 @@
     def _sendClicked(self, button):
         """Called when the Send button is clicked."""
-        pirep = PIREP(self._wizard.gui)
+        pirep = PIREP(self._wizard.gui.flight)
         self._wizard.gui.sendPIREP(pirep,
                                    callback = self._handlePIREPSent)

src/mlx/pirep.py

@@ -39 +39 @@
             return None
         
-    def __init__(self, gui):
-        """Initialize the PIREP from the given GUI."""
-        self.bookedFlight = gui.bookedFlight
-        self.cargoWeight = gui.cargoWeight
+    def __init__(self, flight):
+        """Initialize the PIREP from the given flight."""
+        self.bookedFlight = flight.bookedFlight
+        self.cargoWeight = flight.cargoWeight
         
-        self.filedCruiseAltitude = gui.filedCruiseAltitude
-        self.cruiseAltitude = gui.cruiseAltitude
-        self.route = gui.route
+        self.filedCruiseAltitude = flight.filedCruiseAltitude
+        self.cruiseAltitude = flight.cruiseAltitude
+        self.route = flight.route
 
-        self.departureMETAR = gui.departureMETAR.upper()
-        self.arrivalMETAR = gui.arrivalMETAR.upper()
+        self.departureMETAR = flight.departureMETAR.upper()
+        self.arrivalMETAR = flight.arrivalMETAR.upper()
 
-        self.departureRunway = gui.departureRunway.upper()
-        self.sid = gui.sid.upper()
+        self.departureRunway = flight.departureRunway.upper()
+        self.sid = flight.sid.upper()
 
-        self.star = gui.star
-        self.transition = gui.transition
-        self.approachType = gui.approachType.upper()
-        self.arrivalRunway = gui.arrivalRunway.upper()
+        self.star = flight.star
+        self.transition = flight.transition
+        self.approachType = flight.approachType.upper()
+        self.arrivalRunway = flight.arrivalRunway.upper()
 
-        self.flightType = gui.flightType
-        self.online = gui.online
+        self.flightType = flight.flightType
+        self.online = flight.online
 
-        self.comments = gui.comments
-        self.flightDefects = gui.flightDefects
-        self.delayCodes = gui.delayCodes
+        self.comments = flight.comments
+        self.flightDefects = flight.flightDefects
+        self.delayCodes = flight.delayCodes
         
-        flight = gui.flight
         self.blockTimeStart = flight.blockTimeStart
         self.flightTimeStart = flight.flightTimeStart
@@ -74 +73 @@
         self.fuelUsed = flight.startFuel - flight.endFuel
 
-        logger = gui.logger
+        logger = flight.logger
         self.rating = logger.getRating()
         self.logLines = logger.lines