Changeset 1568:3e2973e11579

Timestamp:

02/11/10 19:37:25 (6 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

refactor our ReaderImpl? to be a ReaderI

Files:

• include/liblas/detail/reader/reader.hpp (modified) (4 diffs)
• include/liblas/lasreader.hpp (modified) (4 diffs)
• src/detail/reader/reader.cpp (modified) (10 diffs)
• src/lasreader.cpp (modified) (7 diffs)

include/liblas/detail/reader/reader.hpp

@@ -45 +45 @@
 #include <liblas/detail/fwd.hpp>
 #include <liblas/detail/reader/point.hpp>
+#include <liblas/detail/reader/header.hpp>
+#include <liblas/lasreader.hpp>
 
 // std
@@ -58 +60 @@
 namespace liblas { namespace detail { 
 
-class ReaderImpl
+class ReaderImpl : public ReaderI
 {
 public:
@@ -65 +67 @@
     ~ReaderImpl();
 
-    bool ReadHeader(LASHeader& header);
-    bool ReadNextPoint(LASPoint& point, const LASHeader& header);
-    bool ReadPointAt(std::size_t n, LASPoint& record, const LASHeader& header);
+    LASHeader const& ReadHeader();
+    LASPoint const& ReadNextPoint(const LASHeader& header);
+    LASPoint const& ReadPointAt(std::size_t n, const LASHeader& header);
 
     std::istream& GetStream() const;
@@ -97 +99 @@
     
     detail::reader::Point* m_point_reader;
+    detail::reader::Header* m_header_reader;
 
 };

include/liblas/lasreader.hpp

@@ -60 +60 @@
 namespace liblas {
 
+class ReaderI;
+    
 /// Defines public interface to LAS reader implementation.
 class LASReader
@@ -70 +72 @@
     LASReader(std::istream& ifs);
 
+    LASReader(ReaderI* reader);
+    
     /// User-defined consructor initializes reader with input stream and
     /// a header to override the values in the file
@@ -141 +145 @@
     const std::auto_ptr<detail::ReaderImpl> m_pimpl;
     LASHeader m_header;
-    LASPoint m_point;
-    std::vector<LASVariableRecord> m_vlrs;
+    LASPoint* m_point;
+    LASPoint* m_empty_point;
+    // std::vector<LASVariableRecord> m_vlrs;
     
     // Set if the user provides a header to override the header as 
@@ -155 +160 @@
 public:
 
-    virtual ~ReaderI() {}
-
-    virtual LASHeader& ReadHeader(const LASHeader& header) const = 0;
+    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);
-    virtual void SetInputSRS(const LASSpatialReference& srs);
-    virtual void SetOutputSRS(const LASSpatialReference& srs, const LASHeader& header);
+    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/reader/reader.cpp

@@ -41 +41 @@
 
 #include <liblas/detail/reader/reader.hpp>
-#include <liblas/detail/reader/header.hpp>
-#include <liblas/detail/reader/vlr.hpp>
 
 #include <liblas/detail/utility.hpp>
@@ -63 +61 @@
 ReaderImpl::ReaderImpl(std::istream& ifs) :
     m_ifs(ifs), m_size(0), m_current(0),
-    m_transform(0), m_in_ref(0), m_out_ref(0), m_point_reader(0)
+    m_transform(0), m_in_ref(0), m_out_ref(0), m_point_reader(0),     
+    m_header_reader(new reader::Header(m_ifs))
+
 {
 }
@@ -86 +86 @@
 
     delete m_point_reader;
+    delete m_header_reader;
 }
 
@@ -106 +107 @@
     if (m_point_reader == 0) {
         if (m_transform != 0) {
-            m_point_reader = new detail::reader::Point(m_ifs, header, m_transform);
+            m_point_reader = new reader::Point(m_ifs, header, m_transform);
         } else {
-            m_point_reader = new detail::reader::Point(m_ifs, header);
+            m_point_reader = new reader::Point(m_ifs, header);
         }
     } 
@@ -122 +123 @@
         delete m_point_reader;
         m_point_reader = 0;
-        m_point_reader = new detail::reader::Point(m_ifs, header, m_transform);
+        m_point_reader = new reader::Point(m_ifs, header, m_transform);
     }
 }
@@ -180 +181 @@
 
 
-bool ReaderImpl::ReadHeader(LASHeader& header)
-{
-    using detail::read_n;
-    using detail::reader::Header;
-    
-    Header h(m_ifs);
-    h.read();
-    header = h.GetHeader();
+LASHeader const& ReaderImpl::ReadHeader()
+{
+    m_header_reader->read();
+    const LASHeader& header = m_header_reader->GetHeader();
     
     Reset(header);
@@ -195 +192 @@
     m_in_srs = header.GetSRS();
     
-    return true;
-}
-
-bool ReaderImpl::ReadNextPoint(LASPoint& point, const LASHeader& header)
+    return header;
+}
+
+LASPoint const& ReaderImpl::ReadNextPoint(const LASHeader& header)
 {
     if (0 == m_current)
@@ -204 +201 @@
         m_ifs.clear();
         m_ifs.seekg(header.GetDataOffset(), std::ios::beg);
+
     }
 
@@ -209 +207 @@
     {
         m_point_reader->read();
-        point = m_point_reader->GetPoint();
+        const LASPoint& point = m_point_reader->GetPoint();
         ++m_current;
-        return true;
-    }
-
-    return false;
-}
-
-bool ReaderImpl::ReadPointAt(std::size_t n, LASPoint& point, const LASHeader& header)
-{
-    if (m_size <= n)
-        return false;
+        return point;
+        // return true;
+    } else if (m_current == m_size ){
+        throw std::out_of_range("file has no more points to read, end of file reached");
+    } else {
+        throw std::runtime_error("ReadNextPoint: m_current > m_size, something has gone extremely awry");
+    }
+
+    // return false;
+}
+
+LASPoint const& ReaderImpl::ReadPointAt(std::size_t n, const LASHeader& header)
+{
+    // FIXME: Throw in this case.
+    if (m_size == n) {
+        throw std::out_of_range("file has no more points to read, end of file reached");
+    } else if (m_size < n) {
+        std::ostringstream output;
+        output << "ReadPointAt:: Inputted value: " << n << " is greater than the number of points: " << m_size;
+        std::string out(output.str());
+        throw std::runtime_error(out);
+    } 
 
     std::streamsize pos = (static_cast<std::streamsize>(n) * header.GetDataRecordLength()) + header.GetDataOffset();    
@@ -228 +238 @@
 
     m_point_reader->read();
-    point = m_point_reader->GetPoint();
-
-
-    return true;
+    const LASPoint& point = m_point_reader->GetPoint();
+    
+    return point;
 }
 

src/lasreader.cpp

@@ -59 +59 @@
 LASReader::LASReader(std::istream& ifs) :
     m_pimpl(detail::ReaderFactory::Create(ifs)),
+    m_point(0),
+    m_empty_point(new LASPoint()),
     bCustomHeader(false)
 {
@@ -66 +68 @@
 LASReader::LASReader(std::istream& ifs, LASHeader& header) :
     m_pimpl(detail::ReaderFactory::Create(ifs)),
+    m_point(0),
+    m_empty_point(new LASPoint()),
     bCustomHeader(false)
+
 {
     m_header = header;
@@ -77 +82 @@
     // empty, but required so we can implement PIMPL using
     // std::auto_ptr with incomplete type (Reader).
+    delete m_empty_point;
 }
 
@@ -86 +92 @@
 LASPoint const& LASReader::GetPoint() const
 {
-    return m_point;
+    return *m_point;
 }
 
 bool LASReader::ReadNextPoint()
 {
-    bool ret = m_pimpl->ReadNextPoint(m_point, m_header);
-    return ret;
+    try {
+        m_point = const_cast<LASPoint*>(&(m_pimpl->ReadNextPoint(m_header)));
+        return true;
+    } catch (std::out_of_range& e) {
+        m_point = 0;
+        return false;
+    }
+
 }
 
 bool LASReader::ReadPointAt(std::size_t n)
 {
-    bool ret = m_pimpl->ReadPointAt(n, m_point, m_header);
-    return ret;
+    try {
+        m_point = const_cast<LASPoint*>(&(m_pimpl->ReadPointAt(n, m_header)));
+        return true;
+    } catch (std::out_of_range& e) {
+        m_point = 0;
+        return false;
+    }
+
 }
 
@@ -108 +126 @@
     }
 
-    bool ret = m_pimpl->ReadPointAt(n, m_point, m_header);
-    if (!ret)
+    m_point = const_cast<LASPoint*>(&(m_pimpl->ReadPointAt(n, m_header)));
+    if (m_point == 0) 
     {
         throw std::out_of_range("no point record at given position");
     }
 
-    return m_point;
+    return *m_point;
 }
 
@@ -124 +142 @@
     LASHeader custom_header(m_header);
 
-    bool ret = m_pimpl->ReadHeader(m_header);
-    if (!ret)
-        throw std::runtime_error("public header block reading failure");
+    m_header = m_pimpl->ReadHeader();
+
+        // throw std::runtime_error("public header block reading failure");
 
     m_pimpl->Reset(m_header);
@@ -134 +152 @@
         m_header = custom_header;
     }
+    
+    // This is yucky, but we need to ensure that we have a reference 
+    // to a real point existing as soon as we are constructed.  
+    // This is for someone who tries to GetPoint without first reading 
+    // a point, and it will ensure they get something valid.  We just 
+    // keep it around until the reader closes down and then deletes.  
+    // 
+    m_point = m_empty_point;
 }