Changeset 359:fa4e93edd48b

Timestamp:

12/13/12 16:27:23 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Eliminated the parking stage (#150)

Location:

src/mlx

Files:

• acft.py (modified) (1 diff)
• checks.py (modified) (1 diff)
• flight.py (modified) (1 diff)

src/mlx/acft.py

@@ -280 +280 @@
                                     "Vertical speed range: %.0f..%.0f feet/min" % \
                                     (self._minVS, self._maxVS))
-            elif newStage==const.STAGE_PARKING:
-                self.logger.message(aircraftState.timestamp, "Block time end")
+            # elif newStage==const.STAGE_PARKING:
+            #     self.logger.message(aircraftState.timestamp, "Block time end")
             elif newStage==const.STAGE_END:
                 flightLength = self._flight.flightTimeEnd - self._flight.flightTimeStart
+                self.logger.message(aircraftState.timestamp, "Block time end")
                 self.logger.message(aircraftState.timestamp,
                                     "Flight time: " +

src/mlx/checks.py

@@ -94 +94 @@
                 aircraft.prepareFlare()
         elif stage==const.STAGE_TAXIAFTERLAND:
-            if state.parking:
-                aircraft.setStage(state, const.STAGE_PARKING)
-        elif stage==const.STAGE_PARKING:
-            if aircraft.checkFlightEnd(state):
+            if state.parking and aircraft.checkFlightEnd(state):
                 aircraft.setStage(state, const.STAGE_END)
 

src/mlx/flight.py

@@ -274 +274 @@
             elif stage==const.STAGE_TAXIAFTERLAND:
                 self.flightTimeEnd = timestamp
-            elif stage==const.STAGE_PARKING:
+            # elif stage==const.STAGE_PARKING:
+            #     self.blockTimeEnd = timestamp
+            elif stage==const.STAGE_END:
                 self.blockTimeEnd = timestamp
-            elif stage==const.STAGE_END:
                 with self._endCondition:
                     self._endCondition.notify()