Changeset 619:7763179ff6b0 for src/mlx/gui

Timestamp:

03/29/15 12:10:53 (10 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Reworked the representation and handling of gate data (re #113)

Location:

src/mlx/gui

Files:

• flight.py (modified) (3 diffs)
• gates.py (modified) (4 diffs)

src/mlx/gui/flight.py

@@ -7 +7 @@
 from mlx.flight import Flight
 from mlx.checks import PayloadChecker
+from mlx.gates import lhbpGates
 import mlx.util as util
 from mlx.pirep import PIREP
@@ -818 +819 @@
         self._gateList.set_sensitive(True)
         occupiedGateNumbers = self._wizard._fleet.getOccupiedGateNumbers()
-        for gateNumber in const.lhbpGateNumbers:
-            if gateNumber not in occupiedGateNumbers:
-                self._listStore.append([gateNumber])
+        for gate in lhbpGates:
+            if gate.isAvailable(lhbpGates, occupiedGateNumbers):
+                self._listStore.append([gate.number])
 
     def finalize(self):
@@ -3253 +3254 @@
            self._wizard.bookedFlight.arrivalICAO=="LHBP" and \
            not self._wizard.entranceExam:
-            occupiedGates = self._wizard._fleet.getOccupiedGateNumbers()
-            for gateNumber in const.lhbpGateNumbers:
-                if gateNumber not in occupiedGates:
-                    self._gatesModel.append([gateNumber])
+            occupiedGateNumbers = self._wizard._fleet.getOccupiedGateNumbers()
+            for gate in lhbpGates.gates:
+                if gate.isAvailable(lhbpGates, occupiedGateNumbers):
+                    self._gatesModel.append([gate.number])
             self._gateLabel.set_sensitive(True)
             self._gate.set_sensitive(True)

src/mlx/gui/gates.py

@@ -4 +4 @@
 from mlx.i18n import xstr
 import mlx.const as const
+from mlx.gates import Gates, lhbpGates
 
 #-------------------------------------------------------------------------------
@@ -82 +83 @@
         statusBox.pack_start(gatesFrame, True, True, 4)        
 
-        self._gatesTable = table = gtk.Table(14, 4)
+        self._gatesTable = table = gtk.Table(lhbpGates.numRows,
+                                             lhbpGates.numColumns)
         table.set_tooltip_markup(xstr("gates_gates_tooltip"))
         alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
@@ -94 +96 @@
         column = 0
         row = 0
-        for gateNumber in const.lhbpGateNumbers:
-            label = gtk.Label()
-            label.set_markup("<b>" + gateNumber + "</b>")
-            table.attach(label, column, column + 1, row, row + 1)
+        for (type, data) in lhbpGates.displayInfos:
+            if type==Gates.DISPLAY_GATE:
+                gate = data
 
-            self._gateLabels[gateNumber] = label
-            
-            if column==1 and row==12:
-                column = 2
-                row = 1
-            elif row==13:
+                label = gtk.Label()
+                label.set_markup("<b>" + gate.number + "</b>")
+                table.attach(label, column, column + 1, row, row + 1)
+
+                self._gateLabels[gate.number] = label
+                row += 1
+            elif type==Gates.DISPLAY_SPACE:
+                row += 1
+            elif type==Gates.DISPLAY_NEW_COLUMN:
+                row = 0
                 column += 1
-                row = 0
-            else:
-                row += 1
-                
+
         button = gtk.Button(xstr("gates_refresh"))
         button.set_use_underline(True)
@@ -168 +170 @@
 
             occupiedGateNumbers = fleet.getOccupiedGateNumbers()
-            for gateNumber in const.lhbpGateNumbers:
+            for gate in lhbpGates.gates:
+                gateNumber = gate.number
                 markup = gateNumber
                 if gateNumber in occupiedGateNumbers: