Changeset 895:929448cde3f5 for src


Ignore:
Timestamp:
03/16/18 08:52:05 (7 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
default
Phase:
public
Message:

The Ilyushin Il-62 is supported to some degree.

Location:
src/mlx
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • src/mlx/acft.py

    r888 r895  
    12371237#---------------------------------------------------------------------------------------
    12381238
     1239class IL62(Aircraft):
     1240    """Ilyushin IL-62 aircraft.
     1241
     1242    The aircraft type-specific values in the aircraft state have the following
     1243    structure:
     1244    - fuel: left, centre, right
     1245    - n1: left outer, left inner, right inner, right outer
     1246    - reverser: empty (the plane has no reversers)"""
     1247    dow = 69500
     1248
     1249    def __init__(self, flight):
     1250        super(B462, self).__init__(flight)
     1251        self.mtow = 165000
     1252        self.mlw = 165000
     1253        self.mzfw = 165000
     1254        self.gearSpeedLimit = 210
     1255        self.flapSpeedLimits = { 18 : 217,
     1256                                 24 : 180,
     1257                                 30 : 170,
     1258                                 33 : 150 }
     1259
     1260    @property
     1261    def derateType(self):
     1262        """Get the derate type for this type."""
     1263        return DERATE_NONE
     1264
     1265#---------------------------------------------------------------------------------------
     1266
    12391267mostFuelTanks = [const.FUELTANK_LEFT_TIP, const.FUELTANK_EXTERNAL1,
    12401268                 const.FUELTANK_LEFT_AUX,
    … …  
    12621290             const.AIRCRAFT_T154  : T154,
    12631291             const.AIRCRAFT_YK40  : YK40,
    1264              const.AIRCRAFT_B462  : B462 }
     1292             const.AIRCRAFT_B462  : B462,
     1293             const.AIRCRAFT_IL62  : IL62 }
    12651294
    12661295#---------------------------------------------------------------------------------------

  • src/mlx/const.py

    r894 r895  
    105105## Aircraft type: British Aerospace BAe-146
    106106AIRCRAFT_B462 = 17
     107
     108## Aircraft type: British Aerospace BAe-146
     109AIRCRAFT_IL62 = 19
    107110
    108111#-------------------------------------------------------------------------------
    … …  
    119122                 AIRCRAFT_T154, AIRCRAFT_T134,
    120123                 AIRCRAFT_YK40, AIRCRAFT_DC3,
    121                  AIRCRAFT_B462]
     124                 AIRCRAFT_B462, AIRCRAFT_IL62]
    122125
    123126#-------------------------------------------------------------------------------
    … …  
    155158## Aircraft type family: British Aerospace BAe-146
    156159AIRCRAFT_FAMILY_B462 = 11
     160
     161## Aircraft type family: Ilyushin IL-62
     162AIRCRAFT_FAMILY_IL62 = 12
    157163
    158164#-------------------------------------------------------------------------------
    … …  
    182188    AIRCRAFT_FAMILY_YK40: [AIRCRAFT_YK40],
    183189
    184     AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462]
     190    AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462],
     191
     192    AIRCRAFT_FAMILY_IL62: [AIRCRAFT_IL62]
    185193
    186194    }

  • src/mlx/gui/common.py

    r863 r895  
    547547                  _const.AIRCRAFT_T154  : xstr("aircraft_t154"),
    548548                  _const.AIRCRAFT_YK40  : xstr("aircraft_yk40"),
    549                   _const.AIRCRAFT_B462  : xstr("aircraft_b462") }
     549                  _const.AIRCRAFT_B462  : xstr("aircraft_b462"),
     550                  _const.AIRCRAFT_IL62  : xstr("aircraft_il62") }
    550551
    551552#------------------------------------------------------------------------------
    … …  
    572573    _const.AIRCRAFT_FAMILY_YK40: xstr("aircraft_family_yk40"),
    573574
    574     _const.AIRCRAFT_FAMILY_B462: xstr("aircraft_family_b462")
     575    _const.AIRCRAFT_FAMILY_B462: xstr("aircraft_family_b462"),
     576
     577    _const.AIRCRAFT_FAMILY_IL62: xstr("aircraft_family_il62")
    575578}
    576579

  • src/mlx/rpc.py

    r889 r895  
    208208                      "TU5"  : const.AIRCRAFT_T154,
    209209                      "YK4"  : const.AIRCRAFT_YK40,
    210                       "146"  : const.AIRCRAFT_B462 }
     210                      "146"  : const.AIRCRAFT_B462,
     211                      "IL6"  : const.AIRCRAFT_IL62 }
    211212
    212213    # FIXME: copied from web.BookedFlight
    … …  
    228229                      const.AIRCRAFT_T154  : "TU5",
    229230                      const.AIRCRAFT_YK40  : "YK4",
    230                       const.AIRCRAFT_B462  : "146" }
     231                      const.AIRCRAFT_B462  : "146",
     232                      const.AIRCRAFT_IL62  : "IL6" }
    231233
    232234    # FIXME: copied from web.BookedFlight

  • src/mlx/web.py

    r859 r895  
    7373                      "TU5"  : const.AIRCRAFT_T154,
    7474                      "YK4"  : const.AIRCRAFT_YK40,
    75                       "146"  : const.AIRCRAFT_B462 }
     75                      "146"  : const.AIRCRAFT_B462,
     76                      "IL6"  : const.AIRCRAFT_IL62 }
    7677
    7778    TYPE2TYPECODE = { const.AIRCRAFT_B736  : "736",
    … …  
    9293                      const.AIRCRAFT_T154  : "TU5",
    9394                      const.AIRCRAFT_YK40  : "YK4",
    94                       const.AIRCRAFT_B462  : "146" }
     95                      const.AIRCRAFT_B462  : "146",
     96                      const.AIRCRAFT_IL62  : "IL6" }
    9597
    9698    checkFlightTypes = [ const.AIRCRAFT_B736, const.AIRCRAFT_B737,
Note: See TracChangeset for help on using the changeset viewer.