diff --git a/.gitignore b/.gitignore index 1bc7f6b..d0abd62 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ dasp.sublime-workspace +build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index d871365..a7ead7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,6 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.5) + +project(dasp) option(DASP_HAS_CANDY "Use DanvilSimpleEngine to enable 3D rendering" OFF) option(DASP_HAS_OPENNI "Use OpenNI for Kinect live mode" OFF) @@ -7,45 +9,41 @@ option(USE_SOLVER_ARPACK "Use ARPACK for spectral solving" OFF) option(USE_SOLVER_MAGMA "Use CUDA magma for spectral solving" OFF) option(USE_SOLVER_IETL "Use IETL sparse eigensolver" OFF) -set(OPENNI_INCLUDE_DIR "/home/david/Programs/RGBD/OpenNI/Include" CACHE STRING "OpenNI include directory") -set(EIGEN3_INCLUDE_DIR "/usr/local/include/eigen3" CACHE STRING "Eigen3 include directory") -set(SLIMAGE_DIR "/home/david/git/slimage" CACHE STRING "Slimage include directory") -set(CANDY_DIR "/home/david/git/candy" CACHE STRING "Danvil candy 3D engine main directory") +# --- FIXED PATHS --- +set(OPENNI_INCLUDE_DIR "/usr/include/ni" CACHE STRING "OpenNI include directory") +set(EIGEN3_INCLUDE_DIR "/usr/include/eigen3" CACHE STRING "Eigen3 include directory") +set(SLIMAGE_DIR "${PROJECT_SOURCE_DIR}/../slimage" CACHE STRING "Slimage include directory") +set(CANDY_DIR "${PROJECT_SOURCE_DIR}/../candy" CACHE STRING "Danvil candy 3D engine main directory") -add_definitions(-std=c++0x -DBOOST_DISABLE_ASSERTS) +# --- COMPILER FLAGS & BOOST FIXES --- +add_definitions(-std=c++14 -DBOOST_DISABLE_ASSERTS -DBOOST_TIMER_ENABLE_DEPRECATED) if (DASP_HAS_CANDY) - link_directories(/home/david/build/candy/libcandy) # FIXME + link_directories(${CANDY_DIR}/build/libcandy) endif (DASP_HAS_CANDY) if (USE_SOLVER_MAGMA) - link_directories( - /usr/local/cuda-5.0/lib64 - /home/david/Downloads/magma-1.3.0/lib - ) + link_directories(/usr/local/cuda/lib64) endif (USE_SOLVER_MAGMA) +# --- OPENCV INJECTION --- +find_package(OpenCV REQUIRED) + include_directories( - ${EIGEN3_INCLUDE_DIR} - ${SLIMAGE_DIR}/include - . + ${EIGEN3_INCLUDE_DIR} + ${SLIMAGE_DIR}/include + ${OpenCV_INCLUDE_DIRS} + . ) -project(dasp) - add_subdirectory(density) add_subdirectory(density_cmd) - add_subdirectory(pds) add_subdirectory(pds_cmd) - add_subdirectory(asp) add_subdirectory(asp_cmd) - add_subdirectory(graphseg) - add_subdirectory(rgbd) - add_subdirectory(libdasp) add_subdirectory(dasp_cmd) add_subdirectory(dasp_eval) diff --git a/common/WdgtDaspParameters.h b/common/WdgtDaspParameters.h index aad9e9e..73b9d8c 100644 --- a/common/WdgtDaspParameters.h +++ b/common/WdgtDaspParameters.h @@ -1,7 +1,7 @@ #ifndef WDGTDASPPARAMETERS_H #define WDGTDASPPARAMETERS_H -#include +#include #include "ui_WdgtDaspParameters.h" #include "dasp/Parameters.hpp" #include diff --git a/common/WdgtMain.cpp b/common/WdgtMain.cpp index 1a46923..ab6bc57 100644 --- a/common/WdgtMain.cpp +++ b/common/WdgtMain.cpp @@ -1,7 +1,7 @@ #include "WdgtMain.h" #include -#include -#include +#include +#include #include void PrepareEngine(const boost::shared_ptr& engine) diff --git a/common/WdgtMain.h b/common/WdgtMain.h index 1ed79c7..c04a56c 100644 --- a/common/WdgtMain.h +++ b/common/WdgtMain.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dasp_gui/CMakeLists.txt b/dasp_gui/CMakeLists.txt index e474882..e516488 100644 --- a/dasp_gui/CMakeLists.txt +++ b/dasp_gui/CMakeLists.txt @@ -1,85 +1,81 @@ -find_package(Qt4 REQUIRED) +find_package(Qt5 COMPONENTS Core Gui Widgets OpenGL REQUIRED) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) add_definitions(-DSLIMAGE_IO_QT) +add_definitions(-DQT_NO_KEYWORDS) if (DASP_HAS_CANDY) - add_definitions(-DDASP_HAS_CANDY) + add_definitions(-DDASP_HAS_CANDY) endif (DASP_HAS_CANDY) if (DASP_HAS_OPENNI) - add_definitions(-DDASP_HAS_OPENNI) + add_definitions(-DDASP_HAS_OPENNI) endif (DASP_HAS_OPENNI) include_directories( - ${dasp_SOURCE_DIR}/libdasp - ${dasp_SOURCE_DIR}/rgbd + ${dasp_SOURCE_DIR}/libdasp + ${dasp_SOURCE_DIR}/rgbd ) -SET(QT_USE_QTOPENGL TRUE) - SET(dasp_gui_SOURCES - main.cpp - DaspProcessing.cpp - WdgtKinectSuperPoints.cpp - WdgtSettings.cpp - ../common/WdgtDaspParameters.cpp - WdgtBenchmark.cpp - WdgtAbout.cpp + main.cpp + DaspProcessing.cpp + WdgtKinectSuperPoints.cpp + WdgtSettings.cpp + ../common/WdgtDaspParameters.cpp + WdgtBenchmark.cpp + WdgtAbout.cpp ) + if (DASP_HAS_CANDY) - SET(dasp_gui_HEADERS - WdgtKinectSuperPoints.h - WdgtSettings.h - ../common/WdgtDaspParameters.h - WdgtBenchmark.h - WdgtAbout.h - ${CANDY_DIR}/libcandy/Candy/System/GLSystemQtWindow.h - ) + SET(dasp_gui_HEADERS + WdgtKinectSuperPoints.h + WdgtSettings.h + ../common/WdgtDaspParameters.h + WdgtBenchmark.h + WdgtAbout.h + ${CANDY_DIR}/libcandy/Candy/System/GLSystemQtWindow.h + ) else (DASP_HAS_CANDY) - SET(dasp_gui_HEADERS - WdgtKinectSuperPoints.h - WdgtSettings.h - ../common/WdgtDaspParameters.h - WdgtBenchmark.h - WdgtAbout.h - ) + SET(dasp_gui_HEADERS + WdgtKinectSuperPoints.h + WdgtSettings.h + ../common/WdgtDaspParameters.h + WdgtBenchmark.h + WdgtAbout.h + ) endif (DASP_HAS_CANDY) SET(dasp_gui_FORMS - WdgtKinectSuperPoints.ui - WdgtSettings.ui - ../common/WdgtDaspParameters.ui - WdgtBenchmark.ui - WdgtAbout.ui + WdgtKinectSuperPoints.ui + WdgtSettings.ui + ../common/WdgtDaspParameters.ui + WdgtBenchmark.ui + WdgtAbout.ui ) -QT4_WRAP_CPP(dasp_gui_HEADERS_MOC ${dasp_gui_HEADERS}) -QT4_WRAP_UI(dasp_gui_FORMS_HEADERS ${dasp_gui_FORMS}) - -INCLUDE(${QT_USE_FILE}) -ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT_NO_KEYWORDS) - ADD_EXECUTABLE(dasp_gui - ${dasp_gui_SOURCES} ${dasp_gui_HEADERS_MOC} ${dasp_gui_FORMS_HEADERS} + ${dasp_gui_SOURCES} ${dasp_gui_HEADERS} ${dasp_gui_FORMS} ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) TARGET_LINK_LIBRARIES(dasp_gui - libdasp - rgbd - ${QT_LIBRARIES} - boost_signals - boost_thread - boost_program_options - boost_system - pthread + libdasp + rgbd + Qt5::Core + Qt5::Gui + Qt5::Widgets + Qt5::OpenGL + boost_thread + boost_program_options + boost_system + pthread ) if (DASP_HAS_CANDY) - add_definitions(-DDASP_HAS_CANDY) - include_directories( - ${CANDY_DIR}/libcandy - ) - target_link_libraries(dasp_gui candy) + include_directories(${CANDY_DIR}/libcandy) + target_link_libraries(dasp_gui candy) endif (DASP_HAS_CANDY) diff --git a/dasp_gui/WdgtAbout.h b/dasp_gui/WdgtAbout.h index b9e0f1d..2377503 100644 --- a/dasp_gui/WdgtAbout.h +++ b/dasp_gui/WdgtAbout.h @@ -1,8 +1,8 @@ #ifndef WDGTABOUT_H #define WDGTABOUT_H -#include -#include +#include +#include #include "ui_WdgtAbout.h" class WdgtAbout diff --git a/dasp_gui/WdgtBenchmark.h b/dasp_gui/WdgtBenchmark.h index 8ad14f9..93d7cac 100644 --- a/dasp_gui/WdgtBenchmark.h +++ b/dasp_gui/WdgtBenchmark.h @@ -1,8 +1,8 @@ #ifndef WDGTBENCHMARK_H #define WDGTBENCHMARK_H -#include -#include +#include +#include #include #include "ui_WdgtBenchmark.h" #include diff --git a/dasp_gui/WdgtKinectSuperPoints.cpp b/dasp_gui/WdgtKinectSuperPoints.cpp index ba0867d..4465975 100644 --- a/dasp_gui/WdgtKinectSuperPoints.cpp +++ b/dasp_gui/WdgtKinectSuperPoints.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include WdgtKinectSuperPoints::WdgtKinectSuperPoints(bool no3d, QWidget *parent) diff --git a/dasp_gui/WdgtKinectSuperPoints.h b/dasp_gui/WdgtKinectSuperPoints.h index 382b2f6..4a82b69 100644 --- a/dasp_gui/WdgtKinectSuperPoints.h +++ b/dasp_gui/WdgtKinectSuperPoints.h @@ -12,8 +12,8 @@ # include # include #endif -#include -#include +#include +#include #include #include #include diff --git a/dasp_gui/WdgtSettings.h b/dasp_gui/WdgtSettings.h index 2007dc0..116858e 100644 --- a/dasp_gui/WdgtSettings.h +++ b/dasp_gui/WdgtSettings.h @@ -1,7 +1,7 @@ #ifndef DASPGUI_WDGTSETTINGS_H #define DASPGUI_WDGTSETTINGS_H -#include +#include #include "ui_WdgtSettings.h" #include "DaspProcessing.h" #include diff --git a/libdasp/dasp/Plots.hpp b/libdasp/dasp/Plots.hpp index 7b28cbd..60c9f4d 100644 --- a/libdasp/dasp/Plots.hpp +++ b/libdasp/dasp/Plots.hpp @@ -14,6 +14,7 @@ #include #include #include +#include //----------------------------------------------------------------------------// namespace dasp { namespace plots { diff --git a/libdasp/dasp/eval/ipq.cpp b/libdasp/dasp/eval/ipq.cpp index ed861be..10680cc 100644 --- a/libdasp/dasp/eval/ipq.cpp +++ b/libdasp/dasp/eval/ipq.cpp @@ -2,6 +2,7 @@ #include #include #include +#include namespace dasp { namespace eval { diff --git a/libdasp/dasp/eval/use.cpp b/libdasp/dasp/eval/use.cpp index db461b7..5ba16ae 100644 --- a/libdasp/dasp/eval/use.cpp +++ b/libdasp/dasp/eval/use.cpp @@ -12,6 +12,7 @@ #include #include #include +#include //#define DASP_DEBUG_GUI