Changeset 1573:6c8a83eaffdc

Timestamp:

02/12/10 12:32:32 (6 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

implement WriterI

Files:

• include/liblas/detail/writer/header.hpp (modified) (2 diffs)
• include/liblas/detail/writer/writer.hpp (modified) (3 diffs)
• include/liblas/interfaces.hpp (modified) (1 diff)
• src/detail/writer/writer.cpp (modified) (5 diffs)
• src/laswriter.cpp (modified) (2 diffs)

include/liblas/detail/writer/header.hpp

@@ -47 +47 @@
 
 #include <liblas/lasheader.hpp>
-#include <liblas/detail/writer/writer.hpp>
+#include <liblas/detail/writer/base.hpp>
 
 // std
@@ -61 +61 @@
 
     Header(std::ostream& ofs, liblas::uint32_t& count, LASHeader const& header );
-    
-    LASHeader GetHeader() const { return m_header; }
+
+    const LASHeader& GetHeader() const { return m_header; }
     void write();
     

include/liblas/detail/writer/writer.hpp

@@ -44 +44 @@
 
 #include <liblas/detail/fwd.hpp>
+#include <liblas/interfaces.hpp>
 #include <liblas/detail/writer/point.hpp>
+#include <liblas/detail/writer/header.hpp>
 
-#ifndef HAVE_GDAL
-    typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH;
-    typedef struct OGRSpatialReferenceHS *OGRSpatialReferenceH;
-#endif
-
-
-// std
-#include <iosfwd>
 
 namespace liblas { namespace detail { 
 
-class WriterImpl 
+class WriterImpl : public WriterI
 {
 public:
@@ -65 +59 @@
     ~WriterImpl();
     LASVersion GetVersion() const;
-    void WriteHeader(LASHeader& header);
+    LASHeader const& WriteHeader(LASHeader const& header);
     void UpdateHeader(LASHeader const& header);
-    void WritePointRecord(LASPoint const& record, const LASHeader& header);
+    void WritePoint(LASPoint const& record, const LASHeader& header);
 
     std::ostream& GetStream() const;
 
-    void SetSRS(const LASSpatialReference& srs, const LASHeader& header);
     void SetInputSRS(const LASSpatialReference& srs);
     void SetOutputSRS(const LASSpatialReference& srs, const LASHeader& header);
@@ -86 +79 @@
     OGRSpatialReferenceH m_out_ref;
     
-    detail::writer::Point* m_point_writer;
+    writer::Point* m_point_writer;
+    writer::Header* m_header_writer;
     
 private:

include/liblas/interfaces.hpp

@@ -74 +74 @@
 };
 
+class WriterI
+{
+public:
+
+    virtual LASHeader const& WriteHeader(const LASHeader& header) = 0;
+    virtual void UpdateHeader(const LASHeader& header) = 0;
+    virtual void WritePoint(const LASPoint& point, const LASHeader& header) = 0;
+
+    virtual void SetInputSRS(const LASSpatialReference& srs) = 0;
+    virtual void SetOutputSRS(const LASSpatialReference& srs, const LASHeader& header) = 0;
+
+    virtual ~WriterI() {};    
+    // virtual LASHeader const& ReadHeader() = 0;
+    // virtual LASPoint const& ReadNextPoint(const LASHeader& header) = 0;
+    // virtual LASPoint const& ReadPointAt(std::size_t n, const LASHeader& header) = 0;
+    // 
+    // virtual void Reset(const LASHeader& header) = 0;
+    // virtual void SetInputSRS(const LASSpatialReference& srs) = 0;
+    // virtual void SetOutputSRS(const LASSpatialReference& srs, const LASHeader& header) = 0;
+    // 
+    // virtual ~ReaderI() {};    
+};
 } // namespace liblas
 

src/detail/writer/writer.cpp

@@ -57 +57 @@
 
 WriterImpl::WriterImpl(std::ostream& ofs) :
-    m_ofs(ofs), m_transform(0),  m_in_ref(0), m_out_ref(0), m_point_writer(0), m_pointCount(0)
-{
-}
-
-
-void WriterImpl::WriteHeader(LASHeader& header)
-{
-    detail::writer::Header hwriter(m_ofs,m_pointCount, header );
-    hwriter.write();
-    header = hwriter.GetHeader();
-    
+    m_ofs(ofs), 
+    m_transform(0),  
+    m_in_ref(0), 
+    m_out_ref(0), 
+    m_point_writer(0), 
+    m_header_writer(0), 
+    m_pointCount(0)
+{
+}
+
+
+LASHeader const&  WriterImpl::WriteHeader(LASHeader const& header)
+{
+    m_header_writer = new detail::writer::Header(m_ofs,m_pointCount, header );
+    m_header_writer->write();
+    return m_header_writer->GetHeader();
 }
 
@@ -82 +87 @@
 }
 
-void WriterImpl::WritePointRecord(LASPoint const& point, const LASHeader& header)
+void WriterImpl::WritePoint(LASPoint const& point, const LASHeader& header)
 {
     if (m_point_writer == 0) {
@@ -97 +102 @@
 WriterImpl::~WriterImpl()
 {
-    if (m_point_writer != 0)
-        delete m_point_writer;
         
 #ifdef HAVE_GDAL
@@ -111 +114 @@
     }
 #endif
+
+    if (m_point_writer != 0)
+        delete m_point_writer;
+
+    if (m_header_writer != 0)
+        delete m_header_writer;
+
 }
 
@@ -132 +142 @@
 }
 
-void WriterImpl::SetSRS(const LASSpatialReference& srs , const LASHeader& header)
-{
-    SetOutputSRS(srs, header);
-}
 
 void WriterImpl::SetInputSRS(const LASSpatialReference& srs )

src/laswriter.cpp

@@ -79 +79 @@
     }
 
-    m_pimpl->WritePointRecord(point, m_header);
+    m_pimpl->WritePoint(point, m_header);
 
     return true;
@@ -91 +91 @@
 void LASWriter::WriteHeader(LASHeader& header)
 {
-    m_pimpl->WriteHeader(header);
-    m_header = header;
+    // The writer may update our header as part of its 
+    // writing process (change VLRs for SRS's, for instance).
+    m_header = m_pimpl->WriteHeader(header);
 }