Changeset 106:5d81096406c0

Timestamp:

04/22/12 14:45:55 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The METAR of the arrival airport is downloaded in the landing stage.

Files:

• src/mlx/gui/flight.py (modified) (7 diffs)
• src/mlx/web.py (modified) (3 diffs)
• test/test1.txt (modified) (1 diff)

src/mlx/gui/flight.py

@@ -1212 +1212 @@
         self._metar.set_accepts_tab(False)
         self._metar.set_wrap_mode(gtk.WrapMode.WORD if pygobject else gtk.WRAP_WORD)
+        self._metar.get_buffer().connect("changed", self._metarChanged)
         scrolledWindow.add(self._metar)
         alignment = gtk.Alignment(xalign = 0.0, yalign = 0.0,
@@ -1220 +1221 @@
         self._metarFrame.add(alignment)
         mainBox.pack_start(self._metarFrame, True, True, 4)
+        self.metarEdited = False
 
         button = self.addButton(gtk.STOCK_GO_BACK)
@@ -1235 +1237 @@
         return buffer.get_text(buffer.get_start_iter(),
                                buffer.get_end_iter(), True)        
+
+    def setMETAR(self, metar):
+        """Set the metar."""
+        self._metar.get_buffer().set_text(metar)
+        self.metarEdited = False
 
     def activate(self):
@@ -1279 +1286 @@
             buffer.set_text(metar)
 
+        self.metarEdited = False
+
     def _backClicked(self, button):
         """Called when the Back button is pressed."""
@@ -1293 +1302 @@
 
         self._wizard.nextPage()
+
+    def _metarChanged(self, buffer):
+        """Called when the METAR has changed."""
+        self.metarEdited = True
+        self._button.set_sensitive(buffer.get_text(buffer.get_start_iter(),
+                                                   buffer.get_end_iter(),
+                                                   True)!="")
 
 #-----------------------------------------------------------------------------
@@ -2123 +2139 @@
         if stage==const.STAGE_TAKEOFF:
             self._takeoffPage.allowForward()
+        elif stage==const.STAGE_LANDING:
+            if not self._arrivalBriefingPage.metarEdited:
+                print "Downloading arrival METAR again"
+                self.gui.webHandler.getMETARs(self._arrivalMETARCallback,
+                                              [self._bookedFlight.arrivalICAO])
+            
+            self._takeoffPage.allowForward()
         elif stage==const.STAGE_END:
             self._landingPage.flightEnded()
@@ -2217 +2240 @@
         """Connect to the simulator."""
         self.gui.connectSimulator(self._bookedFlight.aircraftType)
+
+    def _arrivalMETARCallback(self, returned, result):
+        """Called when the METAR of the arrival airport is retrieved."""
+        gobject.idle_add(self._handleArrivalMETAR, returned, result)
+    
+    def _handleArrivalMETAR(self, returned, result):
+        """Called when the METAR of the arrival airport is retrieved."""
+        icao = self._bookedFlight.arrivalICAO
+        if returned and icao in result.metars:
+            metar = result.metars[icao]
+            if metar!="":
+                self._arrivalBriefingPage.setMETAR(metar)
     
 #-----------------------------------------------------------------------------

src/mlx/web.py

@@ -14 +14 @@
 import datetime
 import codecs
+import traceback
 import xml.sax
 
@@ -301 +302 @@
             returned = True
         except Exception, e:
+            traceback.print_exc()
             result = e
             returned = False
@@ -308 +310 @@
         except Exception, e:
             print >> sys.stderr, "web.Handler.Request.perform: callback throwed an exception: " + str(e)
+            traceback.print_exc()
 
 #------------------------------------------------------------------------------

test/test1.txt

@@ -1 @@
-set zfw=46121 hour=7 min=50
+set zfw=45757 hour=7 min=50
 set latitude=47.44 longitude=19.26
 set parking=no