Changeset 315:baa139ef7784 for src

Timestamp:

09/30/12 07:16:34 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The in-flight stage messages can be controlled separately

Location:

src/mlx

Files:

• const.py (modified) (3 diffs)
• fs.py (modified) (2 diffs)
• fsuipc.py (modified) (1 diff)
• logger.py (modified) (1 diff)

src/mlx/const.py

@@ -276 +276 @@
 MESSAGETYPE_INFORMATION = 2
 
+## Message type: in-flight information
+MESSAGETYPE_INFLIGHT = 3
+
 ## Message type: fault messages
-MESSAGETYPE_FAULT = 3
+MESSAGETYPE_FAULT = 4
 
 ## Message type: NO-GO fault messages
-MESSAGETYPE_NOGO = 4
+MESSAGETYPE_NOGO = 5
 
 ## Message type: gate system messages
-MESSAGETYPE_GATE_SYSTEM = 5
+MESSAGETYPE_GATE_SYSTEM = 6
 
 ## Message type: environment messages
 # FIXME: flight plan closed (5 sec)
-MESSAGETYPE_ENVIRONMENT = 6
+MESSAGETYPE_ENVIRONMENT = 7
 
 ## Message type: help messages
-MESSAGETYPE_HELP = 7
+MESSAGETYPE_HELP = 8
 
 ## Message type: visibility messages
-MESSAGETYPE_VISIBILITY = 8
+MESSAGETYPE_VISIBILITY = 9
 
 #-------------------------------------------------------------------------------
@@ -299 +302 @@
 messageTypes = [ MESSAGETYPE_LOGGER_ERROR,
                  MESSAGETYPE_INFORMATION,
+                 MESSAGETYPE_INFLIGHT,
                  MESSAGETYPE_FAULT,
                  MESSAGETYPE_NOGO,
@@ -310 +314 @@
 _messageTypeStrings = { MESSAGETYPE_LOGGER_ERROR : "loggerError",
                         MESSAGETYPE_INFORMATION : "information",
+                        MESSAGETYPE_INFLIGHT : "inflight",
                         MESSAGETYPE_FAULT : "fault",
                         MESSAGETYPE_NOGO : "nogo",

src/mlx/fs.py

@@ -120 +120 @@
 
     def _sendMessage(self, messageType, text, duration, disconnect):
-        """Send the message and setup the next message time."""
+        """Send the message and setup the next message time."""        
         messageLevel = self._config.getMessageTypeLevel(messageType)
         if messageLevel==const.MESSAGELEVEL_SOUND or \
@@ -135 +135 @@
                 self._simulator.sendMessage("[MLX] " + text,
                                             duration = duration)
-        elif disconnecte:
+        elif disconnect:
             self._simulator.disconnect()
         self._nextMessageTime = time.time() + duration

src/mlx/fsuipc.py

@@ -676 +676 @@
 
         duration is the number of seconds to keep the message displayed."""
-        
+
+        print "fsuipc.Simulator.sendMessage:", message
+
         if self._scroll:
             if duration==0: duration = -1

src/mlx/logger.py

@@ -91 +91 @@
             self.untimedMessage("Rating: %.0f" % (self.getRating(),))
         else:
-            sendMessage(const.MESSAGETYPE_INFORMATION, "Flight stage: " + s, 3)
+            messageType = \
+               const.MESSAGETYPE_INFLIGHT  if stage in \
+               [const.STAGE_CLIMB, const.STAGE_CRUISE, \
+                const.STAGE_DESCENT, const.STAGE_LANDING] \
+                else const.MESSAGETYPE_INFORMATION
+            sendMessage(messageType, "Flight stage: " + s, 3)
         
     def fault(self, faultID, timestamp, what, score):