Changeset 118:aaa1bc00131b for src

Timestamp:

04/28/12 15:14:39 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the gates tab

Location:

src/mlx

Files:

• gui/flight.py (modified) (1 diff)
• gui/gates.py (added)
• gui/gui.py (modified) (2 diffs)
• i18n.py (modified) (4 diffs)
• web.py (modified) (2 diffs)

src/mlx/gui/flight.py

@@ -360 +360 @@
         scrolledWindow.add(self._flightList)
         scrolledWindow.set_size_request(400, -1)
+        # FIXME: these should be constants in common.py
         scrolledWindow.set_policy(gtk.PolicyType.AUTOMATIC if pygobject
                                   else gtk.POLICY_AUTOMATIC,

src/mlx/gui/gui.py

@@ -9 +9 @@
 from mlx.gui.monitor import MonitorWindow
 from mlx.gui.weighthelp import WeightHelp
+from mlx.gui.gates import FleetGateStatus
 
 import mlx.const as const
@@ -101 +102 @@
         self._notebook.append_page(logWidget, label)
 
+        self._fleetGateStatus = FleetGateStatus(self)
+        label = gtk.Label(xstr("tab_gates"))
+        label.set_use_underline(True)
+        label.set_tooltip_text(xstr("tab_gates_tooltip"))
+        self._notebook.append_page(self._fleetGateStatus, label)
+        
         (self._debugLogWidget, self._debugLogView) = self._buildLogWidget()
         self._debugLogWidget.show_all()

src/mlx/i18n.py

@@ -145 +145 @@
                  "The log of your flight that will be sent to the MAVA website")
         self.add("tab_gates", "_Gates")        
+        self.add("tab_gates_tooltip", "The status of the MAVA fleet and the gates at LHBP")        
         self.add("tab_debug_log", "_Debug log")
         self.add("tab_debug_log_tooltip", "Log with debugging information.")
@@ -506 +507 @@
         self.add("weighthelp_mlw", "MLW:")
         self.add("weighthelp_busy", "Querying weight data...")
+
+        self.add("gates_fleet_title", "Fl_eet")
+        self.add("gates_gates_title", "LHBP gates")
+        self.add("gates_tailno", "Tail nr.")
+        self.add("gates_planestatus", "Status")
+        self.add("gates_refresh", "_Refresh data")
+        self.add("gates_refresh_tooltip",
+                 "Click this button to refresh the status data above")
+        self.add("gates_planes_tooltip",
+                 "This table lists all the planes in the MAVA fleet and their "
+                 "last known location. If a plane is conflicting with another "
+                 "because of occupying the same gate its data is displayed in "
+                 "<b><span foreground=\"red\">red</span></b>.")
+        self.add("gates_gates_tooltip",
+                 "The numbers of the gates occupied by MAVA planes are "
+                 "displayed in "
+                 '<b><span foreground="orange">yellow</span></b>, '
+                 "while available gates in black.")
+        self.add("gates_plane_away", "AWAY")
+        self.add("gates_plane_parking", "PARKING")
+        self.add("gates_plane_unknown", "UNKNOWN")
                  
 #------------------------------------------------------------------------------
@@ -537 +559 @@
         self.add("tab_log_tooltip",
                  "A járat naplója, amit majd el lehet küldeni a MAVA szerverére")
+        self.add("tab_gates", "_Kapuk")        
+        self.add("tab_gates_tooltip", "A MAVA flotta és LHBP kapuinak állapota")        
         self.add("tab_debug_log", "_Debug napló")
         self.add("tab_debug_log_tooltip",
                  "Hibakereséshez használható információkat tartalmazó napló.")
-        self.add("tab_gates", "_Kapuk")        
 
         self.add("conn_failed", "Nem tudtam kapcsolódni a szimulátorhoz.")
@@ -906 +929 @@
         self.add("weighthelp_busy", "A tömegadatok lekérdezése...")
 
+        self.add("gates_fleet_title", "_Flotta")
+        self.add("gates_gates_title", "LHBP kapuk")
+        self.add("gates_tailno", "Lajstromjel")
+        self.add("gates_planestatus", "Állapot")
+        self.add("gates_refresh", "_Adatok frissítése")
+        self.add("gates_refresh_tooltip",
+                 "Kattints erre a gombra a fenti adatok frissítéséhez")
+        self.add("gates_planes_tooltip",
+                 "Ez a táblázat tartalmazza a MAVA flottája összes "
+                 "repülőgépének lajstromjelét és utolsó ismert helyét. "
+                 "Ha egy repülőgép olyan kapun áll, amelyet másik gép is "
+                 "elfoglal, akkor annak a repülőgépnek az adatai "
+                 "<b><span foreground=\"red\">piros</span></b> "
+                 "színnel jelennek meg.")
+        self.add("gates_gates_tooltip",
+                 "A MAVA repülőgépei által elfoglalt kapuk száma "
+                 '<b><span foreground="orange">sárga</span></b> színnel,'
+                 "a többié feketén jelenik meg.")
+        self.add("gates_plane_away", "TÁVOL")
+        self.add("gates_plane_parking", "PARKOL")
+        self.add("gates_plane_unknown", "ISMERETLEN")
+                 
 #------------------------------------------------------------------------------
 

src/mlx/web.py

@@ -159 +159 @@
             plane = Plane(line)
             if plane.tailNumber is not None:
-                self._planes[plane.tailNumber] = plane        
+                self._planes[plane.tailNumber] = plane
 
     def isGateConflicting(self, plane):
@@ -179 +179 @@
                 gateNumbers.add(p.gateNumber)
         return gateNumbers
+
+    def __iter__(self):
+        """Get an iterator over the planes."""
+        for plane in self._planes.itervalues():
+            yield plane
         
     def __getitem__(self, tailNumber):