Changeset 289:ab76473b8f85 for src/mlx

Timestamp:

07/07/12 15:26:46 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed the fuel handling of the DC-3

File:

• src/mlx/fsuipc.py (modified) (4 diffs)

src/mlx/fsuipc.py

@@ -1665 +1665 @@
 class DC3Model(GenericAircraftModel):
     """Generic model for the Lisunov Li-2 (DC-3) aircraft."""
-    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_CENTRE, const.FUELTANK_RIGHT]    
+    fuelTanks = [const.FUELTANK_LEFT, const.FUELTANK_CENTRE,
+                 const.FUELTANK_RIGHT]    
     # fuelTanks = [const.FUELTANK_LEFT_AUX, const.FUELTANK_LEFT,
     #              const.FUELTANK_RIGHT, const.FUELTANK_RIGHT_AUX]
@@ -1675 +1676 @@
                      fuelTanks = DC3Model.fuelTanks,
                      numEngines = 2, isN1 = False)
+        self._leftLevel = 0.0
+        self._rightLevel = 0.0
 
     @property
@@ -1696 +1699 @@
         if addCapacities:
             centreCapacity = rawFuelData[1][2]
+            self._leftLevel = self._rightLevel = \
+                centreAmount / centreCapacity / 2.0
             fuelData = [(const.FUELTANK_LEFT_AUX, 
                          rawFuelData[0][1], rawFuelData[0][2]),
@@ -1718 +1723 @@
         implementation assumes to get the four-tank representation,
         as returned by getFuel()."""
-        leftLevel = 0.0
-        centreLevel = 0.0
-        rightLevel = 0.0
+        leftLevel = None
+        centreLevel = None
+        rightLevel = None
         
         for (tank, level) in levels:
-            if tank==const.FUELTANK_LEFT_AUX: leftLevel += level
-            elif tank==const.FUELTANK_LEFT or  tank==const.FUELTANK_RIGHT: 
-                centreLevel += level
-            elif tank==const.FUELTANK_RIGHT_AUX: rightLevel += level
-
-        super(DC3Model, self).setFuelLevel([(const.FUELTANK_LEFT, leftLevel),
-                                            (const.FUELTANK_CENTRE,
-                                            centreLevel),
-                                            (const.FUELTANK_RIGHT, rightLevel)])
+            if tank==const.FUELTANK_LEFT_AUX:
+                leftLevel = level if leftLevel is None else (leftLevel + level)
+            elif tank==const.FUELTANK_LEFT:
+                level /= 2.0
+                centreLevel = (self._rightLevel + level) \
+                              if centreLevel is None else (centreLevel + level)
+                self._leftLevel = level
+            elif tank==const.FUELTANK_RIGHT:
+                level /= 2.0
+                centreLevel = (self._leftLevel + level) \
+                              if centreLevel is None else (centreLevel + level)
+                self._rightLevel = level
+            elif tank==const.FUELTANK_RIGHT_AUX:
+                rightLevel = level if rightLevel is None \
+                             else (rightLevel + level)
+
+        levels = []
+        if leftLevel is not None: levels.append((const.FUELTANK_LEFT,
+                                                 leftLevel))
+        if centreLevel is not None: levels.append((const.FUELTANK_CENTRE,
+                                                   centreLevel))
+        if rightLevel is not None: levels.append((const.FUELTANK_RIGHT,
+                                                 rightLevel))
+
+        super(DC3Model, self).setFuelLevel(handler, levels)
 
 #------------------------------------------------------------------------------