Changeset 274:b866c39279e8 for src/mlx/gui

Timestamp:

07/05/12 17:51:58 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Reworked fuel handling so that the model can tell what tanks there are

Location:

src/mlx/gui

Files:

• flight.py (modified) (5 diffs)
• monitor.py (modified) (1 diff)

src/mlx/gui/flight.py

@@ -1163 +1163 @@
             gui.beginBusy(xstr("fuel_get_busy"))
             
-            gui.simulator.getFuel(gui.flight.aircraft.fuelTanks,
-                                  self._handleFuel)
+            gui.simulator.getFuel(self._handleFuel)
         else:
             self._wizard.nextPage()
@@ -1374 +1373 @@
         self.setMainWidget(self._fuelAlignment)
 
-        tanks = acft.MostFuelTankAircraft.fuelTanks
-        tankData = ((2500, 3900),) * len(tanks)
-        self._setupTanks(tanks, tankData)
+        tankData = [(tank, 2500, 3900) for tank in acft.mostFuelTanks]
+        self._setupTanks(tankData)
 
         self.addCancelFlightButton()
@@ -1387 +1385 @@
     def activate(self):
         """Activate the page."""
-        gui = self._wizard.gui
-
-        self._setupTanks(gui.flight.aircraft.fuelTanks,
-                         self._wizard._fuelData)
+        self._setupTanks(self._wizard._fuelData)
 
     def finalize(self):
@@ -1410 +1405 @@
             self._wizard.nextPage()        
 
-    def _setupTanks(self, tanks, tankData):
+    def _setupTanks(self, tankData):
         """Setup the tanks for the given data."""
-        numTanks = len(tanks)
+        numTanks = len(tankData)
         if self._fuelTable is not None:
             self._fuelAlignment.remove(self._fuelTable)
@@ -1419 +1414 @@
         self._fuelTable = gtk.Table(numTanks, 1)
         self._fuelTable.set_col_spacings(16)
-        for i in range(0, numTanks):
-            tank = tanks[i]
-            (current, capacity) = tankData[i]
-
+        index = 0
+        for (tank, current, capacity) in tankData:
             fuelTank = FuelTank(tank,
                                 xstr("fuel_tank_" +
                                      const.fuelTank2string(tank)),
                                 capacity, current)
-            self._fuelTable.attach(fuelTank, i, i+1, 0, 1)
+            self._fuelTable.attach(fuelTank, index, index+1, 0, 1)
             self._fuelTanks.append(fuelTank)
+            index += 1
             
         self._fuelAlignment.add(self._fuelTable)

src/mlx/gui/monitor.py

@@ -281 +281 @@
 
             fuelStr = ""
-            for fuel in aircraftState.fuel:
+            for (_tank, fuel) in aircraftState.fuel:
                 if fuelStr: fuelStr += ", "
                 fuelStr += "%.0f" % (fuel,)