diff --git a/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake b/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake index f5011efce41..841a8be87f7 100755 --- a/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake +++ b/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake @@ -42,7 +42,7 @@ configure() { echo "Configuring... " - if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ + if eval 'cmake $CMAKE_GENERATOR -DRUNNING_CGAL_AUTO_TEST=TRUE \ -DCGAL_DIR="$CGAL_DIR" \ .' ; then diff --git a/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake b/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake index 5437f105e06..91852531d4b 100755 --- a/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake +++ b/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake @@ -42,7 +42,7 @@ configure() { echo "Configuring... " - if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ + if eval 'cmake $CMAKE_GENERATOR -DRUNNING_CGAL_AUTO_TEST=TRUE \ -DCGAL_DIR="$CGAL_DIR" \ .' ; then diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt index 8e81f2d4936..970025f8fae 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt @@ -53,13 +53,13 @@ if(QT4_FOUND) find_package(QGLViewer ) endif(QT4_FOUND) -# Find LAPACK (optional), for Jet Fitting -find_package(LAPACK) - -# Find TAUCS (optionnal), for Poisson +# Find BLAS, LAPACK and TAUCS (optional), for Poisson find_package(TAUCS) -# Find Glew (optionnal), for splatting +# Find BLAS and LAPACK only (optional), for Jet Fitting +find_package(LAPACK) + +# Find Glew (optional), for splatting set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/GlSplat/cmake) find_package(GLEW) @@ -67,25 +67,27 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) - if(LAPACK_FOUND) - include( ${LAPACK_USE_FILE} ) - add_definitions(-DCGAL_LAPACK_ENABLED) - else(LAPACK_FOUND) - message(STATUS "warning: LAPACK is not found. Jet Fitting will not be available.") - endif(LAPACK_FOUND) - + # Link with BLAS, LAPACK and TAUCS (optional), for Poisson if(TAUCS_FOUND) include( ${TAUCS_USE_FILE} ) add_definitions(-DCGAL_TAUCS_ENABLED) else(TAUCS_FOUND) - message(STATUS "warning: TAUCS is not found. Poisson reconstruction will not be available.") + message(STATUS "NOTICE: TAUCS library is not found. Poisson reconstruction will not be available.") endif(TAUCS_FOUND) + # Link with BLAS and LAPACK only (optional), for Jet Fitting + if(LAPACK_FOUND) + include( ${LAPACK_USE_FILE} ) + add_definitions(-DCGAL_LAPACK_ENABLED) + else(LAPACK_FOUND) + message(STATUS "NOTICE: LAPACK library is not found. Normal estimation and smoothing will not be available.") + endif(LAPACK_FOUND) + if(GLEW_FOUND) include_directories ( ${GLEW_INCLUDE_DIR} ) add_definitions(-DCGAL_GLEW_ENABLED) else(GLEW_FOUND) - message(STATUS "warning: GLEW is not found. Splatting will not be available.") + message(STATUS "NOTICE: GLEW library is not found. Splat rendering will not be available.") endif(GLEW_FOUND) # VisualC++ optimization for applications dealing with large data @@ -181,9 +183,6 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) Scene_moc.cpp Viewer_moc.cpp ${RESOURCE_FILES} ) - if(TAUCS_FOUND) -# add_executable( Point_set_demo Scene_tex_rendering.cpp Scene_tex_polyhedron_operations.cpp ) - endif() # else(POINT_SET_DEMO_ENABLE_FORWARD_DECL) # add_file_dependencies( Point_set_demo.cpp "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp" # "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp" @@ -237,51 +236,61 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) endmacro(polyhedron_demo_plugin) qt4_wrap_ui( APSS_UI_FILES Point_set_demo_APSS_reconstruction_plugin.ui) - polyhedron_demo_plugin(APSS_reconstruction_plugin + polyhedron_demo_plugin(Point_set_demo_APSS_reconstruction_plugin Point_set_demo_APSS_reconstruction_plugin Point_set_demo_APSS_reconstruction_plugin_cgal_code.cpp Point_set_demo_APSS_reconstruction_plugin_cgal_mc.cpp ${APSS_UI_FILES}) - target_link_libraries(APSS_reconstruction_plugin scene_polyhedron_item point_set) + target_link_libraries(Point_set_demo_APSS_reconstruction_plugin scene_polyhedron_item point_set) - qt4_wrap_ui( POISSON_UI_FILES Point_set_demo_poisson_reconstruction_plugin.ui) - polyhedron_demo_plugin(poisson_reconstruction_plugin - Point_set_demo_poisson_reconstruction_plugin - Point_set_demo_poisson_reconstruction_plugin_cgal_code.cpp - ${POISSON_UI_FILES}) - target_link_libraries(poisson_reconstruction_plugin scene_polyhedron_item point_set) + if(TAUCS_FOUND) + qt4_wrap_ui( POISSON_UI_FILES Point_set_demo_poisson_reconstruction_plugin.ui) + polyhedron_demo_plugin(Point_set_demo_poisson_reconstruction_plugin + Point_set_demo_poisson_reconstruction_plugin + Point_set_demo_poisson_reconstruction_plugin_cgal_code.cpp + ${POISSON_UI_FILES}) + target_link_libraries(Point_set_demo_poisson_reconstruction_plugin scene_polyhedron_item point_set) + endif() - polyhedron_demo_plugin(inside_out_plugin Polyhedron_demo_inside_out_plugin) - target_link_libraries(inside_out_plugin scene_polyhedron_item point_set) + polyhedron_demo_plugin(Polyhedron_demo_inside_out_plugin Polyhedron_demo_inside_out_plugin) + target_link_libraries(Polyhedron_demo_inside_out_plugin scene_polyhedron_item point_set) - polyhedron_demo_plugin(off_plugin Point_set_demo_off_plugin) - target_link_libraries(off_plugin scene_polyhedron_item point_set) + polyhedron_demo_plugin(Point_set_demo_off_plugin Point_set_demo_off_plugin) + target_link_libraries(Point_set_demo_off_plugin scene_polyhedron_item point_set) - polyhedron_demo_plugin(xyz_plugin Point_set_demo_xyz_plugin) - target_link_libraries(xyz_plugin scene_polyhedron_item point_set) + polyhedron_demo_plugin(Point_set_demo_xyz_plugin Point_set_demo_xyz_plugin) + target_link_libraries(Point_set_demo_xyz_plugin scene_polyhedron_item point_set) qt4_wrap_ui(SIMPLIFICATION_UI_FILES Point_set_demo_point_set_simplification_plugin.ui) - polyhedron_demo_plugin(point_set_simplification_plugin + polyhedron_demo_plugin(Point_set_demo_point_set_simplification_plugin Point_set_demo_point_set_simplification_plugin ${SIMPLIFICATION_UI_FILES}) - target_link_libraries(point_set_simplification_plugin point_set) + target_link_libraries(Point_set_demo_point_set_simplification_plugin point_set) - polyhedron_demo_plugin(local_spacing_plugin Point_set_demo_local_spacing_plugin) - target_link_libraries(local_spacing_plugin point_set) + polyhedron_demo_plugin(Point_set_demo_local_spacing_plugin Point_set_demo_local_spacing_plugin) + target_link_libraries(Point_set_demo_local_spacing_plugin point_set) - polyhedron_demo_plugin(average_spacing_plugin Point_set_demo_average_spacing_plugin) - target_link_libraries(average_spacing_plugin point_set) + polyhedron_demo_plugin(Point_set_demo_average_spacing_plugin Point_set_demo_average_spacing_plugin) + target_link_libraries(Point_set_demo_average_spacing_plugin point_set) - polyhedron_demo_plugin(smoothing_plugin Point_set_demo_smoothing_plugin) - target_link_libraries(smoothing_plugin point_set) + if(LAPACK_FOUND) + polyhedron_demo_plugin(Point_set_demo_smoothing_plugin Point_set_demo_smoothing_plugin) + target_link_libraries(Point_set_demo_smoothing_plugin point_set) + endif() - qt4_wrap_ui( NORMAL_UI_FILES Point_set_demo_normal_estimation_plugin.ui) - polyhedron_demo_plugin(normal_estimation_plugin Point_set_demo_normal_estimation_plugin ${NORMAL_UI_FILES}) - target_link_libraries(normal_estimation_plugin point_set) + if(LAPACK_FOUND) + qt4_wrap_ui( NORMAL_UI_FILES Point_set_demo_normal_estimation_plugin.ui) + polyhedron_demo_plugin(Point_set_demo_normal_estimation_plugin + Point_set_demo_normal_estimation_plugin + ${NORMAL_UI_FILES}) + target_link_libraries(Point_set_demo_normal_estimation_plugin point_set) + endif() qt4_wrap_ui( CLEANING_UI_FILES Point_set_demo_cleaning_plugin.ui) - polyhedron_demo_plugin(cleaning_plugin Point_set_demo_cleaning_plugin ${CLEANING_UI_FILES}) - target_link_libraries(cleaning_plugin point_set) + polyhedron_demo_plugin(Point_set_demo_cleaning_plugin + Point_set_demo_cleaning_plugin + ${CLEANING_UI_FILES}) + target_link_libraries(Point_set_demo_cleaning_plugin point_set) else (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo_cleaning_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo_cleaning_plugin.cpp index fcd6f0ca153..6c748d14946 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo_cleaning_plugin.cpp +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo_cleaning_plugin.cpp @@ -15,7 +15,7 @@ #include #include -#include "ui_Point_set_demo_outlier_removal_plugin.h" +#include "ui_Point_set_demo_cleaning_plugin.h" class Point_set_demo_cleaning_plugin : public QObject, @@ -79,8 +79,8 @@ void Point_set_demo_cleaning_plugin::on_actionOutlierRemoval_triggered() if(!dialog.exec()) return; const double removed_percentage = dialog.percentage(); // percentage of points to remove - const int nb_neighbors = dialog.nbNeighbors(); - + const int nb_neighbors = dialog.nbNeighbors(); + QApplication::setOverrideCursor(Qt::WaitCursor); CGAL::Timer task_timer; task_timer.start(); @@ -98,7 +98,7 @@ void Point_set_demo_cleaning_plugin::on_actionOutlierRemoval_triggered() << task_timer.time() << " seconds, " << (memory>>20) << " Mb allocated)" << std::endl; - + // Selects points to delete points->select(points->begin(), points->end(), false); points->select(first_point_to_remove, points->end(), true); diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake index 2bc9ef62b50..8f908e9f9e5 100755 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake @@ -42,7 +42,7 @@ configure() { echo "Configuring... " - if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ + if eval 'cmake $CMAKE_GENERATOR -DRUNNING_CGAL_AUTO_TEST=TRUE \ -DCGAL_DIR="$CGAL_DIR" \ .' ; then @@ -161,10 +161,54 @@ if [ $# -ne 0 ] ; then done else echo "Run all tests." + if [ `can_compile Point_set_demo_APSS_reconstruction_plugin` == "y" ]; then + compile_and_run Point_set_demo_APSS_reconstruction_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_average_spacing_plugin` == "y" ]; then + compile_and_run Point_set_demo_average_spacing_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_cleaning_plugin` == "y" ]; then + compile_and_run Point_set_demo_cleaning_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi if [ `can_compile Point_set_demo` == "y" ]; then compile_and_run Point_set_demo [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y fi + if [ `can_compile Point_set_demo_local_spacing_plugin` == "y" ]; then + compile_and_run Point_set_demo_local_spacing_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_normal_estimation_plugin` == "y" ]; then + compile_and_run Point_set_demo_normal_estimation_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_off_plugin` == "y" ]; then + compile_and_run Point_set_demo_off_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_point_set_simplification_plugin` == "y" ]; then + compile_and_run Point_set_demo_point_set_simplification_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_poisson_reconstruction_plugin` == "y" ]; then + compile_and_run Point_set_demo_poisson_reconstruction_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_smoothing_plugin` == "y" ]; then + compile_and_run Point_set_demo_smoothing_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Point_set_demo_xyz_plugin` == "y" ]; then + compile_and_run Point_set_demo_xyz_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi + if [ `can_compile Polyhedron_demo_inside_out_plugin` == "y" ]; then + compile_and_run Polyhedron_demo_inside_out_plugin + [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y + fi fi # diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake index 408b578fd7b..260c4c8837d 100755 --- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake +++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake @@ -42,7 +42,7 @@ configure() { echo "Configuring... " - if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ + if eval 'cmake $CMAKE_GENERATOR -DRUNNING_CGAL_AUTO_TEST=TRUE \ -DCGAL_DIR="$CGAL_DIR" \ .' ; then diff --git a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake index 935c5eb3216..bf48afe3f45 100755 --- a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake +++ b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake @@ -42,7 +42,7 @@ configure() { echo "Configuring... " - if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ + if eval 'cmake $CMAKE_GENERATOR -DRUNNING_CGAL_AUTO_TEST=TRUE \ -DCGAL_DIR="$CGAL_DIR" \ .' ; then