[Liblas-commits] libpc: more OCI writer scaffolding

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglibpc/rev/f27440b0a58d
changeset: 179:f27440b0a58d
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Mar 07 13:46:28 2011 -0600
description:
more OCI writer scaffolding

diffstat:

 src/drivers/oci/block.cpp  |   4 ++--
 src/drivers/oci/block.hpp  |  11 ++++-------
 src/drivers/oci/writer.cpp |   9 +++++----
 src/drivers/oci/writer.hpp |  11 +++++++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diffs (102 lines):

diff -r 23e91f43b490 -r f27440b0a58d src/drivers/oci/block.cpp
--- a/src/drivers/oci/block.cpp	Fri Mar 04 14:47:27 2011 -0800
+++ b/src/drivers/oci/block.cpp	Mon Mar 07 13:46:28 2011 -0600
@@ -38,8 +38,8 @@
 namespace libpc { namespace driver { namespace oci {
 
 
-Block::Block(const PointData& data)
-    : m_data(data)
+Block::Block(chipper::Block const& block)
+    : m_block(block)
 {
 }
 
diff -r 23e91f43b490 -r f27440b0a58d src/drivers/oci/block.hpp
--- a/src/drivers/oci/block.hpp	Fri Mar 04 14:47:27 2011 -0800
+++ b/src/drivers/oci/block.hpp	Mon Mar 07 13:46:28 2011 -0600
@@ -37,24 +37,21 @@
 
 
 #include "libpc/PointData.hpp"
+#include "libpc/Bounds.hpp"
+#include "libpc/chipper.hpp"
 
 namespace libpc { namespace driver { namespace oci {
     
 class LIBPC_DLL Block
 {
 public:
-    Block( const PointData& data);
-    
-    
-    bool is3D() const { return m_3d; }
+    Block( chipper::Block const& block);
     
 private:
     Block& operator=(const Block&); // nope
     Block(const Block&); // nope
     
-    PointData const& m_data;
-    
-    bool m_3d;
+    chipper::Block const&  m_block;
     
 };
 
diff -r 23e91f43b490 -r f27440b0a58d src/drivers/oci/writer.cpp
--- a/src/drivers/oci/writer.cpp	Fri Mar 04 14:47:27 2011 -0800
+++ b/src/drivers/oci/writer.cpp	Mon Mar 07 13:46:28 2011 -0600
@@ -47,12 +47,13 @@
 {
 
 
-OCIWriter::OCIWriter(Stage& prevStage)
-    : Writer(prevStage)
+OCIWriter::OCIWriter(Stage& prevStage, boost::uint32_t block_size)
+    : Writer(prevStage), m_stage(prevStage), m_block_size(block_size)
 {
 
-
-
+    chipper::Chipper(m_stage, m_block_size );
+    chipper.Chip();
+    
     return;
 }
 
diff -r 23e91f43b490 -r f27440b0a58d src/drivers/oci/writer.hpp
--- a/src/drivers/oci/writer.hpp	Fri Mar 04 14:47:27 2011 -0800
+++ b/src/drivers/oci/writer.hpp	Mon Mar 07 13:46:28 2011 -0600
@@ -35,17 +35,17 @@
 #ifndef INCLUDED_OCIWRITER_HPP
 #define INCLUDED_OCIWRITER_HPP
 
-#include "libpc/Writer.hpp"
-
+#include <libpc/Writer.hpp>
+#include <libpc/chipper.hpp>
+#include "block.hpp"
 
 namespace libpc
 {
 
-// we default to LAS 1.2, point format 0
 class LIBPC_DLL OCIWriter : public Writer
 {
 public:
-    OCIWriter(Stage& prevStage);
+    OCIWriter(Stage& prevStage, boost::uint32_t block_size);
     ~OCIWriter();
 
     const std::string& getName() const;
@@ -65,6 +65,9 @@
 
     OCIWriter& operator=(const OCIWriter&); // not implemented
     OCIWriter(const OCIWriter&); // not implemented
+    
+    Stage& m_stage;
+    boost::uint32_t m_block_size;
 };
 
 } // namespace libpc