Changeset 359:fa4e93edd48b


Ignore:
Timestamp:
12/13/12 16:27:23 (10 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
default
Phase:
public
Message:

Eliminated the parking stage (#150)

Location:
src/mlx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/mlx/acft.py

    r350 r359  
    280280                                    "Vertical speed range: %.0f..%.0f feet/min" % \
    281281                                    (self._minVS, self._maxVS))
    282             elif newStage==const.STAGE_PARKING:
    283                 self.logger.message(aircraftState.timestamp, "Block time end")
     282            # elif newStage==const.STAGE_PARKING:
     283            #     self.logger.message(aircraftState.timestamp, "Block time end")
    284284            elif newStage==const.STAGE_END:
    285285                flightLength = self._flight.flightTimeEnd - self._flight.flightTimeStart
     286                self.logger.message(aircraftState.timestamp, "Block time end")
    286287                self.logger.message(aircraftState.timestamp,
    287288                                    "Flight time: " +
  • src/mlx/checks.py

    r358 r359  
    9494                aircraft.prepareFlare()
    9595        elif stage==const.STAGE_TAXIAFTERLAND:
    96             if state.parking:
    97                 aircraft.setStage(state, const.STAGE_PARKING)
    98         elif stage==const.STAGE_PARKING:
    99             if aircraft.checkFlightEnd(state):
     96            if state.parking and aircraft.checkFlightEnd(state):
    10097                aircraft.setStage(state, const.STAGE_END)
    10198
  • src/mlx/flight.py

    r354 r359  
    274274            elif stage==const.STAGE_TAXIAFTERLAND:
    275275                self.flightTimeEnd = timestamp
    276             elif stage==const.STAGE_PARKING:
     276            # elif stage==const.STAGE_PARKING:
     277            #     self.blockTimeEnd = timestamp
     278            elif stage==const.STAGE_END:
    277279                self.blockTimeEnd = timestamp
    278             elif stage==const.STAGE_END:
    279280                with self._endCondition:
    280281                    self._endCondition.notify()
Note: See TracChangeset for help on using the changeset viewer.