Changeset 875

Timestamp:

09/20/08 16:28:41 (4 months ago)

Author:

hobu

Message:

Add missing methods, including a SetReserved? method for LASHeader, to C API #67

Location:

trunk

Files:

• include/liblas/capi/liblas.h (modified) (4 diffs)
• include/liblas/lasheader.hpp (modified) (1 diff)
• src/las_c_api.cpp (modified) (6 diffs)
• src/lasheader.cpp (modified) (1 diff)

trunk/include/liblas/capi/liblas.h

@@ -112 +112 @@
  *  @return the version string for this library.
 */
-LAS_DLL const char* LAS_GetVersion();
+LAS_DLL char* LAS_GetVersion();
 
 /****************************************************************************/
@@ -465 +465 @@
 LAS_DLL uint16_t LASHeader_GetFileSourceId(const LASHeaderH hHeader);
 
+/** Sets the FileSource ID value for the header.  By default, this value is "0" if it 
+ *  is not explicitly set.  See the LAS specification for details on what this
+ *  value should logically be set to.
+ *  @param hHeader LASHeaderH instance
+ *  @param value the value to set as the FileSource ID value for the header
+ *  @return LASError enum
+*/
+LAS_DLL LASError LASHeader_SetFileSourceId(LASHeaderH hHeader, uint16_t value);
 
 /** Returns the project id for the header as a GUID string
@@ -470 +478 @@
 */
 LAS_DLL char *LASHeader_GetProjectId(const LASHeaderH hHeader);
+
+/** Sets the project id/GUID for the header
+ *  @param hHeader LASHeaderH instance
+ *  @param value character value GUID to set the header value to
+ *  @return LASError enum
+*/
+LAS_DLL LASError LASHeader_SetProjectId(LASHeaderH hHeader, const char* value);
 
 /** Sets the project id/GUID for the header
@@ -539 +554 @@
  *  @return the reserved value for the header.
 */
-LAS_DLL int16_t LASHeader_GetReserved(const LASHeaderH hHeader);
+LAS_DLL uint16_t LASHeader_GetReserved(const LASHeaderH hHeader);
+
+/** Sets the Reserved value for the header.  By default, this value is "0" if it 
+ *  is not explicitly set.  See the LAS specification for details on what this
+ *  value should logically be set to.
+ *  @param hHeader LASHeaderH instance
+ *  @param value the value to set as the reserved value for the header
+ *  @return LASError enum
+*/
+LAS_DLL LASError LASHeader_SetReserved(LASHeaderH hHeader, uint16_t value);
 
 /** Returns the file creation day of the year.  The values start from 1, being January 1st, 

trunk/include/liblas/lasheader.hpp

@@ -134 +134 @@
     uint16_t GetReserved() const;
 
+    /// Set reserved value for the header identifier.
+    /// \param v - should be set to a value between 1 and 65535.
+    /// \exception No throw
+    void SetReserved(uint16_t v);
+
     /// Get project identifier.
     /// \return Global Unique Identifier as an instance of liblas::guid class.

trunk/src/las_c_api.cpp

@@ -691 +691 @@
 }
 
+LAS_DLL LASErrorEnum LASHeader_SetFileSourceId(LASHeaderH hHeader, liblas::uint16_t value) {
+    VALIDATE_POINTER1(hHeader, "LASHeader_SetFileSourceId", LE_Failure);
+    ((LASHeader*) hHeader)->SetFileSourceId(value);    
+    return LE_None;
+}
+
+
 LAS_DLL liblas::uint16_t LASHeader_GetReserved(const LASHeaderH hHeader) {
     VALIDATE_POINTER1(hHeader, "LASHeader_GetReserved", 0);
@@ -698 +705 @@
 }
 
+LAS_DLL LASErrorEnum LASHeader_SetReserved(LASHeaderH hHeader, liblas::uint16_t value) {
+    VALIDATE_POINTER1(hHeader, "LASHeader_SetReserved", LE_Failure);
+    ((LASHeader*) hHeader)->SetReserved(value);    
+    return LE_None;
+}
+
 LAS_DLL char* LASHeader_GetProjectId(const LASHeaderH hHeader) {
     VALIDATE_POINTER1(hHeader, "LASHeader_GetProjectId", 0);
@@ -705 +718 @@
 }
 
-LAS_DLL LASErrorEnum LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId) {
-    VALIDATE_POINTER1(hHeader, "LASHeader_SetGUID", LE_Failure);
-
-    try {
-        liblas::guid* id = (liblas::guid*) hId;
-        
-        ((LASHeader*) hHeader)->SetProjectId(*id);    
+LAS_DLL LASErrorEnum LASHeader_SetProjectId(LASHeaderH hHeader, const char* value) {
+    VALIDATE_POINTER1(hHeader, "LASHeader_SetProjectId", LE_Failure);
+
+    try {
+        liblas::guid id;
+        id = liblas::guid::guid(value);
+        ((LASHeader*) hHeader)->SetProjectId(id);    
     } catch (std::exception const& e)
     {
@@ -720 +733 @@
     return LE_None;
 }
-
 
 LAS_DLL liblas::uint8_t LASHeader_GetVersionMajor(const LASHeaderH hHeader) {
@@ -1101 +1113 @@
     liblas::guid id = ((LASHeader*) hHeader)->GetProjectId();
     return (LASGuidH) new liblas::guid(id);
+}
+
+
+LAS_DLL LASErrorEnum LASHeader_SetGUID(LASHeaderH hHeader, LASGuidH hId) {
+    VALIDATE_POINTER1(hHeader, "LASHeader_SetGUID", LE_Failure);
+
+    try {
+        liblas::guid* id = (liblas::guid*) hId;
+        
+        ((LASHeader*) hHeader)->SetProjectId(*id);    
+    } catch (std::exception const& e)
+    {
+        LASError_PushError(LE_Failure, e.what(), "LASHeader_SetGUID");
+        return LE_Failure;
+    }
+
+    return LE_None;
 }
 
@@ -1327 +1356 @@
 }
 
-LAS_DLL const char * LAS_GetVersion() {
+LAS_DLL char * LAS_GetVersion() {
 
     /* XXX - mloskot: I'd suggest to define PACKAGE_VERSION as static object

trunk/src/lasheader.cpp

@@ -220 +220 @@
 }
 
+void LASHeader::SetReserved(uint16_t v)
+{
+    // TODO: Should we warn or throw about type overflow occuring when
+    //       user passes 65535 + 1 = 0
+    m_reserved = v;
+}
+
 liblas::guid LASHeader::GetProjectId() const
 {