[pdal] 01/06: Imported Upstream version 1.3.0
Bas Couwenberg
sebastic at debian.org
Mon Aug 29 18:37:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pdal.
commit a6554c2b2fe67bf011a43dc86b2ecf8f94df4153
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Aug 29 19:28:16 2016 +0200
Imported Upstream version 1.3.0
---
CMakeLists.txt | 4 +-
RELEASENOTES.txt | 3 +
apps/pdal-config | 14 ++--
cmake/hdf5.cmake | 3 +
doc/development/integration.rst | 2 +-
doc/images/docker-print-one.png | Bin 45415 -> 40547 bytes
doc/images/docker-quickstart-env.png | Bin 96142 -> 54091 bytes
doc/images/docker-quickstart-pull.png | Bin 0 -> 68548 bytes
doc/images/docker-quickstart-share.png | Bin 0 -> 55279 bytes
doc/quickstart.rst | 121 ++++++++++++-----------------
doc/stages/filters.approximatecoplanar.rst | 12 +--
doc/stages/filters.normal.rst | 6 +-
scripts/docker/Dockerfile | 4 +-
src/gitsha.cpp | 2 +-
14 files changed, 81 insertions(+), 90 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b9cad8..6cd11e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,7 +209,9 @@ export(PACKAGE PDAL)
# TODO: move under scripts/bash-completion ?
if (WITH_COMPLETION)
- if (IS_DIRECTORY /etc/bash_completion.d)
+ if (IS_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions)
+ install(FILES "${PROJECT_SOURCE_DIR}/scripts/bash-completion/pdal" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions")
+ elseif (IS_DIRECTORY /etc/bash_completion.d)
install(FILES "${PROJECT_SOURCE_DIR}/scripts/bash-completion/pdal" DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d")
endif()
endif()
diff --git a/RELEASENOTES.txt b/RELEASENOTES.txt
index 321c011..52786dd 100644
--- a/RELEASENOTES.txt
+++ b/RELEASENOTES.txt
@@ -22,6 +22,9 @@ Changes of Note:
'--debug' option is deprecated, and if specified on the command line is
equivalent to '--verbose=3'. One can enable logging programmatically by
calling setLog() on a PipelineManager or a specific stage.
+- pdal::Dimension types are now C++11 enumeration classes. The change may
+ require editing any Stage implementations you might have and removing the
+ extraneous ::Enum type specification.
Enhancements:
diff --git a/apps/pdal-config b/apps/pdal-config
index c37bb9f..e1cae46 100644
--- a/apps/pdal-config
+++ b/apps/pdal-config
@@ -1,7 +1,7 @@
#!/bin/sh
-prefix=/usr
-exec_prefix=/usr/bin
-libdir=/usr/lib
+prefix=/usr/local
+exec_prefix=/usr/local/bin
+libdir=/usr/local/lib
usage()
{
@@ -26,11 +26,11 @@ fi
case $1 in
--libs)
- echo -L/usr/lib -lpdalcpp
+ echo -L/usr/local/lib -lpdalcpp
;;
--plugin-dir)
- echo /usr/lib
+ echo /usr/local/lib
;;
--prefix)
@@ -46,7 +46,7 @@ case $1 in
;;
--includes)
- echo -I/usr/include -I/usr/include/gdal -I/usr/include/libxml2 -I/usr/include -I/usr/include
+ echo -I/usr/local/include -I/usr/include/gdal -I/usr/include/libxml2 -I/usr/include -I/usr/include
;;
--cflags)
@@ -62,7 +62,7 @@ case $1 in
;;
--python-version)
- echo 2.7.12
+ echo
;;
*)
diff --git a/cmake/hdf5.cmake b/cmake/hdf5.cmake
index 98cd7ea..d2b0a71 100644
--- a/cmake/hdf5.cmake
+++ b/cmake/hdf5.cmake
@@ -5,6 +5,9 @@
set (HDF5_FIND_COMPONENTS "CXX")
find_package(HDF5 COMPONENTS CXX REQUIRED)
if(HDF5_FOUND)
+ if(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR)
+ set(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
+ endif()
include_directories(${HDF5_INCLUDE_DIR})
add_definitions(-DHAVE_HDF5=1)
set(PDAL_HAVE_HDF5 1)
diff --git a/doc/development/integration.rst b/doc/development/integration.rst
index fa70784..11202b8 100644
--- a/doc/development/integration.rst
+++ b/doc/development/integration.rst
@@ -17,7 +17,7 @@ Status
.. |travisstatus| image:: https://travis-ci.org/PDAL/PDAL.png?branch=master
:target: https://travis-ci.org/PDAL/PDAL
-.. |appveyorstatus| image:: https://ci.appveyor.com/api/projects/status/github/pdal/pdal?branch=master&svg=true
+.. |appveyorstatus| image:: https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3/branch/master?svg=true
:target: https://ci.appveyor.com/project/hobu/pdal
.. _travis:
diff --git a/doc/images/docker-print-one.png b/doc/images/docker-print-one.png
index 52dd535..84541d1 100644
Binary files a/doc/images/docker-print-one.png and b/doc/images/docker-print-one.png differ
diff --git a/doc/images/docker-quickstart-env.png b/doc/images/docker-quickstart-env.png
index 39a34a5..cb57866 100644
Binary files a/doc/images/docker-quickstart-env.png and b/doc/images/docker-quickstart-env.png differ
diff --git a/doc/images/docker-quickstart-pull.png b/doc/images/docker-quickstart-pull.png
new file mode 100644
index 0000000..369ca82
Binary files /dev/null and b/doc/images/docker-quickstart-pull.png differ
diff --git a/doc/images/docker-quickstart-share.png b/doc/images/docker-quickstart-share.png
new file mode 100644
index 0000000..081ee4a
Binary files /dev/null and b/doc/images/docker-quickstart-share.png differ
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 0a7fff9..64474c2 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -9,9 +9,16 @@ Quickstart
Introduction
------------------------------------------------------------------------------
-It's a giant pain to build everything yourself. To make it simpler to use PDAL, a
-build based on Docker is available. This document describes how
-to use it to print the first point of an :ref:`ASPRS LAS <readers.las>` file.
+It's a giant pain to build everything yourself. The quickest way to start using
+PDAL is to leverage builds that were constructed by the PDAL development team
+using `Docker`_. Docker is a containerization technology that allows you to
+run pre-built software in a way that is isolated from your system. Think of
+it like a binary that doesn't depend on your operating system's configuration
+to be able to run.
+
+This exercise will print the first point of an :ref:`ASPRS LAS <readers.las>` file.
+It will utilize the PDAL :ref:`command line application <apps>` to inspect the
+file.
.. _docker:
@@ -19,16 +26,12 @@ to use it to print the first point of an :ref:`ASPRS LAS <readers.las>` file.
Install Docker
------------------------------------------------------------------------------
-
-The Docker configuration that PDAL provides contains nearly every possible
-feature except for `Oracle Point Cloud`_ support. Things it includes are:
-
Docker starting documentation can be found at the following links. Read through
them a bit for your platform so you have an idea what to expect.
-* `Windows <http://docs.docker.com/windows/started/>`__
-* `OSX <http://docs.docker.com/mac/started/>`__
-* `Linux <http://docs.docker.com/linux/started/>`__
+* `Windows <https://docs.docker.com/docker-for-windows/>`__
+* `OSX <https://docs.docker.com/docker-for-mac/>`__
+* `Linux <https://docs.docker.com/engine/installation/linux/>`__
.. _`Docker Toolbox`: https://www.docker.com/docker-toolbox
@@ -38,31 +41,27 @@ them a bit for your platform so you have an idea what to expect.
work in OSX or Linux too -- though definition of file paths might provide
a significant difference.
-.. seealso::
+Enable Docker access to your machine
+................................................................................
+
+In order for Docker to be able to interact with data on your machine, you must
+make sure to tell it to be able to read your drive(s). Right-click on the
+little Docker whale icon in you System Tray, choose Settings, and click
+the Shared box by your C drive:
+
+.. image:: ./images/docker-quickstart-share.png
- :ref:`apps` provides detailed information on using PDAL applications, and
- :ref:`workshop` provides a full suite of exercises you can follow to learn
- how to use PDAL with Docker.
Run Docker Quickstart Terminal
................................................................................
`Docker`_ is most easily accessed using a terminal window that it configures
-with environment variables and such. Double-click on the "Docker Quickstart Terminal"
-link on your desktop (Windows) or run the "Docker Quickstart Terminal" application
-(Mac).
-
-After some text scrolls by, you should see something like the following image
-:
-
-.. image:: ./images/docker-quickstart-terminal.png
-
-To be sure Docker is working correctly and everything is happy,
-issue the following command and confirm that it reports similar information:
+with environment variables and such. Run PowerShell or `cmd.exe` and issue
+a simple `info` command to verify that things are operating correctly:
::
- docker-machine env default
+ docker info
.. image:: ./images/docker-quickstart-env.png
@@ -77,12 +76,15 @@ whatever reason.
::
- docker pull pdal/pdal
+ docker pull pdal/pdal:1.3
+
+
+.. image:: ./images/docker-quickstart-pull.png
.. note::
Other PDAL versions are provided at the same `Docker Hub`_ location,
- with an expected tag name (ie ``pdal/pdal:1.2``, or ``pdal/pdal:1.x``) for
+ with an expected tag name (ie ``pdal/pdal:1.3``, or ``pdal/pdal:1.x``) for
major PDAL versions. The PDAL Docker hub location at
https://hub.docker.com/u/pdal/ has images and more information
on this topic.
@@ -93,34 +95,26 @@ Fetch Sample Data
------------------------------------------------------------------------------
We need some sample data to play with, so we're going to download
-the ``autzen.laz`` file to your ``C:/Users/Howard`` drive. Inside the
-`Docker Quickstart Terminal`, issue the following ``curl`` command:
+the ``autzen.laz`` file to your ``C:/Users/hobu/Downloads`` fold.
+Inside your terminal, issue the following command:
::
- curl -O http://www.liblas.org/samples/autzen/autzen.laz
-
-.. note::
-
- That's a capital Oh, not a zero.
-
-List the directory to be sure that it was downloaded
+ explorer.exe http://www.liblas.org/samples/autzen/autzen.laz
::
- ls *.laz
+ cd C:/Users/hobu/Downloads
+ copy autzen.laz ..
+
Print the first point
------------------------------------------------------------------------------
-Docker
-................................................................................
-
-Run the following command in the `Docker Quickstart Terminal`
::
- docker run -v /c/Users/Howard:/data pdal/pdal pdal info /data/autzen.laz -p 0
+ docker run -v /c/Users/hobu:/data pdal/pdal:1.3 pdal info /data/autzen.laz -p 0
Here's a summary of what's going on with that command invocation
@@ -129,7 +123,7 @@ Here's a summary of what's going on with that command invocation
2. ``run``: Tells docker we're going to run an image
-3. ``-v /c/Users/Howard:/data``: Maps our home directory to a directory called
+3. ``-v /c/Users/hobu:/data``: Maps our home directory to a directory called
``/data`` inside the container.
@@ -138,7 +132,7 @@ Here's a summary of what's going on with that command invocation
The `Docker Volume <https://docs.docker.com/engine/userguide/dockervolumes/>`__
document describes mounting volumes in more detail.
-4. ``pdal/pdal``: This is the Docker image we are going to run. We fetched it
+4. ``pdal/pdal:1.3``: This is the Docker image we are going to run. We fetched it
with the command above. If it were not already fetched, Docker would attempt
to fetch it when we run this command.
@@ -151,36 +145,23 @@ Here's a summary of what's going on with that command invocation
mount operation in Step #3. Our ``autzen.laz`` file resides there.
-Native
-................................................................................
-
-Run the following command in a terminal window:
-
-::
-
- pdal info /data/autzen.laz -p 0
-
-
-Here's a summary of what's going on with that command invocation
-
-
-1. ``pdal``: We're finally going to run the ``pdal`` command :)
-
-2. ``info``: We want to run :ref:`info_command` on the data
-
-3. ``/data/autzen.laz``: Read our ``autzen.laz`` file .
-
-
.. image:: ./images/docker-print-one.png
What's next?
------------------------------------------------------------------------------
-Visit :ref:`apps` to find out how to utilize PDAL applications to process data
-on the command line yourself. Visit :ref:`development_index` to learn how to
-embed and use PDAL in your own applications. :ref:`readers` lists the formats
-that PDAL can read, :ref:`filters` lists the kinds of operations you can do
-with PDAL, and :ref:`writers` lists the formats PDAL can write.
+* Visit :ref:`apps` to find out how to utilize PDAL applications to process
+ data on the command line yourself.
+* Visit :ref:`development_index` to learn how to embed and use PDAL in your own
+ applications.
+* :ref:`readers` lists the formats that PDAL can read, :ref:`filters` lists the
+ kinds of operations you can do with PDAL, and :ref:`writers` lists the
+ formats PDAL can write.
+* :ref:`tutorial` contains a number of walk-through tutorials for achieving
+ many tasks with PDAL.
+* :ref:`The PDAL workshop <workshop>` contains numerous hands-on examples with screenshots and
+ example data of how to use PDAL :ref:`apps` to tackle point cloud data
+ processing tasks.
.. seealso::
diff --git a/doc/stages/filters.approximatecoplanar.rst b/doc/stages/filters.approximatecoplanar.rst
index c16bd1d..f2e2847 100644
--- a/doc/stages/filters.approximatecoplanar.rst
+++ b/doc/stages/filters.approximatecoplanar.rst
@@ -8,14 +8,14 @@ of points by first computing eigenvalues for the points and then tagging those
points for which the following is true:
.. math::
-
- \lambda_1 > (thresh_1 * \lambda_0) \text{ && } (\lambda_1 * thresh_2) > \lambda2
-
+
+ \lambda_1 > (thresh_1 * \lambda_0) \&\& (\lambda_1 * thresh_2) > \lambda_2
+
where :math:`\lambda_0`, :math:`\lambda_1`, :math:`\lambda_2` are the
eigenvalues in ascending order. The threshold values :math:`thresh_1` and
:math:`thresh_2` are user-defined and default to 25 and 6 respectively.
-The filter returns a point cloud with a new dimension ``Coplanar`` that
+The filter returns a point cloud with a new dimension ``Coplanar`` that
indicates those points that are part of a neighborhood that is approximately
coplanar (1) or not (0).
@@ -55,9 +55,9 @@ Options
knn
The number of k-nearest neighbors. [Default: **8**]
-
+
thresh1
The threshold to be applied to the smallest eigenvalue. [Default: **25**]
-
+
thresh2
The threshold to be applied to the second smallest eigenvalue. [Default: **6**]
diff --git a/doc/stages/filters.normal.rst b/doc/stages/filters.normal.rst
index 44f19a9..3395dd0 100644
--- a/doc/stages/filters.normal.rst
+++ b/doc/stages/filters.normal.rst
@@ -10,9 +10,9 @@ is taken as the eigenvector corresponding to the smallest eigenvalue. The
curvature is computed as
.. math::
-
- curvature = \frac{\lambda_0}{\lambda_0 + \lambda_1 _+ \lambda_2}
-
+
+ curvature = \frac{\lambda_0}{\lambda_0 + \lambda_1 + \lambda_2}
+
where :math:`\lambda_i` are the eigenvalues sorted in ascending order.
The filter produces four new dimensions (``NormalX``, ``NormalY``, ``NormalZ``,
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index eb05607..e464d32 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -156,4 +156,6 @@ RUN apt-get update && apt-get install -y \
libboost-atomic1.58.0 \
libboost-regex1.58.0 \
libgdal1i \
- libflann1.8
+ libflann1.8 \
+ libpython2.7 \
+ libhdf5-cpp-11
diff --git a/src/gitsha.cpp b/src/gitsha.cpp
index 87864b1..9359b1b 100644
--- a/src/gitsha.cpp
+++ b/src/gitsha.cpp
@@ -1,3 +1,3 @@
#include <pdal/gitsha.h>
-#define GIT_SHA1 "68d7edb13949c3da3e1fb1864cf61ed0a160372e"
+#define GIT_SHA1 "efca2f77d8cec2025534d12f2b269711fe375471"
const char g_GIT_SHA1[] = GIT_SHA1;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git
More information about the Pkg-grass-devel
mailing list