Changeset 888

Timestamp:

09/27/08 19:12:14 (3 months ago)

Author:

hobu

Message:

VLR data setting for C/Python APIs #78

Location:

trunk

Files:

• include/liblas/capi/liblas.h (modified) (1 diff)
• python/liblas/core.py (modified) (1 diff)
• python/liblas/vlr.py (modified) (1 diff)
• python/tests/VLR.txt (modified) (3 diffs)
• src/las_c_api.cpp (modified) (2 diffs)

trunk/include/liblas/capi/liblas.h

@@ -970 +970 @@
 LAS_DLL LASError LASVLR_SetReserved(LASVLRH hVLR, uint16_t value);
 
-/** Gets the data stream for the VLR as an array of bytes
- *  @param hVLR the LASVLRH instance
- *  @param data a pointer to where place the array
- *  @param length a pointer to where to place the length of the array
+/** Gets the data stream for the VLR as an array of bytes.  The length of this 
+ *  array should be the same as LASVLR_GetRecordLength.  You must allocate it on 
+ *  the heap and you are responsible for its destruction.
+ *  @param hVLR the LASVLRH instance
+ *  @param data a pointer to your array where you want the data copied
  *  @return LASErrorEnum
 */
-LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t** data, int* length);
+LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t* data);
+
+/** Sets the data stream for the VLR as an array of bytes.  The length of this 
+ *  array should be the same as LASVLR_GetRecordLength.  The data are copied into 
+ *  the VLR structure.
+ *  @param hVLR the LASVLRH instance
+ *  @param data a pointer to your array.  It must be LASVLR_GetRecordLength in size
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASVLR_SetData(const LASVLRH hVLR, uint8_t* data, uint16_t length);
 
 LAS_C_END

trunk/python/liblas/core.py

@@ -516 +516 @@
 las.LASVLR_SetReserved.restype = ctypes.c_int
 
+las.LASVLR_GetData.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_ubyte)]
+las.LASVLR_GetData.errcheck = check_value
+las.LASVLR_GetData.restype = ctypes.c_int
+
+las.LASVLR_SetData.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_ubyte)]
+las.LASVLR_SetData.errcheck = check_value
+las.LASVLR_SetData.restype = ctypes.c_int

trunk/python/liblas/vlr.py

@@ -87 +87 @@
     
     def get_data(self):
-        b = ctypes.pointer(ctypes.c_ubyte())
-        i = ctypes.pointer(ctypes.c_int())
-        core.las.LASVLR_GetData(self.handle, ctypes.byref(b), i)
-        print 'i length: %s' % i.contents.value
-        print 'bvalue : %s' % b.contents
+        length = self.recordlength
+        data = (ctypes.c_ubyte * length)()
+        core.las.LASVLR_GetData(self.handle, data)
+        return data
 
-        t = (ctypes.c_byte*i.contents.value)()
-        print 'b[0:71]: ', b[0:i.contents.value]
-        parray = ctypes.cast(b, ctypes.c_void_p(i.contents.value))
-        print 'parray value' , parray[0:i.contents.value]
+    def set_data(self, data):
+        pdata = ctypes.cast(data, ctypes.POINTER(ctypes.c_ubyte))
+        core.las.LASVLR_SetData(self.handle, pdata, self.recordlength)
+    data = property(get_data, set_data)
 
-        o = ''.join([chr(b[i]) for i in range(i.contents.value)])
-        print 'o: ', o
-        print 'type(parray): ', type(parray)
-#        buf = ctypes.create_string_buffer(i.value)
-#        print type(buf)
-        return ctypes.cast(b, ctypes.c_char_p).value
-#        return ctypes.create_string_buffer(parray, i.contents.value)[:]
-    data = property(get_data)
-

trunk/python/tests/VLR.txt

@@ -20 +20 @@
   'libLAS'
   
+  >>> v.recordlength = 256
+  >>> v.recordlength 
+  256
+  
+  >>> import ctypes
+  >>> data = (ctypes.c_ubyte * 256)()
+  >>> data[10]
+  0
+  
+  >>> for i in range(256):
+  ...     data[i] = 2+i
+  
+  >>> data[10]
+  12
+  >>> v.data = data
+  
+# Ensure we can round trip the data
+  >>> [data[i] for i in range(10)]
+  [2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+  >>> [v.data[i] for i in range(10)]
+  [2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
+
+# Ensure poking one array doesn't affect the other
+  >>> data[1] = 32
+  >>> v.data = data
+  >>> data[1] = 3
+  >>> v.data[1]
+  32
+  >>> data[1]
+  3
+  
+  >>> [v.data[i] for i in range(10)]
+  [2, 32, 4, 5, 6, 7, 8, 9, 10, 11]
+  
+    
   >>> from liblas import file
   >>> f = file.File('../test/data/srs.las')
@@ -33 +68 @@
   'LASF_Projection'
   
-#  >>> data = v.data
-#  >>> len(data)
+  >>> data = v.data
+  >>> len(data)
+  72
+  >>> data[6]
+  8
 
   # Ensure the offset is updated when a VLR is deleted
@@ -42 +80 @@
   >>> h.data_offset
   633L
+  
+  

trunk/src/las_c_api.cpp

@@ -1469 +1469 @@
 }
 
-LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t** data, int* length) {
+LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t* data) {
     
     VALIDATE_POINTER1(hVLR, "LASVLR_GetData", LE_Failure);
 
     try {
-        std::vector<liblas::uint8_t> *d = new std::vector<liblas::uint8_t>(((LASVLR*) hVLR)->GetData());
-        *data = &(d->front());
-        //data = &(d[0])
-        *length = static_cast<int>(d->size());
-        printf("GetData length %d\n", *length);
+        LASVLR* vlr = ((LASVLR*) hVLR);
+        std::vector<liblas::uint8_t> d = vlr->GetData();
+        liblas::uint16_t length = vlr->GetRecordLength();
+        for (liblas::uint16_t i=0; i < length; i++) {
+            data[i] = d[i];
+        }
     }
     catch (std::exception const& e) {
@@ -1489 +1490 @@
 }
 
+LAS_DLL LASErrorEnum LASVLR_SetData(const LASVLRH hVLR, liblas::uint8_t* data, liblas::uint16_t length) {
+    
+    VALIDATE_POINTER1(hVLR, "LASVLR_SetData", LE_Failure);
+
+    try {
+        LASVLR* vlr = ((LASVLR*) hVLR);
+        std::vector<liblas::uint8_t> d;
+        d.resize(length);
+        for (liblas::uint16_t i=0; i < length; i++) {
+            d[i] = data[i];
+        }
+        vlr->SetData(d);
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASVLR_GetData");
+        return LE_Failure;
+    }
+
+
+    return LE_None;
+}
 
 LAS_DLL LASGuidH LASGuid_Create() {