[Liblas-commits] hg-main-tree: rename getName to getDescription in
preparation fo...
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Apr 25 13:34:04 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/e7c0decfb233
changeset: 639:e7c0decfb233
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Apr 25 12:33:56 2011 -0500
description:
rename getName to getDescription in preparation for getName being the XPath-style name to the Stage. Remove extra getName() virtual on libpc::Writer
diffstat:
include/libpc/Stage.hpp | 6 ++++--
include/libpc/Writer.hpp | 4 ----
include/libpc/drivers/faux/Reader.hpp | 2 +-
include/libpc/drivers/faux/Writer.hpp | 2 +-
include/libpc/drivers/las/Reader.hpp | 2 +-
include/libpc/drivers/las/Writer.hpp | 2 +-
include/libpc/drivers/liblas/Reader.hpp | 2 +-
include/libpc/drivers/liblas/Writer.hpp | 2 +-
include/libpc/drivers/mrsid/Reader.hpp | 2 +-
include/libpc/drivers/oci/Reader.hpp | 2 +-
include/libpc/drivers/oci/Writer.hpp | 2 +-
include/libpc/filters/CacheFilter.hpp | 2 +-
include/libpc/filters/Chipper.hpp | 2 +-
include/libpc/filters/ColorFilter.hpp | 2 +-
include/libpc/filters/CropFilter.hpp | 2 +-
include/libpc/filters/DecimationFilter.hpp | 2 +-
include/libpc/filters/MosaicFilter.hpp | 2 +-
src/Stage.cpp | 6 ++++++
src/drivers/faux/Reader.cpp | 2 +-
src/drivers/faux/Writer.cpp | 2 +-
src/drivers/las/Reader.cpp | 2 +-
src/drivers/las/Writer.cpp | 2 +-
src/drivers/liblas/Reader.cpp | 2 +-
src/drivers/liblas/Writer.cpp | 2 +-
src/drivers/mrsid/Reader.cpp | 2 +-
src/drivers/oci/Reader.cpp | 2 +-
src/drivers/oci/Writer.cpp | 2 +-
src/filters/CacheFilter.cpp | 2 +-
src/filters/Chipper.cpp | 2 +-
src/filters/ColorFilter.cpp | 2 +-
src/filters/CropFilter.cpp | 2 +-
src/filters/DecimationFilter.cpp | 2 +-
src/filters/MosaicFilter.cpp | 2 +-
test/unit/CacheFilterTest.cpp | 2 +-
test/unit/CropFilterTest.cpp | 2 +-
test/unit/DecimationFilterTest.cpp | 2 +-
test/unit/FauxReaderTest.cpp | 4 ++--
test/unit/FauxWriterTest.cpp | 2 +-
test/unit/LasReaderTest.cpp | 10 +++++-----
test/unit/LasWriterTest.cpp | 4 ++--
test/unit/LiblasReaderTest.cpp | 10 +++++-----
test/unit/LiblasWriterTest.cpp | 4 ++--
test/unit/MosaicFilterTest.cpp | 2 +-
test/unit/SpatialReferenceTest.cpp | 4 ++--
44 files changed, 63 insertions(+), 59 deletions(-)
diffs (truncated from 653 to 300 lines):
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/Stage.hpp
--- a/include/libpc/Stage.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/Stage.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -43,6 +43,7 @@
#include <libpc/Bounds.hpp>
#include <libpc/SpatialReference.hpp>
#include <libpc/MetadataRecord.hpp>
+#include <libpc/Options.hpp>
namespace libpc
{
@@ -62,8 +63,9 @@
// 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 = 0;
-
+ virtual const std::string& getName() const;
+ virtual const std::string& getDescription() const = 0;
+
// core properties of all stages
const Schema& getSchema() const;
virtual boost::uint64_t getNumPoints() const;
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/Writer.hpp
--- a/include/libpc/Writer.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -51,10 +51,6 @@
Writer(Stage& prevStage);
virtual ~Writer() {}
- // 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 "Writer".
- virtual const std::string& getName() const = 0;
// size of the PointBuffer buffer to use
void setChunkSize(boost::uint32_t);
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/faux/Reader.hpp
--- a/include/libpc/drivers/faux/Reader.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/faux/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -77,7 +77,7 @@
Reader(const Bounds<double>&, int numPoints, Mode mode);
Reader(const Bounds<double>&, int numPoints, Mode mode, const std::vector<Dimension>& dimensions);
- const std::string& getName() const;
+ const std::string& getDescription() const;
Mode getMode() const;
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/faux/Writer.hpp
--- a/include/libpc/drivers/faux/Writer.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/faux/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -54,7 +54,7 @@
public:
Writer(Stage& prevStage);
- const std::string& getName() const;
+ const std::string& getDescription() const;
// retrieve the summary info
double getMinX() const { return m_minimumX; }
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/las/Reader.hpp
--- a/include/libpc/drivers/las/Reader.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/las/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -56,7 +56,7 @@
public:
LasReader(const std::string& filename);
- const std::string& getName() const;
+ const std::string& getDescription() const;
const std::string& getFileName() const;
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/las/Writer.hpp
--- a/include/libpc/drivers/las/Writer.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/las/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -54,7 +54,7 @@
LasWriter(Stage& prevStage, std::ostream&);
~LasWriter();
- const std::string& getName() const;
+ const std::string& getDescription() const;
void setFormatVersion(boost::uint8_t majorVersion, boost::uint8_t minorVersion);
void setPointFormat(PointFormat);
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/liblas/Reader.hpp
--- a/include/libpc/drivers/liblas/Reader.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/liblas/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -59,7 +59,7 @@
LiblasReader(const std::string& filename);
~LiblasReader();
- const std::string& getName() const;
+ const std::string& getDescription() const;
const std::string& getFileName() const;
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/liblas/Writer.hpp
--- a/include/libpc/drivers/liblas/Writer.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/liblas/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -56,7 +56,7 @@
LiblasWriter(Stage& prevStage, std::ostream&);
~LiblasWriter();
- const std::string& getName() const;
+ const std::string& getDescription() const;
void setFormatVersion(boost::uint8_t majorVersion, boost::uint8_t minorVersion);
void setPointFormat(::libpc::drivers::las::PointFormat);
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/mrsid/Reader.hpp
--- a/include/libpc/drivers/mrsid/Reader.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/mrsid/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -56,7 +56,7 @@
public:
Reader(const char *);
- const std::string& getName() const;
+ const std::string& getDescription() const;
void seekToPoint(boost::uint64_t pointNum);
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/oci/Reader.hpp
--- a/include/libpc/drivers/oci/Reader.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/oci/Reader.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -56,7 +56,7 @@
Reader(Options& options);
~Reader();
- const std::string& getName() const;
+ const std::string& getDescription() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/drivers/oci/Writer.hpp
--- a/include/libpc/drivers/oci/Writer.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/drivers/oci/Writer.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -54,7 +54,7 @@
Writer(Stage& prevStage, Options& options);
~Writer();
- const std::string& getName() const;
+ const std::string& getDescription() const;
void run(std::ostringstream const& command);
inline void setBounds(libpc::Bounds<double> bounds) {m_bounds = bounds; }
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/filters/CacheFilter.hpp
--- a/include/libpc/filters/CacheFilter.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/filters/CacheFilter.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -61,7 +61,7 @@
CacheFilter(const Stage& prevStage, boost::uint32_t numBlocks, boost::uint32_t blockSize);
~CacheFilter();
- const std::string& getName() const;
+ const std::string& getDescription() const;
boost::uint32_t getCacheBlockSize() const;
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/filters/Chipper.hpp
--- a/include/libpc/filters/Chipper.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/filters/Chipper.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -165,7 +165,7 @@
const chipper::Block& GetBlock(std::vector<chipper::Block>::size_type i) const
{ return m_blocks[i]; }
- const std::string& getName() const ;
+ const std::string& getDescription() const ;
bool supportsIterator (StageIteratorType t) const
{
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/filters/ColorFilter.hpp
--- a/include/libpc/filters/ColorFilter.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/filters/ColorFilter.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -58,7 +58,7 @@
public:
ColorFilter(const Stage& prevStage);
- const std::string& getName() const;
+ const std::string& getDescription() 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 12d9f7fe990f -r e7c0decfb233 include/libpc/filters/CropFilter.hpp
--- a/include/libpc/filters/CropFilter.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/filters/CropFilter.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -57,7 +57,7 @@
public:
CropFilter(const Stage& prevStage, Bounds<double> const& bounds);
- const std::string& getName() const;
+ const std::string& getDescription() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/filters/DecimationFilter.hpp
--- a/include/libpc/filters/DecimationFilter.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/filters/DecimationFilter.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -55,7 +55,7 @@
public:
DecimationFilter(const Stage& prevStage, boost::uint32_t step);
- const std::string& getName() const;
+ const std::string& getDescription() const;
bool supportsIterator (StageIteratorType t) const
{
diff -r 12d9f7fe990f -r e7c0decfb233 include/libpc/filters/MosaicFilter.hpp
--- a/include/libpc/filters/MosaicFilter.hpp Mon Apr 25 11:35:01 2011 -0500
+++ b/include/libpc/filters/MosaicFilter.hpp Mon Apr 25 12:33:56 2011 -0500
@@ -55,7 +55,7 @@
// vector.size() must be > 0
MosaicFilter(std::vector<const Stage*> prevStages);
- const std::string& getName() const;
+ const std::string& getDescription() const;
const std::vector<const Stage*>& getPrevStages() const;
diff -r 12d9f7fe990f -r e7c0decfb233 src/Stage.cpp
--- a/src/Stage.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/Stage.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -162,6 +162,12 @@
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)
{
diff -r 12d9f7fe990f -r e7c0decfb233 src/drivers/faux/Reader.cpp
--- a/src/drivers/faux/Reader.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/drivers/faux/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -79,7 +79,7 @@
}
-const std::string& Reader::getName() const
+const std::string& Reader::getDescription() const
{
static std::string name("Faux Reader");
return name;
diff -r 12d9f7fe990f -r e7c0decfb233 src/drivers/faux/Writer.cpp
--- a/src/drivers/faux/Writer.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/drivers/faux/Writer.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -46,7 +46,7 @@
}
-const std::string& Writer::getName() const
+const std::string& Writer::getDescription() const
{
static std::string name("Faux Writer");
return name;
diff -r 12d9f7fe990f -r e7c0decfb233 src/drivers/las/Reader.cpp
--- a/src/drivers/las/Reader.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/drivers/las/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -70,7 +70,7 @@
}
-const std::string& LasReader::getName() const
+const std::string& LasReader::getDescription() const
{
static std::string name("Las Reader");
return name;
diff -r 12d9f7fe990f -r e7c0decfb233 src/drivers/las/Writer.cpp
--- a/src/drivers/las/Writer.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/drivers/las/Writer.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -74,7 +74,7 @@
}
-const std::string& LasWriter::getName() const
+const std::string& LasWriter::getDescription() const
{
static std::string name("Las Writer");
return name;
diff -r 12d9f7fe990f -r e7c0decfb233 src/drivers/liblas/Reader.cpp
--- a/src/drivers/liblas/Reader.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/drivers/liblas/Reader.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -81,7 +81,7 @@
}
-const std::string& LiblasReader::getName() const
+const std::string& LiblasReader::getDescription() const
{
static std::string name("Liblas Reader");
return name;
diff -r 12d9f7fe990f -r e7c0decfb233 src/drivers/liblas/Writer.cpp
--- a/src/drivers/liblas/Writer.cpp Mon Apr 25 11:35:01 2011 -0500
+++ b/src/drivers/liblas/Writer.cpp Mon Apr 25 12:33:56 2011 -0500
@@ -72,7 +72,7 @@
}
More information about the Liblas-commits
mailing list