From a3f90d31c71968ea72abd277116cd49cd38f930e Mon Sep 17 00:00:00 2001 From: John Zhao Date: Thu, 19 Apr 2018 23:19:00 +0800 Subject: [PATCH] Public headers of device layer and some utils --- CMakeLists.txt | 6 ++++++ {src/internal => include/mynteye}/callbacks.h | 6 +++--- samples/device/CMakeLists.txt | 4 ---- samples/device/camera.cc | 6 +++--- src/device/device.h | 3 +-- src/internal/motions.h | 3 +-- src/internal/streams.h | 3 +-- tools/CMakeLists.txt | 1 - tools/dataset/dataset.cc | 2 +- tools/dataset/dataset.h | 2 +- tools/dataset/record.cc | 6 +++--- wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt | 1 - .../ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc | 4 ++-- 13 files changed, 22 insertions(+), 25 deletions(-) rename {src/internal => include/mynteye}/callbacks.h (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58e3c01..053fa63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,10 +69,16 @@ target_include_directories(main PRIVATE set(MYNTEYE_NAME ${PROJECT_NAME}) set(MYNTEYE_PUBLIC_H + ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/callbacks.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/global.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/glog_init.h ${CMAKE_CURRENT_BINARY_DIR}/include/mynteye/mynteye.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/device/context.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/device/device.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/files.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/strings.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/times.h ) if(OS_WIN) diff --git a/src/internal/callbacks.h b/include/mynteye/callbacks.h similarity index 92% rename from src/internal/callbacks.h rename to include/mynteye/callbacks.h index b0337ab..79a6d74 100644 --- a/src/internal/callbacks.h +++ b/include/mynteye/callbacks.h @@ -1,5 +1,5 @@ -#ifndef MYNTEYE_INTERNAL_CALLBACKS_H_ // NOLINT -#define MYNTEYE_INTERNAL_CALLBACKS_H_ +#ifndef MYNTEYE_CALLBACKS_H_ // NOLINT +#define MYNTEYE_CALLBACKS_H_ #pragma once #include @@ -90,4 +90,4 @@ using MotionCallback = std::function; MYNTEYE_END_NAMESPACE -#endif // MYNTEYE_INTERNAL_CALLBACKS_H_ NOLINT +#endif // MYNTEYE_CALLBACKS_H_ NOLINT diff --git a/samples/device/CMakeLists.txt b/samples/device/CMakeLists.txt index 8db16fe..dfd4f10 100644 --- a/samples/device/CMakeLists.txt +++ b/samples/device/CMakeLists.txt @@ -6,10 +6,6 @@ set_outdir( "${OUT_DIR}/bin/${DIR_NAME}" ) -include_directories( - ${PRO_DIR}/src -) - ## camera_d add_executable(camera_d camera.cc) diff --git a/samples/device/camera.cc b/samples/device/camera.cc index 790d21c..434882f 100644 --- a/samples/device/camera.cc +++ b/samples/device/camera.cc @@ -3,10 +3,10 @@ #include "mynteye/glog_init.h" -#include "device/context.h" -#include "device/device.h" +#include "mynteye/context.h" +#include "mynteye/device.h" -#include "internal/times.h" +#include "mynteye/times.h" MYNTEYE_USE_NAMESPACE diff --git a/src/device/device.h b/src/device/device.h index 59d8d77..71542cc 100644 --- a/src/device/device.h +++ b/src/device/device.h @@ -9,11 +9,10 @@ #include #include +#include "mynteye/callbacks.h" #include "mynteye/mynteye.h" #include "mynteye/types.h" -#include "internal/callbacks.h" - MYNTEYE_BEGIN_NAMESPACE namespace uvc { diff --git a/src/internal/motions.h b/src/internal/motions.h index 607f8a8..82734d7 100644 --- a/src/internal/motions.h +++ b/src/internal/motions.h @@ -6,10 +6,9 @@ #include #include +#include "mynteye/callbacks.h" #include "mynteye/mynteye.h" -#include "internal/callbacks.h" - MYNTEYE_BEGIN_NAMESPACE class Channels; diff --git a/src/internal/streams.h b/src/internal/streams.h index cdd5ddd..065e39e 100644 --- a/src/internal/streams.h +++ b/src/internal/streams.h @@ -8,11 +8,10 @@ #include #include +#include "mynteye/callbacks.h" #include "mynteye/mynteye.h" #include "mynteye/types.h" -#include "internal/callbacks.h" - MYNTEYE_BEGIN_NAMESPACE class Streams { diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 56d79e4..48ba0aa 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -47,7 +47,6 @@ set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_output") include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${PRO_DIR}/src ) # dataset diff --git a/tools/dataset/dataset.cc b/tools/dataset/dataset.cc index 45ec1f6..a6043ae 100644 --- a/tools/dataset/dataset.cc +++ b/tools/dataset/dataset.cc @@ -13,7 +13,7 @@ #include #include -#include "internal/files.h" +#include "mynteye/files.h" #define FULL_PRECISION \ std::fixed << std::setprecision(std::numeric_limits::max_digits10) diff --git a/tools/dataset/dataset.h b/tools/dataset/dataset.h index 112f362..7b222ec 100644 --- a/tools/dataset/dataset.h +++ b/tools/dataset/dataset.h @@ -7,7 +7,7 @@ #include #include -#include "internal/callbacks.h" +#include "mynteye/callbacks.h" #include "mynteye/mynteye.h" MYNTEYE_BEGIN_NAMESPACE diff --git a/tools/dataset/record.cc b/tools/dataset/record.cc index e08e5e6..8c191cd 100644 --- a/tools/dataset/record.cc +++ b/tools/dataset/record.cc @@ -3,10 +3,10 @@ #include "mynteye/glog_init.h" -#include "device/context.h" -#include "device/device.h" +#include "mynteye/context.h" +#include "mynteye/device.h" -#include "internal/times.h" +#include "mynteye/times.h" #include "dataset/dataset.h" diff --git a/wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt b/wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt index 79548f1..c0bcdb4 100644 --- a/wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt +++ b/wrappers/ros/src/mynt_eye_ros_wrapper/CMakeLists.txt @@ -74,7 +74,6 @@ add_compile_options(-std=c++11) include_directories( ${catkin_INCLUDE_DIRS} - ${SDK_DIR}/src # for device layer interface ) set(LINK_LIBS diff --git a/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc b/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc index 8d725d4..439faaa 100644 --- a/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc +++ b/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc @@ -16,8 +16,8 @@ #include #include -#include "device/context.h" -#include "device/device.h" +#include "mynteye/context.h" +#include "mynteye/device.h" #define FULL_PRECISION \ std::fixed << std::setprecision(std::numeric_limits::max_digits10)