[Liblas-commits] hg-main-tree: reset Stage::getName to be
XPath-style stage name
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Apr 25 14:41:10 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/dc5150cbfe71
changeset: 640:dc5150cbfe71
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Apr 25 13:41:02 2011 -0500
description:
reset Stage::getName to be XPath-style stage name
diffstat:
include/libpc/Stage.hpp | 2 +-
include/libpc/drivers/faux/Reader.hpp | 3 ++-
include/libpc/drivers/faux/Writer.hpp | 3 ++-
include/libpc/drivers/las/Reader.hpp | 1 +
include/libpc/drivers/las/Writer.hpp | 1 +
include/libpc/drivers/liblas/Reader.hpp | 3 ++-
include/libpc/drivers/liblas/Writer.hpp | 3 ++-
include/libpc/drivers/mrsid/Reader.hpp | 1 +
include/libpc/drivers/oci/Reader.hpp | 1 +
include/libpc/drivers/oci/Writer.hpp | 1 +
include/libpc/filters/CacheFilter.hpp | 1 +
include/libpc/filters/Chipper.hpp | 1 +
include/libpc/filters/ColorFilter.hpp | 1 +
include/libpc/filters/CropFilter.hpp | 1 +
include/libpc/filters/DecimationFilter.hpp | 1 +
include/libpc/filters/MosaicFilter.hpp | 1 +
src/Stage.cpp | 8 +-------
src/drivers/faux/Reader.cpp | 5 +++++
src/drivers/faux/Writer.cpp | 5 +++++
src/drivers/las/Reader.cpp | 7 +++++++
src/drivers/las/Writer.cpp | 5 +++++
src/drivers/liblas/Reader.cpp | 6 ++++++
src/drivers/liblas/Writer.cpp | 5 +++++
src/drivers/mrsid/Reader.cpp | 6 ++++++
src/drivers/oci/Reader.cpp | 7 +++++++
src/drivers/oci/Writer.cpp | 6 ++++++
src/filters/CacheFilter.cpp | 5 +++++
src/filters/Chipper.cpp | 5 +++++
src/filters/ColorFilter.cpp | 5 +++++
src/filters/CropFilter.cpp | 6 ++++++
src/filters/DecimationFilter.cpp | 6 ++++++
src/filters/MosaicFilter.cpp | 5 +++++
32 files changed, 105 insertions(+), 12 deletions(-)
diffs (truncated from 439 to 300 lines):
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/Stage.hpp
--- a/include/libpc/Stage.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/Stage.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -63,7 +63,7 @@
// Implement this in your concrete classes to return a constant string
// as the name of the stage. Use upper camel case, with spaces between
// words. The last word should generally be "Reader" or "Filter".
- virtual const std::string& getName() const;
+ virtual const std::string& getName() const = 0;
virtual const std::string& getDescription() const = 0;
// core properties of all stages
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/faux/Reader.hpp
--- a/include/libpc/drivers/faux/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/faux/Reader.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -78,7 +78,8 @@
Reader(const Bounds<double>&, int numPoints, Mode mode, const std::vector<Dimension>& dimensions);
const std::string& getDescription() const;
-
+ const std::string& getName() const;
+
Mode getMode() const;
bool supportsIterator (StageIteratorType t) const
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/faux/Writer.hpp
--- a/include/libpc/drivers/faux/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/faux/Writer.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -55,7 +55,8 @@
Writer(Stage& prevStage);
const std::string& getDescription() const;
-
+ const std::string& getName() const;
+
// retrieve the summary info
double getMinX() const { return m_minimumX; }
double getMinY() const { return m_minimumY; }
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/las/Reader.hpp
--- a/include/libpc/drivers/las/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/las/Reader.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -57,6 +57,7 @@
LasReader(const std::string& filename);
const std::string& getDescription() const;
+ const std::string& getName() const;
const std::string& getFileName() const;
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/las/Writer.hpp
--- a/include/libpc/drivers/las/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/las/Writer.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -55,6 +55,7 @@
~LasWriter();
const std::string& getDescription() const;
+ const std::string& getName() const;
void setFormatVersion(boost::uint8_t majorVersion, boost::uint8_t minorVersion);
void setPointFormat(PointFormat);
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/liblas/Reader.hpp
--- a/include/libpc/drivers/liblas/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/liblas/Reader.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -60,7 +60,8 @@
~LiblasReader();
const std::string& getDescription() const;
-
+ const std::string& getName() const;
+
const std::string& getFileName() const;
::libpc::drivers::las::PointFormat getPointFormat() const;
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/liblas/Writer.hpp
--- a/include/libpc/drivers/liblas/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/liblas/Writer.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -57,7 +57,8 @@
~LiblasWriter();
const std::string& getDescription() const;
-
+ const std::string& getName() const;
+
void setFormatVersion(boost::uint8_t majorVersion, boost::uint8_t minorVersion);
void setPointFormat(::libpc::drivers::las::PointFormat);
void setDate(boost::uint16_t dayOfYear, boost::uint16_t year);
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/mrsid/Reader.hpp
--- a/include/libpc/drivers/mrsid/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/mrsid/Reader.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -57,6 +57,7 @@
Reader(const char *);
const std::string& getDescription() const;
+ const std::string& getName() const;
void seekToPoint(boost::uint64_t pointNum);
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/oci/Reader.hpp
--- a/include/libpc/drivers/oci/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/oci/Reader.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -57,6 +57,7 @@
~Reader();
const std::string& getDescription() const;
+ const std::string& getName() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/drivers/oci/Writer.hpp
--- a/include/libpc/drivers/oci/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/drivers/oci/Writer.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -55,6 +55,7 @@
~Writer();
const std::string& getDescription() const;
+ const std::string& getName() const;
void run(std::ostringstream const& command);
inline void setBounds(libpc::Bounds<double> bounds) {m_bounds = bounds; }
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/filters/CacheFilter.hpp
--- a/include/libpc/filters/CacheFilter.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/filters/CacheFilter.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -62,6 +62,7 @@
~CacheFilter();
const std::string& getDescription() const;
+ const std::string& getName() const;
boost::uint32_t getCacheBlockSize() const;
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/filters/Chipper.hpp
--- a/include/libpc/filters/Chipper.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/filters/Chipper.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -166,6 +166,7 @@
{ return m_blocks[i]; }
const std::string& getDescription() const ;
+ const std::string& getName() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/filters/ColorFilter.hpp
--- a/include/libpc/filters/ColorFilter.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/filters/ColorFilter.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -59,6 +59,7 @@
ColorFilter(const Stage& prevStage);
const std::string& getDescription() const;
+ const std::string& getName() const;
void getColor_F32_U8(float value, boost::uint8_t& red, boost::uint8_t& green, boost::uint8_t& blue) const;
void getColor_F64_U16(double value, boost::uint16_t& red, boost::uint16_t& green, boost::uint16_t& blue) const;
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/filters/CropFilter.hpp
--- a/include/libpc/filters/CropFilter.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/filters/CropFilter.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -58,6 +58,7 @@
CropFilter(const Stage& prevStage, Bounds<double> const& bounds);
const std::string& getDescription() const;
+ const std::string& getName() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/filters/DecimationFilter.hpp
--- a/include/libpc/filters/DecimationFilter.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/filters/DecimationFilter.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -56,6 +56,7 @@
DecimationFilter(const Stage& prevStage, boost::uint32_t step);
const std::string& getDescription() const;
+ const std::string& getName() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r e7c0decfb233 -r dc5150cbfe71 include/libpc/filters/MosaicFilter.hpp
--- a/include/libpc/filters/MosaicFilter.hpp Mon Apr 25 12:33:56 2011 -0500
+++ b/include/libpc/filters/MosaicFilter.hpp Mon Apr 25 13:41:02 2011 -0500
@@ -56,6 +56,7 @@
MosaicFilter(std::vector<const Stage*> prevStages);
const std::string& getDescription() const;
+ const std::string& getName() const;
const std::vector<const Stage*>& getPrevStages() const;
diff -r e7c0decfb233 -r dc5150cbfe71 src/Stage.cpp
--- a/src/Stage.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/Stage.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -162,15 +162,9 @@
std::cout << *this;
}
-std::string const& Stage::getName() const
-{
- static std::string name("libPC Stage");
- return name;
-}
-
-
std::ostream& operator<<(std::ostream& ostr, const Stage& stage)
{
+ ostr << " Name: " << stage.getName() << std::endl;
ostr << " Num points: " << stage.getNumPoints() << std::endl;
ostr << " Bounds:" << std::endl;
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/faux/Reader.cpp
--- a/src/drivers/faux/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/drivers/faux/Reader.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -85,6 +85,11 @@
return name;
}
+const std::string& Reader::getName() const
+{
+ static std::string name("drivers.faux.reader");
+ return name;
+}
Reader::Mode Reader::getMode() const
{
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/faux/Writer.cpp
--- a/src/drivers/faux/Writer.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/drivers/faux/Writer.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -52,6 +52,11 @@
return name;
}
+const std::string& Writer::getName() const
+{
+ static std::string name("drivers.faux.writer");
+ return name;
+}
void Writer::writeBegin()
{
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/las/Reader.cpp
--- a/src/drivers/las/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/drivers/las/Reader.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -76,6 +76,13 @@
return name;
}
+const std::string& LasReader::getName() const
+{
+ static std::string name("drivers.las.reader");
+ return name;
+}
+
+
const std::string& LasReader::getFileName() const
{
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/las/Writer.cpp
--- a/src/drivers/las/Writer.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/drivers/las/Writer.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -80,6 +80,11 @@
return name;
}
+const std::string& LasWriter::getName() const
+{
+ static std::string name("drivers.las.writer");
+ return name;
+}
void LasWriter::setCompressed(bool v)
{
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/liblas/Reader.cpp
--- a/src/drivers/liblas/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/drivers/liblas/Reader.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -87,6 +87,12 @@
return name;
}
+const std::string& LiblasReader::getName() const
+{
+ static std::string name("drivers.liblas.reader");
+ return name;
+}
+
const std::string& LiblasReader::getFileName() const
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/liblas/Writer.cpp
--- a/src/drivers/liblas/Writer.cpp Mon Apr 25 12:33:56 2011 -0500
+++ b/src/drivers/liblas/Writer.cpp Mon Apr 25 13:41:02 2011 -0500
@@ -78,6 +78,11 @@
return name;
}
+const std::string& LiblasWriter::getName() const
+{
+ static std::string name("drivers.liblas.writer");
+ return name;
+}
void LiblasWriter::setupExternalHeader()
{
diff -r e7c0decfb233 -r dc5150cbfe71 src/drivers/mrsid/Reader.cpp
--- a/src/drivers/mrsid/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
More information about the Liblas-commits
mailing list