Changeset 421:374788cb36e5

Timestamp:

02/14/13 18:41:57 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

Phase:

public

Message:

Added support for implementing the message display in the simulator

File:

• src/mlx/xplane.py (modified) (3 diffs)

src/mlx/xplane.py

@@ -218 +218 @@
             return cmp(self._nextFire, other._nextFire)
 
+    class ShowMessageRequest(object):
+        """Request to show a message in the simulator window."""
+        def __init__(self, handler, message, duration, callback, extra):
+            """Construct the request."""
+            self._handler = handler
+            self._message = message
+            self._duration = duration
+            self._callback = callback
+            self._extra = extra
+
+        def process(self, time):
+            """Process the request.
+
+            Return True if the request has succeeded. An exception may also be
+            thrown if there is some lower-level communication problem."""
+            self._handler._xplane.showMessage(self._message, self._duration)
+            Handler._callSafe(lambda: self._callback(True, self._extra))
+            return True
+
+        def fail(self):
+            """Handle the failure of this request."""
+            Handler._callSafe(lambda: self._callback(False, self._extra))
+
     def __init__(self, connectionListener,
                  connectAttempts = -1, connectInterval = 0.2):
@@ -302 +325 @@
                     return True
         return False
+
+    def requestShowMessage(self, message, duration, callback, extra = None):
+        """Request showing a message in the simulator."""
+        with self._requestCondition:
+            self._requests.append(Handler.ShowMessageRequest(self,
+                                                             message, duration,
+                                                             callback, extra))
+            self._requestCondition.notify()
 
     def connect(self):
@@ -673 +704 @@
 
         duration is the number of seconds to keep the message displayed."""
-
-        # TODO: implement this for X-Plane
         print "xplra.Simulator.sendMessage:", message
-        pass
-        # if self._scroll:
-        #     if duration==0: duration = -1
-        #     elif duration == 1: duration = -2
-        #     else: duration = -duration
-
-        # data = [(0x3380, -1 - len(message), message),
-        #         (0x32fa, 'h', duration)]
-
-        # #if _disconnect:
-        # #    print "xplra.Simulator.sendMessage(disconnect)", message
-
-        # self._handler.requestWrite(data, self._handleMessageSent,
-        #                            extra = _disconnect)
+        self._handler.requestShowMessage(message, duration,
+                                         self._handleMessageSent,
+                                         extra = _disconnect)
 
     def getFuel(self, callback):