rc_patches (strawlab#167)

* add obj load function. document modified. use UTF-8 BOM off set.(ps1 files UTF-8 BOM) Unnecessary folder reference([setup.py] - pcl/tests) * travis CI python test module changed(remove 3.4, add 3.6)
Vahid44 · Mar 2, 2018 · 215c89f · 215c89f
1 parent 1921feb
commit 215c89f
Show file tree

Hide file tree

Showing 28 changed files with 793 additions and 452 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,12 +18,12 @@ matrix:
     #   - PCL_VERSION="1.7"
     #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
     # - os: linux
-    #   python: "3.4"
+    #   python: "3.5"
     #   env:
     #   - PCL_VERSION="1.7"
     #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
     # - os: linux
-    #   python: "3.5"
+    #   python: "3.6"
     #   env:
     #   - PCL_VERSION="1.7"
     #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
@@ -41,7 +41,7 @@ matrix:
       - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
       - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
     - os: linux
-      python: "3.4"
+      python: "3.5"
       addons:
         apt:
           sources:
@@ -53,7 +53,7 @@ matrix:
       - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
       - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
     - os: linux
-      python: "3.5"#
+      python: "3.6"
       addons:
         apt:
           sources:
@@ -84,7 +84,7 @@ matrix:
     #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
     #   - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
     # - os: linux
-    #   python: "3.4"
+    #   python: "3.5"
     #   addons:
     #     apt:
     #       sources:
@@ -97,7 +97,7 @@ matrix:
     #   - NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
     #   - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
     # - os: linux
-    #   python: "3.5"
+    #   python: "3.6"
     #   addons:
     #     apt:
     #       sources:
@@ -116,11 +116,11 @@ matrix:
     #   env:
     #   - PCL_VERSION="1.8"
     # - os: linux
-    #   python: "3.4"
+    #   python: "3.5"
     #   env:
     #   - PCL_VERSION="1.8"
     # - os: linux
-    #   python: "3.5"
+    #   python: "3.6"
     #   env:
     #   - PCL_VERSION="1.8"
 
@@ -138,15 +138,15 @@ matrix:
       language: generic
       compiler: gcc
       env:
-      - PYTHON_VERSION=3.4.3
+      - PYTHON_VERSION=3.5.1
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
       - NOSEATTR="not pcl_ver_0_4"
     - os: osx
       language: generic
       compiler: gcc
       env:
-      - PYTHON_VERSION=3.5.1
+      - PYTHON_VERSION=3.6.0
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
       - NOSEATTR="not pcl_ver_0_4"
@@ -164,22 +164,24 @@ matrix:
     #   language: generic
     #   compiler: clang
     #   env:
-    #   - PYTHON_VERSION=3.4.3
+    #   - PYTHON_VERSION=3.5.1
     #   - PYENV_ROOT=~/.pyenv
     #   - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
     #   - NOSEATTR="not pcl_ver_0_4"
     # - os: osx
     #   language: generic
     #   compiler: clang
     #   env:
-    #   - PYTHON_VERSION=3.5.1
+    #   - PYTHON_VERSION=3.6.0
     #   - PYENV_ROOT=~/.pyenv
     #   - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
     #   - NOSEATTR="not pcl_ver_0_4"
 
 
 # pcl 1.8.1 only(MacOSX/Ubuntu)
 # pcl_2d-1.8.pc copy /usr/local/lib/pkgconfig/pcl_2d-1.8.pc
+# Check command
+# pkg-config pcl_2d-1.8 --libs
 before_install:
   - if [ ${TRAVIS_OS_NAME} = "osx" ]; then
       brew update >/dev/null;

diff --git a/appveyor.yml b/appveyor.yml
@@ -31,6 +31,17 @@ environment:
     APPVEYOR_OPENNI_ROOT: ".\\AppVeyor\\OpenNI2\\x64\\Redist"
     NOSEATTR: "not pcl_ver_0_4"
 
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    PYTHON: "C:\\Miniconda36-x64"
+    PYTHON_VERSION: "3.6"
+    PYTHON_ARCH: "64"
+    PCL_ROOT: "C:\\Program Files\\PCL 1.8.1"
+    PCL_VERSION: "1.8"
+    OPENNI_VERSION: "2.2"
+    OPENNI_ROOT: "C:\\Program Files\\OpenNI2\\Redist\\"
+    APPVEYOR_OPENNI_ROOT: ".\\AppVeyor\\OpenNI2\\x64\\Redist"
+    NOSEATTR: "not pcl_ver_0_4"
+
 install:
   # If there is a newer build queued for the same PR, cancel this one.
   # The AppVeyor 'rollout builds' option is supposed to serve the same

diff --git a/docs/source/reference/index.rst b/docs/source/reference/index.rst
@@ -19,6 +19,6 @@ Reference
 .. module:: python-pcl
 
 .. toctree::
-   :maxdepth: 10
+   :maxdepth: 1
 
    pcl
diff --git a/docs/source/reference/pcl.rst b/docs/source/reference/pcl.rst
@@ -1,125 +1,22 @@
-pcl
-===
+pcl package
+===========
 
-.. automodule:: pcl
+Submodules
+----------
 
-
-
-   .. rubric:: Functions
+pcl\.\_pcl module(Base PCL1.8.0)
+--------------------------------
 
-   .. autosummary::
-
-      deg2rad
-      load
-      load2
-      load_PointWithViewpoint
-      load_XYZI
-      load_XYZRGB
-      load_XYZRGBA
-      rad2deg
-      save
-      save2
-      save_PointNormal
-      save_XYZRGBA
-
-
+.. automodule:: pcl._pcl
+    :members:
+    :undoc-members:
+    :show-inheritance:
 
-
-
-   .. rubric:: Classes
 
-   .. autosummary::
-
-      ApproximateVoxelGrid
-      ApproximateVoxelGrid_PointXYZI
-      ApproximateVoxelGrid_PointXYZRGB
-      ApproximateVoxelGrid_PointXYZRGBA
-      ConcaveHull
-      ConcaveHull_PointXYZI
-      ConcaveHull_PointXYZRGB
-      ConcaveHull_PointXYZRGBA
-      ConditionAnd
-      ConditionalRemoval
-      CropBox
-      CropHull
-      EuclideanClusterExtraction
-      GeneralizedIterativeClosestPoint
-      HarrisKeypoint3D
-      IntegralImageNormalEstimation
-      IterativeClosestPoint
-      IterativeClosestPointNonLinear
-      KdTree
-      KdTreeFLANN
-      KdTreeFLANN_PointXYZI
-      KdTreeFLANN_PointXYZRGB
-      KdTreeFLANN_PointXYZRGBA
-      MomentOfInertiaEstimation
-      MovingLeastSquares
-      MovingLeastSquares_PointXYZRGB
-      MovingLeastSquares_PointXYZRGBA
-      NormalDistributionsTransform
-      NormalEstimation
-      OctreePointCloud
-      OctreePointCloud2Buf
-      OctreePointCloud2Buf_PointXYZI
-      OctreePointCloud2Buf_PointXYZRGB
-      OctreePointCloud2Buf_PointXYZRGBA
-      OctreePointCloudChangeDetector
-      OctreePointCloudChangeDetector_PointXYZI
-      OctreePointCloudChangeDetector_PointXYZRGB
-      OctreePointCloudChangeDetector_PointXYZRGBA
-      OctreePointCloudSearch
-      OctreePointCloudSearch_PointXYZI
-      OctreePointCloudSearch_PointXYZRGB
-      OctreePointCloudSearch_PointXYZRGBA
-      OctreePointCloud_PointXYZI
-      OctreePointCloud_PointXYZRGB
-      OctreePointCloud_PointXYZRGBA
-      PCLPointCloud2
-      PassThroughFilter
-      PassThroughFilter_PointXYZI
-      PassThroughFilter_PointXYZRGB
-      PassThroughFilter_PointXYZRGBA
-      PointCloud
-      PointCloud_Histogram
-      PointCloud_Normal
-      PointCloud_PointNormal
-      PointCloud_PointWithViewpoint
-      PointCloud_PointXYZI
-      PointCloud_PointXYZRGB
-      PointCloud_PointXYZRGBA
-      PointIndices
-      ProjectInliers
-      ROPSEstimation
-      RadiusOutlierRemoval
-      RandomSampleConsensus
-      RangeImages
-      SampleConsensusModel
-      SampleConsensusModelCylinder
-      SampleConsensusModelLine
-      SampleConsensusModelPlane
-      SampleConsensusModelRegistration
-      SampleConsensusModelSphere
-      SampleConsensusModelStick
-      Segmentation
-      SegmentationNormal
-      Segmentation_PointXYZI
-      Segmentation_PointXYZI_Normal
-      Segmentation_PointXYZRGB
-      Segmentation_PointXYZRGBA
-      Segmentation_PointXYZRGBA_Normal
-      Segmentation_PointXYZRGB_Normal
-      Sequence
-      StatisticalOutlierRemovalFilter
-      StatisticalOutlierRemovalFilter_PointXYZI
-      StatisticalOutlierRemovalFilter_PointXYZRGB
-      StatisticalOutlierRemovalFilter_PointXYZRGBA
-      VFHEstimation
-      Vertices
-      VoxelGridFilter
-
-
+Module contents
+---------------
 
-
-
-
+.. automodule:: pcl
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/source/spelling_wordlist.txt b/docs/source/spelling_wordlist.txt
@@ -11,7 +11,6 @@ bool
 boolean
 broadcast
 broadcasted
-Caffe
 Cifer
 channelwise
 compatibilities
@@ -26,7 +25,6 @@ covariance
 CPU
 CTC
 CUDA
-python-pcl
 customizable
 dataset
 datasets
@@ -117,6 +115,7 @@ profiler
 profilers
 proto
 PRs
+python-pcl
 quantization
 reimplement
 reinstall