Changeset 647:aae3b8c57a1f

Timestamp:

05/15/08 23:34:55 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@714

Message:

C API for VLR operations

Files:

• include/liblas/capi/liblas.h (modified) (2 diffs)
• src/las_c_api.cpp (modified) (5 diffs)

include/liblas/capi/liblas.h

@@ -59 +59 @@
 typedef void *LASHeaderH;
 typedef void *LASGuidH;
+typedef void *LASVLRH;
 
 LAS_C_START
@@ -826 +827 @@
 LAS_DLL char* LASGuid_AsString(LASGuidH hId);
 
+/** Returns the VLR record for the given index.  Use LASHeader_GetRecordsCount to 
+ *  determine the number of VLR records available on the header.
+ *  @param hHeader the LASHeaderH instance
+ *  @param i the index starting from 0 of the VLR to fetch
+ *  @return LASVLRH instance that models the Variable Length Record
+*/
+LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, uint32_t i);
+
+/** Deletes a VLR record from the header for the given index.
+ *  @param hHeader the LASHeaderH instance
+ *  @param index the index starting from 0 of the VLR to delete
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASHeader_DeleteVLR(LASHeaderH hHeader, uint32_t index);
+
+/** Adds a VLR record to the header. 
+ *  @param hHeader the LASHeaderH instance
+ *  @param hVLR the VLR to add to the header
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR);
+
+/** Creates a new VLR record
+ *  @return a new VLR record
+*/
+LAS_DLL LASVLRH LASVLR_Create(void);
+
+/** Destroys a VLR record and removes it from the heap
+*/
+LAS_DLL void LASVLR_Destroy(LASVLRH hVLR);
+
+/** Returns the User Id for the VLR 
+ *  @param hVLR the LASVLRH instance
+ *  @return the User Id for the VLR
+*/
+LAS_DLL char* LASVLR_GetUserId(const LASVLRH hVLR);
+
+/** Sets the User Id for the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @param value the value to set for the User Id.  It will be clipped to fit 
+ *  within 16 characters
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASVLR_SetUserId(LASVLRH hVLR, const char* value);
+
+/** Gets the description for the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @return the description for the VLR
+*/ 
+LAS_DLL char* LASVLR_GetDescription(const LASVLRH hVLR);
+
+/** Sets the description for the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @param value the value to set for the description.  It will be clipped to fit 
+ *  within 32 characters
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASVLR_SetDescription(LASVLRH hVLR, const char* value);
+
+/** Returns the record length of the data stored in the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @return the record length of the data stored in the VLR
+*/
+LAS_DLL uint16_t LASVLR_GetRecordLength(const LASVLRH hVLR);
+
+/** Sets the record length of the data stored in the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @param value the length to set for the VLR data length
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASVLR_SetRecordLength(LASVLRH hVLR, uint16_t value);
+
+/** Gets the record id for the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @return the record id for the VLR
+*/
+LAS_DLL uint16_t LASVLR_GetRecordId(const LASVLRH hVLR);
+
+/** Sets the record id for the VLR
+ *  @param hVLR the LASVLRH instance
+ *  @param value the record id to set
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASVLR_SetRecordId(LASVLRH hVLR, uint16_t value);
+
+/** Gets the reserved value of the VLR.  This should be 0 and should aways be 0.
+ *  @param hVLR the LASVLRH instance
+ *  @return the reserved value of the VLR.
+*/
+LAS_DLL uint16_t LASVLR_GetReserved(const LASVLRH hVLR);
+
+/** Sets the reserved value of the VLR.  This should be 0 and you should not 
+ *  have to ever monkey with this value according to the spec.
+ *  @param hVLR the LASVLRH instance
+ *  @param value the value to set for the reserved value
+ *  @return LASErrorEnum
+*/
+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
+ *  @return LASErrorEnum
+*/
+LAS_DLL LASError LASVLR_GetData(const LASVLRH hVLR, uint8_t* data, int* length);
 
 LAS_C_END

src/las_c_api.cpp

@@ -47 +47 @@
 #include <liblas/lasfile.hpp>
 #include <liblas/exception.hpp>
+#include <liblas/lasrecordheader.hpp>
 #include <liblas/guid.hpp>
 #include <liblas/capi/las_config.h>
@@ -55 +56 @@
 typedef void *LASHeaderH;
 typedef void *LASGuidH;
+typedef void *LASVLRH;
 
 #include <string>
@@ -61 +63 @@
 #include <cstdio>
 #include <exception>
+#include <vector>
 
 #include <iostream>
@@ -1092 +1095 @@
 }
 
+LAS_DLL LASGuidH LASHeader_GetGUID(const LASHeaderH hHeader) {
+    VALIDATE_POINTER1(hHeader, "LASHeader_GetGUID", 0);
+    
+    liblas::guid id = ((LASHeader*) hHeader)->GetProjectId();
+    return (LASGuidH) new liblas::guid(id);
+}
+
+LAS_DLL LASVLRH LASHeader_GetVLR(const LASHeaderH hHeader, liblas::uint32_t i) {
+    VALIDATE_POINTER1(hHeader, "LASHeader_GetVLR", 0);
+    
+    LASVLR vlr = ((LASHeader*) hHeader)->GetVLR(i);
+    return (LASVLRH) new LASVLR(vlr);
+}
+
+LAS_DLL LASErrorEnum LASHeader_DeleteVLR(LASHeaderH hHeader, liblas::uint32_t index) {
+    
+    VALIDATE_POINTER1(hHeader, "LASHeader_DeleteVLR", LE_Failure);
+
+    try {
+        ((LASHeader*) hHeader)->DeleteVLR(index);
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASHeader_DeleteVLR");
+        return LE_Failure;
+    }
+
+
+    return LE_None;
+}
+
+LAS_DLL LASErrorEnum LASHeader_AddVLR(LASHeaderH hHeader, const LASVLRH hVLR) {
+    
+    VALIDATE_POINTER1(hHeader, "LASHeader_AddVLR", LE_Failure);
+    VALIDATE_POINTER1(hVLR, "LASHeader_AddVLR", LE_Failure);
+
+    try {
+        ((LASHeader*) hHeader)->AddVLR(*((LASVLR*)hVLR));
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASHeader_AddVLR");
+        return LE_Failure;
+    }
+
+
+    return LE_None;
+}
 LAS_DLL LASWriterH LASWriter_Create(const char* filename, const LASHeaderH hHeader, int mode) {
     VALIDATE_POINTER1(hHeader, "LASWriter_Create", NULL); 
@@ -1262 +1311 @@
 }
 
-LAS_DLL LASGuidH LASHeader_GetGUID(const LASHeaderH hHeader) {
-    VALIDATE_POINTER1(hHeader, "LASHeader_GetGUID", 0);
-    
-    liblas::guid id = ((LASHeader*) hHeader)->GetProjectId();
-    return (LASGuidH) new liblas::guid(id);
-}
+
+
+LAS_DLL LASVLRH LASVLR_Create(void) {
+    return (LASVLRH) new LASVLR();
+}
+
+LAS_DLL void LASVLR_Destroy(LASVLRH hVLR){
+    VALIDATE_POINTER0(hVLR, "LASVLR_Destroy");
+    delete (LASVLR*)hVLR;
+    hVLR = NULL;
+    
+}
+
+LAS_DLL char* LASVLR_GetUserId(const LASVLRH hVLR) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_GetUserId", 0);
+    LASVLR* vlr = (LASVLR*)hVLR;
+    return strdup(vlr->GetUserId(true).c_str());
+}
+
+LAS_DLL LASErrorEnum LASVLR_SetUserId(LASVLRH hVLR, const char* value) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_SetUserId", LE_Failure); 
+
+    try {
+            ((LASVLR*) hVLR)->SetUserId(value);
+    } catch (std::exception const& e)
+    {
+        LASError_PushError(LE_Failure, e.what(), "LASVLR_SetUserId");
+        return LE_Failure;
+    }
+
+    return LE_None;
+}
+
+LAS_DLL char* LASVLR_GetDescription(const LASVLRH hVLR) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_GetDescription", 0);
+    LASVLR* vlr = (LASVLR*)hVLR;
+    return strdup(vlr->GetDescription(true).c_str());
+}
+
+LAS_DLL LASErrorEnum LASVLR_SetDescription(LASVLRH hVLR, const char* value) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_SetDescription", LE_Failure); 
+
+    try {
+            ((LASVLR*) hVLR)->SetDescription(value);
+    } catch (std::exception const& e)
+    {
+        LASError_PushError(LE_Failure, e.what(), "LASVLR_SetDescription");
+        return LE_Failure;
+    }
+
+    return LE_None;
+}
+
+LAS_DLL liblas::uint16_t LASVLR_GetRecordLength(const LASVLRH hVLR) {
+    
+    VALIDATE_POINTER1(hVLR, "LASVLR_GetRecordLength", 0);
+    
+    liblas::uint16_t value = ((LASVLR*) hVLR)->GetRecordLength();
+    return value;
+}
+LAS_DLL LASErrorEnum LASVLR_SetRecordLength(LASVLRH hVLR, liblas::uint16_t value) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_SetRecordLength", LE_Failure);
+    ((LASVLR*) hVLR)->SetRecordLength(value);    
+    return LE_None;
+}
+
+LAS_DLL liblas::uint16_t LASVLR_GetRecordId(const LASVLRH hVLR) {
+    
+    VALIDATE_POINTER1(hVLR, "LASVLR_GetRecordId", 0);
+    
+    liblas::uint16_t value = ((LASVLR*) hVLR)->GetRecordId();
+    return value;
+}
+LAS_DLL LASErrorEnum LASVLR_SetRecordId(LASVLRH hVLR, liblas::uint16_t value) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_SetRecordId", LE_Failure);
+    ((LASVLR*) hVLR)->SetRecordId(value);    
+    return LE_None;
+}
+
+
+LAS_DLL LASErrorEnum LASVLR_SetReserved(LASVLRH hVLR, liblas::uint16_t value) {
+    VALIDATE_POINTER1(hVLR, "LASVLR_SetReserved", LE_Failure);
+    ((LASVLR*) hVLR)->SetReserved(value);    
+    return LE_None;
+}
+
+LAS_DLL liblas::uint16_t LASVLR_GetReserved(const LASVLRH hVLR) {
+    
+    VALIDATE_POINTER1(hVLR, "LASVLR_GetReserved", 0);
+    
+    liblas::uint16_t value = ((LASVLR*) hVLR)->GetReserved();
+    return value;
+}
+
+LAS_DLL LASErrorEnum LASVLR_GetData(const LASVLRH hVLR, liblas::uint8_t* data, int* length) {
+    
+    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();
+        *length = d->size();
+    }
+    catch (std::exception const& e) {
+        LASError_PushError(LE_Failure, e.what(), "LASVLR_GetData");
+        return LE_Failure;
+    }
+
+
+    return LE_None;
+}
+
 
 LAS_DLL LASGuidH LASGuid_Create() {