Changeset 88:3fdb6ad947ad for src

Timestamp:

04/16/12 17:53:47 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The logger disconnects from the simulator if the flight has ended and the Forward button on the landing page can be activated only then.

Location:

src/mlx

Files:

• gui/flight.py (modified) (5 diffs)
• gui/gui.py (modified) (3 diffs)
• pyuipc_sim.py (modified) (4 diffs)
• web.py (modified) (5 diffs)

src/mlx/gui/flight.py

@@ -1373 +1373 @@
         super(LandingPage, self).__init__(wizard, "Landing", help)
 
+        self._flightEnded = False
+
         alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
                                   xscale = 0.0, yscale = 0.0)
@@ -1475 +1477 @@
     def activate(self):
         """Called when the page is activated."""
+        self._flightEnded = False
+        
         self._starButton.set_sensitive(True)
         self._starButton.set_active(False)
@@ -1492 +1496 @@
         self._vref.set_sensitive(True)
 
+        self._updateForwardButton()
+
+    def flightEnded(self):
+        """Called when the flight has ended."""
+        self._flightEnded = True
         self._updateForwardButton()
 
@@ -1526 +1535 @@
     def _updateForwardButton(self, widget = None):
         """Update the sensitivity of the forward button."""
-        sensitive = (self._starButton.get_active() or \
+        sensitive = self._flightEnded and \
+                    (self._starButton.get_active() or \
                      self._transitionButton.get_active()) and \
                     (self._star.get_text()!="" or
@@ -1680 +1690 @@
         if stage==const.STAGE_TAKEOFF:
             self._takeoffPage.freezeValues()
+        elif stage==const.STAGE_END:
+            self._landingPage.flightEnded()
 
     def _initialize(self):

src/mlx/gui/gui.py

@@ -150 +150 @@
         gtk.main()
 
-        if self._flight is not None:
-            simulator = self._flight.simulator
-            if self._monitoring:
-                simulator.stopMonitoring()
-                self._monitoring = False
-            simulator.disconnect()                        
+        if self._flight is not None and self._connected:
+            self.stopMonitoring()
+            self._flight.simulator.disconnect()                        
 
     def connected(self, fsType, descriptor):
@@ -265 +262 @@
         self._statusIcon.setStage(stage)
         self._wizard.setStage(stage)
+        if stage==const.STAGE_END:
+            self.stopMonitoring()
+            self.simulator.disconnect()
+            self._connecting = False
+            self._connected = False
+            self._statusbar.updateConnection(self._connecting, self._connected)
 
     def setRating(self, rating):
@@ -412 +415 @@
     def startMonitoring(self):
         """Start monitoring."""
-        self._simulator.startMonitoring()
-        self._monitoring = True
+        if not self._monitoring:
+            self.simulator.startMonitoring()
+            self._monitoring = True
 
     def stopMonitoring(self):
         """Stop monitoring."""
-        self._simulator.stoptMonitoring()
-        self._monitoring = False
+        if self._monitoring:
+            self.simulator.stopMonitoring()
+            self._monitoring = False
 
     def _buildLogFrame(self):

src/mlx/pyuipc_sim.py

@@ -351 +351 @@
             index = 0
             while index<numNotchesM1 and \
-                  self.flapsControl<self.flapsNotches[index]:
+                  self.flapsControl>self.flapsNotches[index]:
                 index += 1
-                
+
             if index==numNotchesM1:
                 return 16383
             else:
-                return int((self.flapsControl-self.flapsNotches[index]) * \
-                           flapsIncrement / \
+                return int(index * flapsIncrement +
+                           (self.flapsControl-self.flapsNotches[index]) *
+                           flapsIncrement /
                            (self.flapsNotches[index+1] - self.flapsNotches[index]))
         elif offset==0x0be0 or offset==0x0be4:    # Flaps left and  right
@@ -529 +530 @@
             numNotchesM1 = len(self.flapsNotches) - 1
             flapsIncrement = 16383.0 / numNotchesM1
-            index = value / flapsIncrement
+            index = int(value / flapsIncrement)
             if index>=numNotchesM1:
                 self.flapsControl = self.flapsNotches[-1]
             else:
                 self.flapsControl = self.flapsNotches[index]
-                self.flapsControl += value * \
+                self.flapsControl += (value - index * flapsIncrement) * \
                     (self.flapsNotches[index+1] - self.flapsNotches[index]) / \
                     flapsIncrement
@@ -583 +584 @@
         elif offset==0x3bfc:       # ZFW
             self.zfw = value * const.LBSTOKG / 256.0
-            print "ZFW:", self.zfw
         elif offset==0x3c00:       # Path of the current AIR file
             self.airPath = value
@@ -640 +640 @@
         temperature += 273.15  # Celsius -> Kelvin
         airDensity = pressure / (temperature * 287.05)
-        print "pressure:", pressure, "temperature:", temperature, "airDensity:", airDensity
+        #print "pressure:", pressure, "temperature:", temperature, "airDensity:", airDensity
         return self.ias * math.sqrt(1.225 / airDensity)
 

src/mlx/web.py

@@ -337 +337 @@
         result = Result()
 
-        f = urllib2.urlopen(url)
+        f = urllib2.urlopen(url, timeout = 10.0)
 
         status = readline(f)
@@ -375 +375 @@
         url = "http://www.virtualairlines.hu/onlinegates_get.php"
 
-        f = urllib2.urlopen(url)
+        f = urllib2.urlopen(url, timeout = 10.0)
         result = Result()
         result.fleet = Fleet(f)
@@ -407 +407 @@
                                  ("kapu", gateNumber)])
         
-        f = urllib2.urlopen(url, data)
+        f = urllib2.urlopen(url, data, timeout = 10.0)
         line = readline(f)
         
@@ -434 +434 @@
         url = "http://notams.euroutepro.com/notams.xml"
 
-        f = urllib2.urlopen(url)
+        f = urllib2.urlopen(url, timeout = 10.0)
         try:
             xmlParser.parse(f)
@@ -466 +466 @@
                                   ("mostRecentForEachStation", "constraint")])
         url += data
-        f = urllib2.urlopen(url)
+        f = urllib2.urlopen(url, timeout = 10.0)
         try:
             result = Result()