Skip to content

Commit

Permalink
Merge pull request #934 from PDAL/no-default-hexbin
Browse files Browse the repository at this point in the history
only do filters.hexbin boundary for pdal info if --boundary is given as an argument
  • Loading branch information
hobu committed Jun 7, 2015
2 parents a19ee90 + bfaa378 commit bc1edd0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions kernels/info/InfoKernel.cpp
Expand Up @@ -290,7 +290,7 @@ void InfoKernel::prepare(const std::string& filename)
m_statsStage->setInput(*stage);
stage = m_statsStage;
}
if (m_boundary || m_showAll)
if (m_boundary )
{
m_hexbinStage = &(m_manager->addFilter("filters.hexbin"));
m_hexbinStage->setOptions(options);
Expand Down Expand Up @@ -328,7 +328,7 @@ MetadataNode InfoKernel::dump(const std::string& filename)
{
#ifdef PDAL_HAVE_LIBXML2
XMLSchema schema(m_manager->pointTable().layout());

std::ostream *out = FileUtils::createFile(m_PointCloudSchemaOutput);
std::string xml(schema.xml());
out->write(xml.c_str(), xml.size());
Expand Down Expand Up @@ -366,7 +366,7 @@ MetadataNode InfoKernel::dump(const std::string& filename)
MetadataNode metadata = m_reader->getMetadata().clone("metadata");
root.add(metadata);
}
if (m_boundary || m_showAll)
if (m_boundary)
{
PointViewSet viewSet = m_manager->views();
assert(viewSet.size() == 1);
Expand Down
3 changes: 2 additions & 1 deletion kernels/info/InfoKernel.hpp
Expand Up @@ -66,9 +66,10 @@ class PDAL_DLL InfoKernel : public Kernel
MetadataNode dump(const std::string& filename);

void prepare(const std::string& filename);

inline bool showAll() { return m_showAll; }
inline void doShowAll(bool value) { m_showAll = value; }
inline void doComputeBoundary(bool value) { m_boundary = value; }

private:
InfoKernel();
Expand Down

0 comments on commit bc1edd0

Please sign in to comment.