Changeset 35:9451e75788ea in xplra

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented support for multi-dataref setting

Files:

• src/client/python/xplra.py (modified) (4 diffs)
• test/basictest.py (modified) (5 diffs)
• test/multigettest.py (modified) (1 diff)
• test/multisettest.py (added)

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()
+
+#-------------------------------------------------------------------------------

test/basictest.py

@@ -46 +46 @@
         print "Querying the aircraft's description..."
         result = xplane.getByteArray("sim/aircraft/view/acf_descrip")
-        print "The description:", result.tolist()
+        print "The description:", result
         print
 
@@ -57 +57 @@
         print "Querying the aircraft's engine types..."
         result3 = xplane.getIntArray("sim/aircraft/prop/acf_en_type")
-        print "Got:", result3.tolist()
+        print "Got:", result3
         print
 
         print "Querying the aircraft's propeller directions..."
         result5 = xplane.getFloatArray("sim/aircraft/prop/acf_prop_dir")
-        print  "Got:", result5.tolist()
+        print  "Got:", result5
         print
 
@@ -87 +87 @@
         print
 
-        numBlades = xplane.getFloatArray("sim/aircraft/prop/acf_num_blades").tolist()
+        numBlades = xplane.getFloatArray("sim/aircraft/prop/acf_num_blades")
         print "Setting the number of blades"
         print "    from:", numBlades
@@ -94 +94 @@
         xplane.setFloatArray("sim/aircraft/prop/acf_num_blades",  numBlades)
 
-        numBlades = xplane.getFloatArray("sim/aircraft/prop/acf_num_blades").tolist()
+        numBlades = xplane.getFloatArray("sim/aircraft/prop/acf_num_blades")
         print "The result:", numBlades
         print
 
-        batteryArrayOn = xplane.getIntArray("sim/cockpit/electrical/battery_array_on").tolist()
+        batteryArrayOn = xplane.getIntArray("sim/cockpit/electrical/battery_array_on")
         print "Setting the batteries"
         print "    from:", batteryArrayOn
@@ -104 +104 @@
         print "    to:", batteryArrayOn
         xplane.setIntArray("sim/cockpit/electrical/battery_array_on", batteryArrayOn)
-        batteryArrayOn = xplane.getIntArray("sim/cockpit/electrical/battery_array_on").tolist()
+        batteryArrayOn = xplane.getIntArray("sim/cockpit/electrical/battery_array_on")
         print "The result:", batteryArrayOn
         print

test/multigettest.py

@@ -96 +96 @@
             print "altimeter: %f, qnh: %f" % \
                 (getter[altimeterID], getter[qnhID]);
-            print "NAV types:", getter[navTypesID].tolist()
-            print "bus voltages:", getter[busVoltsID].tolist()
+            print "NAV types:", getter[navTypesID]
+            print "bus voltages:", getter[busVoltsID]
             print
             time.sleep(1.0)