lschilli · ttoenige · Dec 3, 2015 · Dec 3, 2015 · Dec 4, 2015 · Dec 4, 2015
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,36 +1,65 @@
 cmake_minimum_required(VERSION 2.8)
 
-PROJECT(gazetool)
+PROJECT(gazetool_demo)
+
+set(GAZETOOL_MAJOR_VERSION 0)
+set(GAZETOOL_MINOR_VERSION 1)
+set(GAZETOOL_PATCH_VERSION 0)
+set(GAZETOOL_VERSION
+  ${GAZETOOL_MAJOR_VERSION}.${GAZETOOL_MINOR_VERSION}.${GAZETOOL_PATCH_VERSION})
+
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 OPTION(ENABLE_YARP_SUPPORT "Enable yarp support" OFF)
+
+add_subdirectory(src/lib)
+add_subdirectory(data)
+
 set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-FIND_PACKAGE(dlib REQUIRED)
 FIND_PACKAGE(OpenCV REQUIRED)
+FIND_PACKAGE(dlib REQUIRED)
 FIND_PACKAGE(Boost COMPONENTS system chrono program_options REQUIRED)
 FIND_PACKAGE(Qt5Core REQUIRED)
 FIND_PACKAGE(Qt5Widgets REQUIRED)
 FIND_PACKAGE(Qt5OpenGL REQUIRED)
 FIND_PACKAGE(Qt5Gui REQUIRED)
+ADD_DEFINITIONS(-DENABLE_QT5)
+
 
 IF(ENABLE_YARP_SUPPORT)
     FIND_PACKAGE(YARP REQUIRED)
 ENDIF()
 
-INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${YARP_INCLUDE_DIRS} ${dlib_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+    ${OpenCV_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIR}
+    ${YARP_INCLUDE_DIRS}
+    ${dlib_INCLUDE_DIRS}
+    src/lib
+    src/ui)
+
+
+QT5_WRAP_UI(UI_HEADERS src/ui/gazergui.ui)
+
+SET(GAZETOOL_BIN
+    src/ui/main.cpp
+    src/ui/gazergui.cpp
+    src/ui/workerthread.cpp
+    src/ui/glimageview.cpp
+    ${UI_HEADERS})
 
-ADD_SUBDIRECTORY(src)
+ADD_EXECUTABLE(gazetool_ui ${GAZETOOL_BIN})
+ADD_DEPENDENCIES(gazetool_ui ${UI_HEADERS})
+TARGET_LINK_LIBRARIES(gazetool_ui gazetool GL)
+qt5_use_modules(gazetool_ui Core Widgets Gui OpenGL)
 
-CONFIGURE_FILE(gazetool.sh.in gazetool.sh @ONLY)
+CONFIGURE_FILE("src/ui/config/gazetool.sh.in" gazetool.sh @ONLY)
 
-INSTALL(FILES
-    data/shape_predictor_68_face_landmarks.dat
-    data/gaze_est_deg.dat
-    data/lid_est.dat
-    data/vertgaze_est_deg.dat
-    DESTINATION share/gazetool)
+INSTALL(TARGETS gazetool_ui
+  RUNTIME DESTINATION bin
+)
 
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/gazetool.sh DESTINATION bin)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gazetool.sh DESTINATION bin)
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@ This repository contains a calibration free gaze tracking system based on freely
 
 Please cite the above paper when using this module for your research.
 
-## Installation
+## Out of the box demo installation
 
 Make sure you have the following dependencies available / installed:
 * QT5: http://www.qt.io/download/
-* opencv 2.x.x: http://opencv.org/downloads.html
+* opencv: http://opencv.org/downloads.html
 * boost: http://www.boost.org/
 * dlib: http://dlib.net/
 * run `getFaceAlignmentModel.sh` in the `data` directory to download dlib's face alignment model which is required for running gazetool.
@@ -21,6 +21,28 @@ Compiling
 ## Running gazetool
 * Run `gazetool.sh -c 0` to use the first webcam attached to your system
 
+## Manual library installation (no QT is needed)
+
+Make sure you have the following dependencies available / installed:
+* opencv: http://opencv.org/downloads.html
+* boost: http://www.boost.org/
+* dlib: http://dlib.net/
+* run `getFaceAlignmentModel.sh` in the `data` directory to download dlib's face alignment model which is required for running gazetool.
+
+Compiling
+* cmake is used, thus a standard cmake configure run is required in the data and the src/lib folder
+* `cd data`
+* `mkdir build && cd build && cmake ..`
+* run `make`
+* run `make install`
+* `cd ../../src/lib`
+* `mkdir build && cd build && cmake ..`
+* run `make`
+* run `make install`
+
+This will install the library and all necessary configuration files to use it.
+Furthermore a cmake module file is created in `${CMAKE_INSTALL_PREFIX}/lib/cmake/gazetool` which can be used to link against this library.
+
 ## Technical Notes
 
 * Sync to vblank might negatively affect performance

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 2.8)
+
+PROJECT(gazetool_data)
+
+OPTION(ENABLE_INSTALL_DLIB_FACE_MODEL "Install the dlib face landmarks model" ON)
+
+
+INSTALL(FILES
+    gaze_est_deg.dat
+    lid_est.dat
+    vertgaze_est_deg.dat
+    DESTINATION share/gazetool)
+
+
+IF(ENABLE_INSTALL_DLIB_FACE_MODEL)
+    INSTALL(FILES
+       shape_predictor_68_face_landmarks.dat
+       DESTINATION share/gazetool)
+ENDIF()
diff --git a/gazetool.sh.in b/gazetool.sh.in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -0,0 +1,84 @@
+cmake_minimum_required(VERSION 2.8)
+
+PROJECT(libgazetool)
+
+set(GAZETOOL_LIB_MAJOR_VERSION 0)
+set(GAZETOOL_LIB_MINOR_VERSION 1)
+set(GAZETOOL_LIB_PATCH_VERSION 0)
+set(GAZETOOL_LIB_VERSION
+  ${GAZETOOL_LIB_MAJOR_VERSION}.${GAZETOOL_LIB_MINOR_VERSION}.${GAZETOOL_LIB_PATCH_VERSION})
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+OPTION(ENABLE_YARP_SUPPORT "Enable yarp support" OFF)
+
+set(CMAKE_AUTOMOC TRUE)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+FIND_PACKAGE(dlib REQUIRED)
+FIND_PACKAGE(OpenCV REQUIRED)
+FIND_PACKAGE(Boost COMPONENTS system chrono program_options REQUIRED)
+
+
+IF(ENABLE_YARP_SUPPORT)
+    FIND_PACKAGE(YARP REQUIRED)
+ENDIF()
+
+INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ${YARP_INCLUDE_DIRS} ${dlib_INCLUDE_DIRS})
+
+SET(GAZETOOL_LIB_SRC
+    imageprovider.cpp
+    faceparts.cpp
+    pupilfinder.cpp
+    eyelidlearner.cpp
+    mutualgazelearner.cpp
+    relativeeyelidlearner.cpp
+    relativegazelearner.cpp
+    verticalgazelearner.cpp
+    facedetectionworker.cpp
+    shapedetectionworker.cpp
+    gazehyps.cpp
+    regressionworker.cpp
+    eyepatcher.cpp
+    featureextractor.cpp
+    abstractlearner.cpp
+    rlssmoother.cpp
+    blockingqueue.h
+)
+
+IF(ENABLE_YARP_SUPPORT)
+    ADD_DEFINITIONS(-DENABLE_YARP_SUPPORT)
+    SET(GAZETOOL_LIB_SRC ${GAZETOOL_LIB_SRC} yarpsupport.cpp)
+ENDIF()
+
+
+ADD_LIBRARY(gazetool SHARED ${GAZETOOL_LIB_SRC})
+target_link_libraries(gazetool ${OpenCV_LIBS} ${dlib_LIBRARIES} ${Boost_LIBRARIES} ${YARP_LIBRARIES})
+
+
+set(INSTALL_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/gazetool/")
+
+configure_file("config/gazetoolConfig.cmake.in"
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gazetoolConfig.cmake" @ONLY)
+configure_file("config/gazetoolConfigVersion.cmake.in"
+  "${PROJECT_BINARY_DIR}/gazetoolConfigVersion.cmake" @ONLY)
+
+export(TARGETS gazetool
+  FILE "${PROJECT_BINARY_DIR}/gazetoolTargets.cmake")
+export(PACKAGE gazetool)
+
+INSTALL(TARGETS gazetool
+     LIBRARY DESTINATION lib
+)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+    DESTINATION "include/gazetool"
+    FILES_MATCHING
+    PATTERN "*.h")
+
+install(FILES
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gazetoolConfig.cmake"
+  "${PROJECT_BINARY_DIR}/gazetoolConfigVersion.cmake"
+  "${PROJECT_BINARY_DIR}/gazetoolTargets.cmake"
+  DESTINATION "lib/cmake/gazetool" COMPONENT dev)
diff --git a/src/abstractlearner.cpp → src/lib/abstractlearner.cpp b/src/abstractlearner.cpp → src/lib/abstractlearner.cpp
diff --git a/src/abstractlearner.h → src/lib/abstractlearner.h b/src/abstractlearner.h → src/lib/abstractlearner.h
diff --git a/src/blockingqueue.h → src/lib/blockingqueue.h b/src/blockingqueue.h → src/lib/blockingqueue.h
diff --git a/src/lib/config/gazetoolConfig.cmake.in b/src/lib/config/gazetoolConfig.cmake.in
@@ -0,0 +1,16 @@
+# - Config file for the gazetool package
+# It defines the following variables
+#  GAZETOOL_INCLUDE_DIRS - include directories for FooBar
+#  GAZETOOL_LIBRARIES    - libraries to link against
+
+# Compute paths
+get_filename_component(gazetool_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+set(gazetool_INCLUDE_DIRS "@INSTALL_INCLUDE_DIRS@")
+
+# Our library dependencies (contains definitions for IMPORTED targets)
+if(NOT TARGET gazetool)
+  include("${gazetool_CMAKE_DIR}/gazetoolTargets.cmake")
+endif()
+
+set(gazetool_LIBRARIES gazetool)
diff --git a/src/lib/config/gazetoolConfigVersion.cmake.in b/src/lib/config/gazetoolConfigVersion.cmake.in
@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@gazetool_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
diff --git a/src/eyelidlearner.cpp → src/lib/eyelidlearner.cpp b/src/eyelidlearner.cpp → src/lib/eyelidlearner.cpp
diff --git a/src/eyelidlearner.h → src/lib/eyelidlearner.h b/src/eyelidlearner.h → src/lib/eyelidlearner.h
diff --git a/src/eyepatcher.cpp → src/lib/eyepatcher.cpp b/src/eyepatcher.cpp → src/lib/eyepatcher.cpp
diff --git a/src/eyepatcher.h → src/lib/eyepatcher.h b/src/eyepatcher.h → src/lib/eyepatcher.h
diff --git a/src/facedetectionworker.cpp → src/lib/facedetectionworker.cpp b/src/facedetectionworker.cpp → src/lib/facedetectionworker.cpp
diff --git a/src/facedetectionworker.h → src/lib/facedetectionworker.h b/src/facedetectionworker.h → src/lib/facedetectionworker.h
diff --git a/src/faceparts.cpp → src/lib/faceparts.cpp b/src/faceparts.cpp → src/lib/faceparts.cpp
diff --git a/src/faceparts.h → src/lib/faceparts.h b/src/faceparts.h → src/lib/faceparts.h
diff --git a/src/featureextractor.cpp → src/lib/featureextractor.cpp b/src/featureextractor.cpp → src/lib/featureextractor.cpp
diff --git a/src/featureextractor.h → src/lib/featureextractor.h b/src/featureextractor.h → src/lib/featureextractor.h
diff --git a/src/gazehyps.cpp → src/lib/gazehyps.cpp b/src/gazehyps.cpp → src/lib/gazehyps.cpp
diff --git a/src/gazehyps.h → src/lib/gazehyps.h b/src/gazehyps.h → src/lib/gazehyps.h
@@ -6,14 +6,17 @@
 #include <chrono>
 #include <dlib/image_processing.h>
 #include <dlib/opencv.h>
-#include <qt5/QtCore/QMetaType>
 #include <boost/optional.hpp>
 
 #include "pupilfinder.h"
 
 class GazeHypList;
 typedef std::shared_ptr<GazeHypList> GazeHypsPtr;
+#ifdef ENABLE_QT5
+#include <qt5/QtCore/QMetaType>
 Q_DECLARE_METATYPE(GazeHypsPtr)
+#endif
+
 
 struct GazeHyp {
     dlib::rectangle faceDetection;

diff --git a/src/imageprovider.cpp → src/lib/imageprovider.cpp b/src/imageprovider.cpp → src/lib/imageprovider.cpp
diff --git a/src/imageprovider.h → src/lib/imageprovider.h b/src/imageprovider.h → src/lib/imageprovider.h
diff --git a/src/mutualgazelearner.cpp → src/lib/mutualgazelearner.cpp b/src/mutualgazelearner.cpp → src/lib/mutualgazelearner.cpp
diff --git a/src/mutualgazelearner.h → src/lib/mutualgazelearner.h b/src/mutualgazelearner.h → src/lib/mutualgazelearner.h
diff --git a/src/pupilfinder.cpp → src/lib/pupilfinder.cpp b/src/pupilfinder.cpp → src/lib/pupilfinder.cpp
diff --git a/src/pupilfinder.h → src/lib/pupilfinder.h b/src/pupilfinder.h → src/lib/pupilfinder.h
diff --git a/src/regressionworker.cpp → src/lib/regressionworker.cpp b/src/regressionworker.cpp → src/lib/regressionworker.cpp
diff --git a/src/regressionworker.h → src/lib/regressionworker.h b/src/regressionworker.h → src/lib/regressionworker.h
diff --git a/src/relativeeyelidlearner.cpp → src/lib/relativeeyelidlearner.cpp b/src/relativeeyelidlearner.cpp → src/lib/relativeeyelidlearner.cpp
diff --git a/src/relativeeyelidlearner.h → src/lib/relativeeyelidlearner.h b/src/relativeeyelidlearner.h → src/lib/relativeeyelidlearner.h
diff --git a/src/relativegazelearner.cpp → src/lib/relativegazelearner.cpp b/src/relativegazelearner.cpp → src/lib/relativegazelearner.cpp
diff --git a/src/relativegazelearner.h → src/lib/relativegazelearner.h b/src/relativegazelearner.h → src/lib/relativegazelearner.h
diff --git a/src/rlssmoother.cpp → src/lib/rlssmoother.cpp b/src/rlssmoother.cpp → src/lib/rlssmoother.cpp
diff --git a/src/rlssmoother.h → src/lib/rlssmoother.h b/src/rlssmoother.h → src/lib/rlssmoother.h
diff --git a/src/shapedetectionworker.cpp → src/lib/shapedetectionworker.cpp b/src/shapedetectionworker.cpp → src/lib/shapedetectionworker.cpp
diff --git a/src/shapedetectionworker.h → src/lib/shapedetectionworker.h b/src/shapedetectionworker.h → src/lib/shapedetectionworker.h
diff --git a/src/verticalgazelearner.cpp → src/lib/verticalgazelearner.cpp b/src/verticalgazelearner.cpp → src/lib/verticalgazelearner.cpp
diff --git a/src/verticalgazelearner.h → src/lib/verticalgazelearner.h b/src/verticalgazelearner.h → src/lib/verticalgazelearner.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 2.8)
+
+PROJECT(gazetool_ui)
+
+set(GAZETOOL_MAJOR_VERSION 0)
+set(GAZETOOL_MINOR_VERSION 1)
+set(GAZETOOL_PATCH_VERSION 0)
+set(GAZETOOL_VERSION
+  ${GAZETOOL_MAJOR_VERSION}.${GAZETOOL_MINOR_VERSION}.${GAZETOOL_PATCH_VERSION})
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+OPTION(ENABLE_YARP_SUPPORT "Enable yarp support" OFF)
+
+set(CMAKE_AUTOMOC TRUE)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+FIND_PACKAGE(OpenCV REQUIRED)
+FIND_PACKAGE(gazetool REQUIRED)
+FIND_PACKAGE(Qt5Core REQUIRED)
+FIND_PACKAGE(Qt5Widgets REQUIRED)
+FIND_PACKAGE(Qt5OpenGL REQUIRED)
+FIND_PACKAGE(Qt5Gui REQUIRED)
+ADD_DEFINITIONS(-DENABLE_QT5)
+
+INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS} ${gazetool_INCLUDE_DIRS})
+
+QT5_WRAP_UI(UI_HEADERS gazergui.ui)
+
+SET(GAZETOOL_BIN
+    main.cpp
+    gazergui.cpp
+    workerthread.cpp
+    glimageview.cpp
+    ${UI_HEADERS})
+
+ADD_EXECUTABLE(gazetool_ui ${GAZETOOL_BIN})
+ADD_DEPENDENCIES(gazetool_ui ${UI_HEADERS})
+TARGET_LINK_LIBRARIES(gazetool_ui ${gazetool_LIBRARIES} GL)
+qt5_use_modules(gazetool_ui Core Widgets Gui OpenGL)
+
+CONFIGURE_FILE("config/gazetool.sh.in" gazetool.sh @ONLY)
+
+INSTALL(TARGETS gazetool_ui
+  RUNTIME DESTINATION bin
+)
+
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gazetool.sh DESTINATION bin)
diff --git a/src/ui/config/gazetool.sh.in b/src/ui/config/gazetool.sh.in
@@ -0,0 +1,3 @@
+#!/bin/bash
+prefix="@CMAKE_INSTALL_PREFIX@"
+exec "$prefix/bin/gazetool_ui" -m "$prefix/share/gazetool/shape_predictor_68_face_landmarks.dat" --estimate-gaze "$prefix/share/gazetool/gaze_est_deg.dat" --estimate-verticalgaze "$prefix/share/gazetool/vertgaze_est_deg.dat" --estimate-lid "$prefix/share/gazetool/lid_est.dat" "$@"
diff --git a/src/gazergui.cpp → src/ui/gazergui.cpp b/src/gazergui.cpp → src/ui/gazergui.cpp
diff --git a/src/gazergui.h → src/ui/gazergui.h b/src/gazergui.h → src/ui/gazergui.h
diff --git a/src/gazergui.ui → src/ui/gazergui.ui b/src/gazergui.ui → src/ui/gazergui.ui
diff --git a/src/glimageview.cpp → src/ui/glimageview.cpp b/src/glimageview.cpp → src/ui/glimageview.cpp
diff --git a/src/glimageview.h → src/ui/glimageview.h b/src/glimageview.h → src/ui/glimageview.h
diff --git a/src/main.cpp → src/ui/main.cpp b/src/main.cpp → src/ui/main.cpp
diff --git a/src/workerthread.cpp → src/ui/workerthread.cpp b/src/workerthread.cpp → src/ui/workerthread.cpp
diff --git a/src/workerthread.h → src/ui/workerthread.h b/src/workerthread.h → src/ui/workerthread.h
diff --git a/src/yarpsupport.cpp → src/ui/yarpsupport.cpp b/src/yarpsupport.cpp → src/ui/yarpsupport.cpp
diff --git a/src/yarpsupport.h → src/ui/yarpsupport.h b/src/yarpsupport.h → src/ui/yarpsupport.h