Merge branch 'master' into sudo

Dockerfile

@@ -14,9 +14,9 @@ RUN apt-get update -y
 # All packages (Will install much faster)
 RUN apt-get install --no-install-recommends -y git cmake python-pip build-essential software-properties-common python-software-properties libgdal-dev gdal-bin libgeotiff-dev \
 libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libflann-dev \
-libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk5-dev python-networkx libgoogle-glog-dev libsuitesparse-dev libboost-filesystem-dev libboost-iostreams-dev \
+libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk6-dev python-networkx libgoogle-glog-dev libsuitesparse-dev libboost-filesystem-dev libboost-iostreams-dev \
 libboost-regex-dev libboost-python-dev libboost-date-time-dev libboost-thread-dev python-pyproj python-empy python-nose python-pyside python-pyexiv2 python-scipy \
-libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev libgmp-dev libmpfr-dev swig2.0 python-wheel libboost-log-dev libjsoncpp-dev
+libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log-dev libjsoncpp-dev python-gdal
 
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
@@ -53,15 +53,14 @@ COPY VERSION /code/VERSION
 RUN cd SuperBuild && mkdir build && cd build && cmake  .. && make -j$(nproc)     && cd ../.. && mkdir build && cd build && cmake .. && make -j$(nproc)
 
 RUN apt-get -y remove libgl1-mesa-dri git cmake python-pip build-essential
-RUN apt-get install -y libvtk5-dev
+RUN apt-get install -y libvtk6-dev
 
 # Cleanup APT
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 
 
 # Clean Superbuild
 
-RUN rm -rf /code/SuperBuild/download 
-RUN rm -rf /code/SuperBuild/src/opencv/samples /code/SuperBuild/src/pcl/test /code/SuperBuild/src/pcl/doc /code/SuperBuild/src/pdal/test /code/SuperBuild/src/pdal/doc
+RUN rm -rf /code/SuperBuild/download /code/SuperBuild/src/vtk7 /code/SuperBuild/src/opencv /code/SuperBuild/src/pcl /code/SuperBuild/src/pdal /code/SuperBuild/src/opengv /code/SuperBuild/src/mvstexturing /code/SuperBuild/src/ceres /code/SuperBuild/build/vtk7 /code/SuperBuild/build/opencv
 
 # Entry point
 ENTRYPOINT ["python", "/code/run.py", "code"]

README.md

@@ -147,8 +147,8 @@ You can also view the orthophoto GeoTIFF in [QGIS](http://www.qgis.org/) or othe
 
 ## Build and Run Using Docker
 
-(Instructions below apply to Ubuntu 14.04, but the Docker image workflow
-has equivalent procedures for Mac OS X and Windows. See [docs.docker.com](docs.docker.com))
+(Instructions below apply to Ubuntu 14.04, but the Docker image workflow 
+has equivalent procedures for Mac OS X and Windows. See [docs.docker.com](https://docs.docker.com/))
 
 OpenDroneMap is Dockerized, meaning you can use containerization to build and run it without tampering with the configuration of libraries and packages already
 installed on your machine. Docker software is free to install and use in this context. If you don't have it installed,

SuperBuild/CMakeLists.txt

@@ -91,12 +91,15 @@ SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
 
 
 # ---------------------------------------------------------------------------------------------
-# CGAL
-#
-set(ODM_CGAL_Version 4.9)
-option(ODM_BUILD_CGAL "Force to build CGAL library" OFF)
+# VTK7
+# We need to build VTK from sources because Debian packages
+# are built with DVTK_SMP_IMPLEMENTATION_TYPE set to 
+# "Sequential" which means no multithread support.
+
+set(ODM_VTK7_Version 7.1.1)
+option(ODM_BUILD_VTK7 "Force to build VTK7 library" OFF)
 
-SETUP_EXTERNAL_PROJECT(CGAL ${ODM_CGAL_Version} ${ODM_BUILD_CGAL})
+SETUP_EXTERNAL_PROJECT(VTK7 ${ODM_VTK7_Version} ${ODM_BUILD_VTK7})
 
 # ---------------------------------------------------------------------------------------------
 # Hexer

SuperBuild/cmake/External-CGAL.cmake → SuperBuild/cmake/External-VTK7.cmake

@@ -1,4 +1,4 @@
-set(_proj_name cgal)
+set(_proj_name vtk7)
 set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
 
 ExternalProject_Add(${_proj_name}
@@ -7,14 +7,17 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}/${_proj_name}
-  URL               https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/CGAL-4.9.zip
-  URL_MD5           31c08d762a72fda785df194c89b833df
+  URL               https://github.com/Kitware/VTK/archive/v7.1.1.zip
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
   SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
   CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
+    -DVTK_SMP_IMPLEMENTATION_TYPE=TBB 
+    -DCMAKE_BUILD_TYPE=Release 
+    -DVTK_Group_Rendering=OFF 
+    -DBUILD_TESTING=OFF
   #--Build step-----------------
   BINARY_DIR        ${_SB_BINARY_DIR}
   #--Install step---------------

configure.sh

@@ -28,7 +28,8 @@ install() {
                          gdal-bin \
                          libgeotiff-dev \
                          pkg-config \
-                         libjsoncpp-dev
+                         libjsoncpp-dev \
+                         python-gdal
 
     echo "Getting CMake 3.1 for MVS-Texturing"
     apt-get install -y software-properties-common python-software-properties
@@ -79,9 +80,6 @@ install() {
                         appsettings \
                         loky
 
-    echo "Installing CGAL dependencies"
-    apt-get install -y -qq libgmp-dev libmpfr-dev
-
     echo "Installing Ecto Dependencies"
     pip install -U catkin-pkg
     apt-get install -y -qq python-empy \

core2.Dockerfile

@@ -12,9 +12,9 @@ RUN apt-get update -y
 # All packages (Will install much faster)
 RUN apt-get install --no-install-recommends -y git cmake python-pip build-essential software-properties-common python-software-properties libgdal-dev gdal-bin libgeotiff-dev \
 libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libflann-dev \
-libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk5-dev python-networkx libgoogle-glog-dev libsuitesparse-dev libboost-filesystem-dev libboost-iostreams-dev \
+libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk6-dev python-networkx libgoogle-glog-dev libsuitesparse-dev libboost-filesystem-dev libboost-iostreams-dev \
 libboost-regex-dev libboost-python-dev libboost-date-time-dev libboost-thread-dev python-pyproj python-empy python-nose python-pyside python-pyexiv2 python-scipy \
-libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev libgmp-dev libmpfr-dev swig2.0 python-wheel libboost-log-dev libjsoncpp-dev
+libexiv2-dev liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log-dev libjsoncpp-dev python-gdal
 
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
@@ -54,15 +54,14 @@ RUN mv -v /usr/bin/gcc /usr/bin/gcc_real && mv -v /usr/bin/g++ /usr/bin/g++_real
 RUN cd SuperBuild && mkdir build && cd build && cmake  .. && make -j$(nproc)     && cd ../.. && mkdir build && cd build && cmake .. && make -j$(nproc)
 
 RUN apt-get -y remove libgl1-mesa-dri git cmake python-pip build-essential
-RUN apt-get install -y libvtk5-dev
+RUN apt-get install -y libvtk6-dev
 
 # Cleanup APT
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 
 
 # Clean Superbuild
 
-RUN rm -rf /code/SuperBuild/download 
-RUN rm -rf /code/SuperBuild/src/opencv/samples /code/SuperBuild/src/pcl/test /code/SuperBuild/src/pcl/doc /code/SuperBuild/src/pdal/test /code/SuperBuild/src/pdal/doc
+RUN rm -rf /code/SuperBuild/download /code/SuperBuild/src/vtk7 /code/SuperBuild/src/opencv /code/SuperBuild/src/pcl /code/SuperBuild/src/pdal /code/SuperBuild/src/opengv /code/SuperBuild/src/mvstexturing /code/SuperBuild/src/ceres /code/SuperBuild/build/vtk7 /code/SuperBuild/build/opencv
 
 # Entry point
 ENTRYPOINT ["python", "/code/run.py", "code"]

modules/odm_25dmeshing/CMakeLists.txt

@@ -3,45 +3,21 @@ cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
 
-# Set pcl dir to the input spedified with option -DCGAL_DIR="path"
-set(CGAL_DIR "CGAL_DIR-NOTFOUND" CACHE "CGAL_DIR" "Path to the CGAL installation directory")
-
-# Link
-find_package(CGAL COMPONENTS Core HINTS "${CGAL_DIR}")
-
-if ( CGAL_FOUND )
-
-  find_package( Eigen3 )
-
-  if( EIGEN3_FOUND )
-    include_directories(${EIGEN3_INCLUDE_DIR})
-    add_definitions(-DCGAL_EIGEN3_ENABLED)
-  else()
-    message(FATAL_ERROR "This program requires the Eigen3 library, and will not be compiled.")
-  endif()
-
-  include( ${CGAL_USE_FILE} )
-
-  find_package( TBB )
-  if( TBB_FOUND )
-    include(${TBB_USE_FILE})
-  else()
-    message(WARNING "TBB not found, parallel processing will be disabled.")
-  endif()
-
-  # Add compiler options.
-  add_definitions(-Wall -Wextra -std=c++11)
-
-  # Add source directory
-  aux_source_directory("./src" SRC_LIST)
+set (CMAKE_CXX_STANDARD 11)
+#set(VTK_DIR "/data/packages/VTK-7.1.1-build")
+set(VTK_SMP_IMPLEMENTATION_TYPE TBB)
+find_package(VTK 7.1.1 REQUIRED)
+include(${VTK_USE_FILE})
+
+# Add compiler options.
+#add_definitions(-Wall -Wextra -O0 -g3)
+add_definitions(-Wall -Wextra)
+
+# Add source directory
+aux_source_directory("./src" SRC_LIST)
 
-  # Add exectuteable
-  add_executable(${PROJECT_NAME} ${SRC_LIST})
+# Add exectuteable
+add_executable(${PROJECT_NAME} ${SRC_LIST})
 
-  target_link_libraries(odm_25dmeshing ${CGAL_LIBRARIES} ${TBB_LIBRARIES})
-else()
-
-    message(FATAL_ERROR "This program requires the CGAL library, and will not be compiled.")
-
-endif()
+target_link_libraries(odm_25dmeshing ${VTK_LIBRARIES})