[Liblas-commits] hg-main-tree: renamed Producer->Reader,
Consumer->Writer; made W...
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Mar 15 21:51:38 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/3be36b68bb39
changeset: 251:3be36b68bb39
user: Michael P. Gerlek <mpg at flaxen.com>
date: Tue Mar 15 21:25:01 2011 -0400
description:
renamed Producer->Reader, Consumer->Writer; made Writer not be a Stage
Subject: hg-main-tree: merge
details: http://hg.libpc.orghg-main-tree/rev/d9aeeea810bf
changeset: 252:d9aeeea810bf
user: Michael P. Gerlek <mpg at flaxen.com>
date: Tue Mar 15 21:25:15 2011 -0400
description:
merge
Subject: hg-main-tree: fix capitalization of some file names
details: http://hg.libpc.orghg-main-tree/rev/acfe75d46d8a
changeset: 253:acfe75d46d8a
user: Michael P. Gerlek <mpg at flaxen.com>
date: Tue Mar 15 21:37:15 2011 -0400
description:
fix capitalization of some file names
Subject: hg-main-tree: lint
details: http://hg.libpc.orghg-main-tree/rev/1aae2a9061b6
changeset: 254:1aae2a9061b6
user: Michael P. Gerlek <mpg at flaxen.com>
date: Tue Mar 15 21:37:30 2011 -0400
description:
lint
Subject: hg-main-tree: namespace'd the filters
details: http://hg.libpc.orghg-main-tree/rev/d6cf2a007f17
changeset: 255:d6cf2a007f17
user: Michael P. Gerlek <mpg at flaxen.com>
date: Tue Mar 15 21:51:33 2011 -0400
description:
namespace'd the filters
diffstat:
.hgignore | 1 +
apps/pcinfo.cpp | 2 +-
doc/Makefile | 130 +++
doc/_static/dummy | 1 +
doc/_templates/dummy | 1 +
doc/conf.py | 256 ++++++
doc/index.txt | 37 +
doc/make.bat | 170 ++++
doc/notes/apps.txt | 2 +
doc/notes/bindings.txt | 2 +
doc/notes/c-api.txt | 2 +
doc/notes/coding-conventions.txt | 2 +
doc/notes/core-classes.txt | 2 +
doc/notes/docs.txt | 2 +
doc/notes/future.txt | 2 +
doc/notes/goals.txt | 2 +
doc/notes/intro.txt | 2 +
doc/notes/io.txt | 2 +
doc/notes/misc.txt | 2 +
doc/notes/pipeline.txt | 2 +
doc/notes/stages.txt | 2 +
doc/notes/testing.txt | 2 +
doc/notes/use-cases.txt | 2 +
doc/sprint/notes.txt | 6 +
include/libpc/Consumer.hpp | 86 --
include/libpc/Producer.hpp | 60 -
include/libpc/Reader.hpp | 60 +
include/libpc/Stage.hpp | 2 +-
include/libpc/Writer.hpp | 89 ++
include/libpc/drivers/faux/Reader.hpp | 4 +-
include/libpc/drivers/faux/Writer.hpp | 4 +-
include/libpc/drivers/las/Reader.hpp | 4 +-
include/libpc/drivers/las/Writer.hpp | 6 +-
include/libpc/drivers/liblas/Header.hpp | 63 +
include/libpc/drivers/liblas/Reader.hpp | 102 ++
include/libpc/drivers/liblas/Writer.hpp | 95 ++
include/libpc/drivers/liblas/header.hpp | 63 -
include/libpc/drivers/liblas/reader.hpp | 102 --
include/libpc/drivers/liblas/writer.hpp | 95 --
include/libpc/drivers/oci/Reader.hpp | 74 +
include/libpc/drivers/oci/Writer.hpp | 120 ++
include/libpc/drivers/oci/reader.hpp | 74 -
include/libpc/drivers/oci/writer.hpp | 120 --
include/libpc/filters/CacheFilter.hpp | 8 +-
include/libpc/filters/ColorFilter.hpp | 5 +-
include/libpc/filters/CropFilter.hpp | 5 +-
include/libpc/filters/DecimationFilter.hpp | 6 +-
include/libpc/filters/MosaicFilter.hpp | 5 +-
src/CMakeLists.txt | 8 +-
src/Consumer.cpp | 110 --
src/Producer.cpp | 67 -
src/Reader.cpp | 67 +
src/Writer.cpp | 110 ++
src/drivers/faux/Reader.cpp | 4 +-
src/drivers/faux/Writer.cpp | 2 +-
src/drivers/las/Reader.cpp | 2 +-
src/drivers/las/Writer.cpp | 25 +-
src/drivers/liblas/CMakeLists.txt | 4 +-
src/drivers/liblas/Header.cpp | 66 +
src/drivers/liblas/Reader.cpp | 337 ++++++++
src/drivers/liblas/Writer.cpp | 284 +++++++
src/drivers/liblas/header.cpp | 66 -
src/drivers/liblas/reader.cpp | 337 --------
src/drivers/liblas/writer.cpp | 290 -------
src/drivers/oci/CMakeLists.txt | 4 +-
src/drivers/oci/Reader.cpp | 76 +
src/drivers/oci/Writer.cpp | 1126 ++++++++++++++++++++++++++++
src/drivers/oci/reader.cpp | 76 -
src/drivers/oci/writer.cpp | 1126 ----------------------------
src/filters/CacheFilter.cpp | 5 +-
src/filters/ColorFilter.cpp | 5 +-
src/filters/CropFilter.cpp | 5 +-
src/filters/DecimationFilter.cpp | 5 +-
src/filters/MosaicFilter.cpp | 5 +-
test/unit/CacheFilterTest.cpp | 1 +
test/unit/CropFilterTest.cpp | 1 +
test/unit/DecimationFilterTest.cpp | 1 +
test/unit/MosaicFilterTest.cpp | 1 +
78 files changed, 3361 insertions(+), 2741 deletions(-)
diffs (truncated from 6756 to 300 lines):
diff -r a795fe09bff1 -r d6cf2a007f17 .hgignore
--- a/.hgignore Tue Mar 15 16:29:46 2011 -0400
+++ b/.hgignore Tue Mar 15 21:51:33 2011 -0400
@@ -34,3 +34,4 @@
csharp/libpc_swig_cpp/libpc_wrap.cpp
Makefile
+doc/build
diff -r a795fe09bff1 -r d6cf2a007f17 apps/pcinfo.cpp
--- a/apps/pcinfo.cpp Tue Mar 15 16:29:46 2011 -0400
+++ b/apps/pcinfo.cpp Tue Mar 15 21:51:33 2011 -0400
@@ -78,7 +78,7 @@
std::istream* ifs = Utils::openFile(m_inputFile);
- libpc::Producer* reader = NULL;
+ libpc::Reader* reader = NULL;
if (hasOption("native"))
{
reader = new LasReader(*ifs);
diff -r a795fe09bff1 -r d6cf2a007f17 doc/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/Makefile Tue Mar 15 21:51:33 2011 -0400
@@ -0,0 +1,130 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/libPC.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/libPC.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/libPC"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/libPC"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ make -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
diff -r a795fe09bff1 -r d6cf2a007f17 doc/_static/dummy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/_static/dummy Tue Mar 15 21:51:33 2011 -0400
@@ -0,0 +1,1 @@
+
diff -r a795fe09bff1 -r d6cf2a007f17 doc/_templates/dummy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/_templates/dummy Tue Mar 15 21:51:33 2011 -0400
@@ -0,0 +1,1 @@
+
diff -r a795fe09bff1 -r d6cf2a007f17 doc/conf.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/conf.py Tue Mar 15 21:51:33 2011 -0400
@@ -0,0 +1,256 @@
+# -*- coding: utf-8 -*-
+#
+# libPC documentation build configuration file, created by
+# sphinx-quickstart on Tue Mar 15 15:22:19 2011.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.txt'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'libPC'
+copyright = u'2011, Howard Butler'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.0.1'
+# The full version, including alpha/beta/rc tags.
+release = '0.0.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
More information about the Liblas-commits
mailing list