Changeset 35:9451e75788ea in xplra for src

Timestamp:

02/09/13 13:00:42 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 3 'hg:/home/ivaradi/xplane/hg/xplra' '/'>, 'public')

Message:

Implemented support for multi-dataref setting

File:

• src/client/python/xplra.py (modified) (4 diffs)

src/client/python/xplra.py

@@ -131 +131 @@
         """Create a new multi-dataref getter for this X-Plane object."""
         return MultiGetter(self)
+
+    def createMultiSetter(self):
+        """Create a new multi-dataref setter for this X-Plane object."""
+        return MultiSetter(self)
 
     def getInt(self, name):
@@ -251 +255 @@
             if arr is not None and length>0:
                 arr.fromstring(self._stream.read(length*elementSize))
-            return arr
+            return None if arr is None else arr.tolist()
 
     def _setSingle(self, name, type, value, offset = None):
@@ -524 +528 @@
             self.finalize()
         type = self._dataRefs[id][1]
+        length = self._dataRefs[id][2]
         if type==TYPE_INT:
             self._values[id] = int(value)
-        elif type==TYPE_FLOAT:
+        elif type==TYPE_FLOAT or type==TYPE_DOUBLE:
             self._values[id] = float(value)
-        elif type==TYPE_DOUBLE:
-            self._values[id] = double(value)
         elif type==TYPE_FLOAT_ARRAY:
+            if len(value)!=length:
+                raise ValueError("xplra.MultiBuffer: expected a list of length %d" % (length,))
             self._values[id] = [float(x) for x in value]
         elif type==TYPE_INT_ARRAY:
+            if len(value)!=length:
+                raise ValueError("xplra.MultiBuffer: expected a list of length %d" % (length,))
             self._values[id] = [int(x) for x in value]
         elif type==TYPE_BYTE_ARRAY:
-            if instanceof(value, str):
-                self._values[id] = [ord(x) for x in value]
+            if isinstance(value, str):
+                lst = [ord(x) for x in value[:length]]
+                if len(lst)<length:
+                    lst += [0] * (length-len(lst))
+                self._values[id] = lst
             else:
+                if len(value)!=length:
+                    raise ValueError("xplra.MultiBuffer: expected a list of length %d" % (length,))
                 self._values[id] = [int(x) for x in value]
 
@@ -578 +590 @@
 
 #-------------------------------------------------------------------------------
+
+class MultiSetter(MultiBuffer):
+    """Multi-dataref buffer for setting."""
+    def __init__(self, xplane):
+        """Construct the getter."""
+        super(MultiSetter, self).__init__(xplane,
+                                          COMMAND_REGISTER_SET_MULTI,
+                                          COMMAND_UNREGISTER_SET_MULTI)
+
+    def _executeRegistered(self):
+        """Execute the query if the buffer is registered."""
+        self._xplane._writeU8(COMMAND_EXECUTE_SET_MULTI)
+        self._xplane._writeU32(self._registeredID)
+        for i in range(0, len(self._dataRefs)):
+            self._xplane._writeValue(self._dataRefs[i][1], self._values[i])
+        self._xplane._flush()
+
+        self._xplane._checkResult()
+
+    def _executeUnregistered(self):
+        """Execute the query if the buffer is not registered."""
+        self._xplane._writeU8(COMMAND_SET_MULTI)
+
+        numDataRefs = len(self._dataRefs)
+        self._xplane._writeU32(numDataRefs)
+
+        for i in range(0, numDataRefs):
+            (name, type, length, offset) = self._dataRefs[i]
+            value = self._values[i]
+
+            self._xplane._writeString(name)
+            self._xplane._writeType(type)
+            if length is not None and offset is not None:
+                self._xplane._writeS32(len(value))
+                self._xplane._writeS32(offset)
+            self._xplane._writeValue(type, value)
+
+        self._xplane._flush()
+        self._xplane._checkResult()
+
+#-------------------------------------------------------------------------------