Changeset 652:34ac9fdad9dc

Timestamp:

05/16/08 15:58:00 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

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

Message:

support for writing VLR records

Files:

• include/liblas/detail/writer.hpp (modified) (1 diff)
• include/liblas/detail/writer10.hpp (modified) (1 diff)
• include/liblas/detail/writer11.hpp (modified) (1 diff)
• src/detail/reader10.cpp (modified) (6 diffs)
• src/detail/reader11.cpp (modified) (1 diff)
• src/detail/writer10.cpp (modified) (4 diffs)
• src/detail/writer11.cpp (modified) (3 diffs)
• src/lasheader.cpp (modified) (3 diffs)

include/liblas/detail/writer.hpp

@@ -60 +60 @@
     virtual void WritePointRecord(PointRecord const& record) = 0;
     virtual void WritePointRecord(PointRecord const& record, double const& time) = 0;
+    
+    virtual void WriteVLR(LASHeader const& header) = 0;
 
     // TODO: fix constness

include/liblas/detail/writer10.hpp

@@ -64 +64 @@
     void WritePointRecord(PointRecord const& record, double const& time);
     
+    void WriteVLR(LASHeader const& header);
     // TODO: fix constness
     std::ostream& GetStream();

include/liblas/detail/writer11.hpp

@@ -63 +63 @@
     void WritePointRecord(PointRecord const& record);
     void WritePointRecord(PointRecord const& record, double const& time);
-
+    
+    void WriteVLR(LASHeader const& header);
     // TODO: fix constness
     std::ostream& GetStream();

src/detail/reader10.cpp

@@ -220 +220 @@
 
     m_ifs.seekg(header.GetHeaderSize(), std::ios::beg);
- 
+    
     for (uint32_t i = 0; i < header.GetRecordsCount(); ++i)
     {
@@ -245 +245 @@
     //       Testing reading of VLRecords with GeoKeys
     ReadGeoreference(header);
-
     return true;
 }
@@ -255 +254 @@
 #else
     // TODO: Under construction
-    VLRHeader vlrh = { 0 };
+
     std::string const uid("LASF_Projection");
     ST_TIFF *st = ST_Create();
 
-//    m_ifs.seekg(header.GetHeaderSize(), std::ios::beg);
-
-    printf("Records count: %d\n", (int)header.GetRecordsCount());
-
     for (uint16_t i = 0; i < header.GetRecordsCount(); ++i)
     {
         LASVLR record = header.GetVLR(i);
         std::vector<uint8_t> data = record.GetData();
-
-        printf("record.GetUserId(): '%s' record.GetRecordId: %d\n", record.GetUserId(true).c_str(), record.GetRecordId());
         if (uid == record.GetUserId(true).c_str() && 34735 == record.GetRecordId())
         {
-            printf("uid == record.GetUserId(true).c_str() && 34735 == record.GetRecordId()\n");
-
             int16_t count = data.size()/sizeof(int16_t);
-
-            printf("count for int16_t: %d\n", count);
-
             ST_SetKey( st, record.GetRecordId(), count, STT_SHORT, 
                        &(data[0]) );
@@ -283 +271 @@
         if (uid == record.GetUserId(true).c_str() && 34736 == record.GetRecordId())
         {
-            printf("uid == record.GetUserId(true).c_str() && 34736 == record.GetRecordId()\n");
-
             int count = data.size() / sizeof(double);
-            printf("count for int: %d\n", count);
-
             ST_SetKey( st, record.GetRecordId(), count, STT_DOUBLE, 
                        &(data[0]) );
@@ -294 +278 @@
         if (uid == record.GetUserId(true).c_str() && 34737 == record.GetRecordId())
         {
-            printf("uid == record.GetUserId(true).c_str() && 34737 == record.GetRecordId()\n");
-
             uint8_t count = data.size()/sizeof(uint8_t);
-            
-            printf("count for string: %d data.size(): %d", count, (int)data.size());
             ST_SetKey( st, record.GetRecordId(), count, STT_ASCII, 
                        &(data[0]) );
@@ -305 +285 @@
 
     GTIF *gtif = GTIFNewSimpleTags( st );
-
-    //GTIFPrint(gtif,0,0);
-
     GTIFDefn defn;
     if (GTIFGetDefn(gtif, &defn)) 

src/detail/reader11.cpp

@@ -297 +297 @@
 }
 
-bool ReaderImpl::ReadVLR(LASHeader& header)
-{    
-    // TODO: To be implemented
+bool ReaderImpl::ReadVLR(LASHeader& header) {
+    
     VLRHeader vlrh = { 0 };
-    LASVLR vlr;
-
-    // TODO: To be removed, when objects are used
-    UNREFERENCED_PARAMETER(header);
-    UNREFERENCED_PARAMETER(vlrh);
-    UNREFERENCED_PARAMETER(vlr);
+
+    m_ifs.seekg(header.GetHeaderSize(), std::ios::beg);
+    
+    for (uint32_t i = 0; i < header.GetRecordsCount(); ++i)
+    {
+        read_n(vlrh, m_ifs, sizeof(VLRHeader));
+
+        int16_t count = vlrh.recordLengthAfterHeader;
+         
+        std::vector<uint8_t> data;
+        data.resize( count );
+
+        read_n(data.front(), m_ifs, count );
+         
+        LASVLR vlr;
+        vlr.SetReserved(vlrh.reserved);
+        vlr.SetUserId(std::string(vlrh.userId));
+        vlr.SetDescription(std::string(vlrh.description));
+        vlr.SetRecordLength(vlrh.recordLengthAfterHeader);
+        vlr.SetRecordId(vlrh.recordId);
+        vlr.SetData(data);
+
+        header.AddVLR(vlr);
+    }
 
     return true;

src/detail/writer10.cpp

@@ -149 +149 @@
 
     // 14. Offset to data
-    // At this point, no variable length records are written, so 
-    // data offset is equal to (header size + data start signature size):
-    // 227 + 2 = 229
-    // TODO: This value must be updated after new variable length record is added.
-    uint32_t const dataSignatureSize = 2;
-    n4 = header.GetHeaderSize() + dataSignatureSize;
-    assert(229 <= n4);
+    n4 = header.GetDataOffset();
     detail::write_n(m_ofs, n4, sizeof(n4));
 
@@ -205 +199 @@
     detail::write_n(m_ofs, header.GetMaxZ(), sizeof(double));
     detail::write_n(m_ofs, header.GetMinZ(), sizeof(double));
- 
+
+    WriteVLR(header);
+
+    uint8_t const sgn1 = 0xCC;
+    uint8_t const sgn2 = 0xDD;
+    detail::write_n(m_ofs, sgn1, sizeof(uint8_t));
+    detail::write_n(m_ofs, sgn2, sizeof(uint8_t));
+
     // If we already have points, we're going to put it at the end of the file.  
     // If we don't have any points,  we're going to leave it where it is.
@@ -228 +229 @@
 void WriterImpl::WritePointRecord(detail::PointRecord const& record)
 {
-    // Write point data record format 0
-    if (0 == m_pointCount)
-    {
-        // Two bytes of point data start signature, required by LAS 1.0
-        uint8_t const sgn1 = 0xCC;
-        uint8_t const sgn2 = 0xDD;
-        detail::write_n(m_ofs, sgn1, sizeof(uint8_t));
-        detail::write_n(m_ofs, sgn2, sizeof(uint8_t));
-    }
 
     // TODO: Static assert would be better
@@ -257 +249 @@
 }
 
+void WriterImpl::WriteVLR(LASHeader const& header) 
+{
+
+    m_ofs.seekp(header.GetHeaderSize(), std::ios::beg);
+ 
+    for (uint32_t i = 0; i < header.GetRecordsCount(); ++i)
+    {
+         
+        LASVLR vlr = header.GetVLR(i);
+        
+        detail::write_n(m_ofs, vlr.GetReserved(), sizeof(uint16_t));
+        detail::write_n(m_ofs, vlr.GetUserId(true).c_str(), 16);
+        detail::write_n(m_ofs, vlr.GetRecordId(), sizeof(uint16_t));
+        detail::write_n(m_ofs, vlr.GetRecordLength(), sizeof(uint16_t));
+        detail::write_n(m_ofs, vlr.GetDescription(true).c_str(), 32);
+        std::vector<uint8_t> data = vlr.GetData();
+        detail::write_n(m_ofs, data.front(), data.size());
+    }
+
+}
 std::ostream& WriterImpl::GetStream()
 {

src/detail/writer11.cpp

@@ -155 +155 @@
     // so  data offset is equal to header size (227)
     // TODO: This value must be updated after new variable length record is added.
-    n4 = header.GetHeaderSize();
+    n4 = header.GetDataOffset();
     detail::write_n(m_ofs, n4, sizeof(n4));
 
@@ -206 +206 @@
     detail::write_n(m_ofs, header.GetMinZ(), sizeof(double));
 
+    WriteVLR(header);
+
     // If we already have points, we're going to put it at the end of the file.  
     // If we don't have any points,  we're going to leave it where it is.
     if (m_pointCount != 0)
         m_ofs.seekp(0, std::ios::end);
+    
+
 }
 
@@ -246 +250 @@
 }
 
+void WriterImpl::WriteVLR(LASHeader const& header) 
+{
+    printf("Writing VLR records in writer11.cpp... \n");
+
+    m_ofs.seekp(header.GetHeaderSize(), std::ios::beg);
+ 
+    for (uint32_t i = 0; i < header.GetRecordsCount(); ++i)
+    {
+         
+        LASVLR vlr = header.GetVLR(i);
+        
+        detail::write_n(m_ofs, vlr.GetReserved(), sizeof(uint16_t));
+        detail::write_n(m_ofs, vlr.GetUserId(true).c_str(), 16);
+        detail::write_n(m_ofs, vlr.GetRecordId(), sizeof(uint16_t));
+        detail::write_n(m_ofs, vlr.GetRecordLength(), sizeof(uint16_t));
+        detail::write_n(m_ofs, vlr.GetDescription(true).c_str(), 32);
+        std::vector<uint8_t> data = vlr.GetData();
+        detail::write_n(m_ofs, data.front(), data.size());
+    }
+
+}
+
 std::ostream& WriterImpl::GetStream()
 {

src/lasheader.cpp

@@ -129 +129 @@
         m_dataOffset = rhs.m_dataOffset;
         m_recordsCount = rhs.m_recordsCount;
+//        m_recordsCount = 0;
         m_dataFormatId = rhs.m_dataFormatId;
         m_dataRecordLen = rhs.m_dataRecordLen;
@@ -498 +499 @@
 {
     m_vlrs.push_back(v);
-    m_dataRecordLen = static_cast<uint16_t>(m_vlrs.size());
+    uint32_t size;
+    if (m_vlrs.size() > m_recordsCount ) {
+        m_recordsCount = m_vlrs.size();
+        size = GetDataOffset() + 2 + 16 + 2 + 2 + 32 + v.GetData().size()*sizeof(uint8_t);
+        SetDataOffset(size);
+    }
 }
 
@@ -511 +517 @@
         
     m_vlrs.erase(m_vlrs.begin() + index);
-    m_dataRecordLen = static_cast<uint16_t>(m_vlrs.size());
+    m_recordsCount = m_vlrs.size();
     
 }