From 4d5ff16f828a598f461f65d803e1f1ce23656fe4 Mon Sep 17 00:00:00 2001 From: John Zhao Date: Tue, 4 Sep 2018 15:12:04 +0800 Subject: [PATCH] Change log header --- CMakeLists.txt | 2 +- doc/zh-Hans/guide_log.md | 4 ++-- include/mynteye/{glog_init.h => logger.h} | 6 +++--- samples/api/camera.cc | 2 +- samples/api/get_depth_with_region.cc | 2 -- samples/device/camera.cc | 2 +- samples/tutorials/control/auto_exposure.cc | 3 +-- samples/tutorials/control/framerate.cc | 3 +-- samples/tutorials/control/infrared.cc | 3 +-- samples/tutorials/control/manual_exposure.cc | 3 +-- samples/tutorials/data/get_depth.cc | 2 -- samples/tutorials/data/get_device_info.cc | 3 +-- samples/tutorials/data/get_disparity.cc | 2 -- samples/tutorials/data/get_from_callbacks.cc | 3 +-- samples/tutorials/data/get_img_params.cc | 3 +-- samples/tutorials/data/get_imu.cc | 3 +-- samples/tutorials/data/get_imu_params.cc | 3 +-- samples/tutorials/data/get_points.cc | 2 -- samples/tutorials/data/get_stereo.cc | 2 -- samples/tutorials/data/get_stereo_rectified.cc | 2 -- samples/tutorials/data/get_with_plugin.cc | 2 -- samples/tutorials/intermediate/get_all_device_info.cc | 2 +- samples/tutorials/intermediate/get_depth_and_points.cc | 2 -- samples/tutorials/util/cv_painter.cc | 3 +-- samples/tutorials/util/pc_viewer.cc | 4 ++-- samples/uvc/camera.cc | 2 +- src/api/api.cc | 4 +--- src/api/processor/depth_processor.cc | 2 +- src/api/processor/disparity_normalized_processor.cc | 4 ++-- src/api/processor/disparity_processor.cc | 4 ++-- src/api/processor/points_processor.cc | 4 ++-- src/api/processor/processor.cc | 4 ++-- src/api/processor/rectify_processor.cc | 4 ++-- src/api/synthetic.cc | 4 ++-- src/device/context.cc | 2 +- src/device/device.cc | 4 ++-- src/device/device_s.cc | 2 +- src/internal/async_callback_impl.h | 4 ++-- src/internal/channels.cc | 4 ++-- src/internal/dl.cc | 2 +- src/internal/files.cc | 2 +- src/internal/motions.cc | 2 +- src/internal/streams.cc | 4 ++-- src/internal/types.cc | 4 ++-- src/public/types.cc | 4 ++-- src/public/utils.cc | 2 +- src/uvc/uvc-libuvc.cc | 3 ++- src/uvc/uvc-v4l2.cc | 4 ++-- src/uvc/uvc-wmf.cc | 2 +- test/gtest_main.cc | 2 +- tools/dataset/dataset.cc | 3 +-- tools/dataset/record.cc | 2 +- tools/writer/device_info_writer.cc | 2 +- tools/writer/device_writer.cc | 3 +-- tools/writer/img_params_writer.cc | 2 +- tools/writer/imu_params_writer.cc | 2 +- tools/writer/save_all_infos.cc | 2 +- wrappers/python/src/mynteye_py.cc | 4 ++-- wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc | 2 +- .../ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc | 3 +-- 60 files changed, 71 insertions(+), 101 deletions(-) rename include/mynteye/{glog_init.h => logger.h} (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1da872b..dbb634d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ endif() 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_SOURCE_DIR}/include/mynteye/logger.h ${CMAKE_CURRENT_BINARY_DIR}/include/mynteye/mynteye.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/types.h ${CMAKE_CURRENT_SOURCE_DIR}/include/mynteye/utils.h diff --git a/doc/zh-Hans/guide_log.md b/doc/zh-Hans/guide_log.md index ef16629..7863260 100644 --- a/doc/zh-Hans/guide_log.md +++ b/doc/zh-Hans/guide_log.md @@ -1,6 +1,6 @@ # 日志 {#guide_log} -日志系统用的 `glog` ，通用配置在头文件 `glog_init.h` 里。 +日志系统用的 `glog` ，通用配置在头文件 `logger.h` 里。 * 日志文件会存储在当前工作目录， `make cleanlog` 可以清理。 -* 如果需要打开详细日志，请取消 `glog_init.h` 里注释的 `FLAGS_v = 2;` ，重新编译。 +* 如果需要打开详细日志，请取消 `logger.h` 里注释的 `FLAGS_v = 2;` ，重新编译。 diff --git a/include/mynteye/glog_init.h b/include/mynteye/logger.h similarity index 94% rename from include/mynteye/glog_init.h rename to include/mynteye/logger.h index e2ac989..a3f24d2 100644 --- a/include/mynteye/glog_init.h +++ b/include/mynteye/logger.h @@ -11,8 +11,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MYNTEYE_GLOG_INIT_H_ // NOLINT -#define MYNTEYE_GLOG_INIT_H_ +#ifndef MYNTEYE_LOGGER_H_ +#define MYNTEYE_LOGGER_H_ #pragma once #include @@ -62,4 +62,4 @@ struct glog_init { } }; -#endif // MYNTEYE_GLOG_INIT_H_ NOLINT +#endif // MYNTEYE_LOGGER_H_ diff --git a/samples/api/camera.cc b/samples/api/camera.cc index 5cddd85..1159d2d 100644 --- a/samples/api/camera.cc +++ b/samples/api/camera.cc @@ -13,7 +13,7 @@ // limitations under the License. #include -#include +#include "mynteye/logger.h" #include "mynteye/api.h" #include "mynteye/times.h" diff --git a/samples/api/get_depth_with_region.cc b/samples/api/get_depth_with_region.cc index 0bd075c..5a1091b 100644 --- a/samples/api/get_depth_with_region.cc +++ b/samples/api/get_depth_with_region.cc @@ -14,8 +14,6 @@ #include #include -#include - #include "mynteye/api.h" namespace { diff --git a/samples/device/camera.cc b/samples/device/camera.cc index bcd9695..00b1f0d 100644 --- a/samples/device/camera.cc +++ b/samples/device/camera.cc @@ -14,7 +14,7 @@ #include #include -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/device.h" #include "mynteye/utils.h" diff --git a/samples/tutorials/control/auto_exposure.cc b/samples/tutorials/control/auto_exposure.cc index efe77e6..b1bacc1 100644 --- a/samples/tutorials/control/auto_exposure.cc +++ b/samples/tutorials/control/auto_exposure.cc @@ -13,9 +13,8 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" #include "util/cv_painter.h" diff --git a/samples/tutorials/control/framerate.cc b/samples/tutorials/control/framerate.cc index 1d05755..6a16a19 100644 --- a/samples/tutorials/control/framerate.cc +++ b/samples/tutorials/control/framerate.cc @@ -13,11 +13,10 @@ // limitations under the License. #include -#include - #include #include "mynteye/api.h" +#include "mynteye/logger.h" #include "mynteye/times.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/control/infrared.cc b/samples/tutorials/control/infrared.cc index 7ed6286..2a7ccd2 100644 --- a/samples/tutorials/control/infrared.cc +++ b/samples/tutorials/control/infrared.cc @@ -13,9 +13,8 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/control/manual_exposure.cc b/samples/tutorials/control/manual_exposure.cc index 38afa32..386188b 100644 --- a/samples/tutorials/control/manual_exposure.cc +++ b/samples/tutorials/control/manual_exposure.cc @@ -13,9 +13,8 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" #include "util/cv_painter.h" diff --git a/samples/tutorials/data/get_depth.cc b/samples/tutorials/data/get_depth.cc index 274c8ee..28ef244 100644 --- a/samples/tutorials/data/get_depth.cc +++ b/samples/tutorials/data/get_depth.cc @@ -13,8 +13,6 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_device_info.cc b/samples/tutorials/data/get_device_info.cc index ee41348..d188fc6 100644 --- a/samples/tutorials/data/get_device_info.cc +++ b/samples/tutorials/data/get_device_info.cc @@ -11,9 +11,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_disparity.cc b/samples/tutorials/data/get_disparity.cc index 5a9f798..aa02e42 100644 --- a/samples/tutorials/data/get_disparity.cc +++ b/samples/tutorials/data/get_disparity.cc @@ -13,8 +13,6 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_from_callbacks.cc b/samples/tutorials/data/get_from_callbacks.cc index cb51875..d38b7ae 100644 --- a/samples/tutorials/data/get_from_callbacks.cc +++ b/samples/tutorials/data/get_from_callbacks.cc @@ -13,14 +13,13 @@ // limitations under the License. #include -#include - #include #include #include #include #include "mynteye/api.h" +#include "mynteye/logger.h" #include "util/cv_painter.h" diff --git a/samples/tutorials/data/get_img_params.cc b/samples/tutorials/data/get_img_params.cc index 5636120..7cfac2e 100644 --- a/samples/tutorials/data/get_img_params.cc +++ b/samples/tutorials/data/get_img_params.cc @@ -11,9 +11,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_imu.cc b/samples/tutorials/data/get_imu.cc index 6ed0552..5cda4a4 100644 --- a/samples/tutorials/data/get_imu.cc +++ b/samples/tutorials/data/get_imu.cc @@ -13,9 +13,8 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" #include "util/cv_painter.h" diff --git a/samples/tutorials/data/get_imu_params.cc b/samples/tutorials/data/get_imu_params.cc index ddcfd49..1a307f8 100644 --- a/samples/tutorials/data/get_imu_params.cc +++ b/samples/tutorials/data/get_imu_params.cc @@ -11,9 +11,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - #include "mynteye/api.h" +#include "mynteye/logger.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_points.cc b/samples/tutorials/data/get_points.cc index 828418d..66f3341 100644 --- a/samples/tutorials/data/get_points.cc +++ b/samples/tutorials/data/get_points.cc @@ -13,8 +13,6 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" #include "util/pc_viewer.h" diff --git a/samples/tutorials/data/get_stereo.cc b/samples/tutorials/data/get_stereo.cc index a82a9e9..7899765 100644 --- a/samples/tutorials/data/get_stereo.cc +++ b/samples/tutorials/data/get_stereo.cc @@ -13,8 +13,6 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_stereo_rectified.cc b/samples/tutorials/data/get_stereo_rectified.cc index 04c4eae..ea1a8b5 100644 --- a/samples/tutorials/data/get_stereo_rectified.cc +++ b/samples/tutorials/data/get_stereo_rectified.cc @@ -13,8 +13,6 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/data/get_with_plugin.cc b/samples/tutorials/data/get_with_plugin.cc index a2201ba..dbaa574 100644 --- a/samples/tutorials/data/get_with_plugin.cc +++ b/samples/tutorials/data/get_with_plugin.cc @@ -13,8 +13,6 @@ // limitations under the License. #include -#include - #include "mynteye/api.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/intermediate/get_all_device_info.cc b/samples/tutorials/intermediate/get_all_device_info.cc index b113c27..ec07c3a 100644 --- a/samples/tutorials/intermediate/get_all_device_info.cc +++ b/samples/tutorials/intermediate/get_all_device_info.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "mynteye/context.h" #include "mynteye/device.h" -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" MYNTEYE_USE_NAMESPACE diff --git a/samples/tutorials/intermediate/get_depth_and_points.cc b/samples/tutorials/intermediate/get_depth_and_points.cc index c137954..03391f5 100644 --- a/samples/tutorials/intermediate/get_depth_and_points.cc +++ b/samples/tutorials/intermediate/get_depth_and_points.cc @@ -14,8 +14,6 @@ #include #include -#include - #include "mynteye/api.h" #include "util/cv_painter.h" diff --git a/samples/tutorials/util/cv_painter.cc b/samples/tutorials/util/cv_painter.cc index c0c6f6a..eaa7d8a 100644 --- a/samples/tutorials/util/cv_painter.cc +++ b/samples/tutorials/util/cv_painter.cc @@ -13,8 +13,6 @@ // limitations under the License. #include "util/cv_painter.h" -#include - #include #include @@ -22,6 +20,7 @@ #include #include +#include "mynteye/logger.h" #include "mynteye/utils.h" #define FONT_FACE cv::FONT_HERSHEY_PLAIN diff --git a/samples/tutorials/util/pc_viewer.cc b/samples/tutorials/util/pc_viewer.cc index 2fb7394..bec96dc 100644 --- a/samples/tutorials/util/pc_viewer.cc +++ b/samples/tutorials/util/pc_viewer.cc @@ -13,12 +13,12 @@ // limitations under the License. #include "util/pc_viewer.h" -#include - // #include #include +#include "mynteye/logger.h" + std::shared_ptr CustomColorVis( pcl::PointCloud::ConstPtr pc) { // -------------------------------------------- diff --git a/samples/uvc/camera.cc b/samples/uvc/camera.cc index ac20e03..4b36b44 100644 --- a/samples/uvc/camera.cc +++ b/samples/uvc/camera.cc @@ -20,7 +20,7 @@ #include #include -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/mynteye.h" #include "mynteye/types.h" #include "uvc/uvc.h" diff --git a/src/api/api.cc b/src/api/api.cc index ddf443a..8fb98bb 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -18,12 +18,10 @@ #include #endif -#include - #include #include -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/utils.h" #include "api/plugin.h" diff --git a/src/api/processor/depth_processor.cc b/src/api/processor/depth_processor.cc index 73769de..433e47d 100644 --- a/src/api/processor/depth_processor.cc +++ b/src/api/processor/depth_processor.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "api/processor/depth_processor.h" -#include +#include "mynteye/logger.h" #include diff --git a/src/api/processor/disparity_normalized_processor.cc b/src/api/processor/disparity_normalized_processor.cc index 0ce2a9a..6c24c6b 100644 --- a/src/api/processor/disparity_normalized_processor.cc +++ b/src/api/processor/disparity_normalized_processor.cc @@ -15,10 +15,10 @@ #include -#include - #include +#include "mynteye/logger.h" + MYNTEYE_BEGIN_NAMESPACE const char DisparityNormalizedProcessor::NAME[] = diff --git a/src/api/processor/disparity_processor.cc b/src/api/processor/disparity_processor.cc index dbb5ab3..041e246 100644 --- a/src/api/processor/disparity_processor.cc +++ b/src/api/processor/disparity_processor.cc @@ -15,10 +15,10 @@ #include -#include - #include +#include "mynteye/logger.h" + MYNTEYE_BEGIN_NAMESPACE const char DisparityProcessor::NAME[] = "DisparityProcessor"; diff --git a/src/api/processor/points_processor.cc b/src/api/processor/points_processor.cc index 0d594b1..02a70b2 100644 --- a/src/api/processor/points_processor.cc +++ b/src/api/processor/points_processor.cc @@ -15,10 +15,10 @@ #include -#include - #include +#include "mynteye/logger.h" + MYNTEYE_BEGIN_NAMESPACE const char PointsProcessor::NAME[] = "PointsProcessor"; diff --git a/src/api/processor/processor.cc b/src/api/processor/processor.cc index 8ba3bca..c0d45ab 100644 --- a/src/api/processor/processor.cc +++ b/src/api/processor/processor.cc @@ -13,11 +13,11 @@ // limitations under the License. #include "api/processor/processor.h" -#include - #include #include +#include "mynteye/logger.h" + #include "internal/strings.h" #include "internal/times.h" diff --git a/src/api/processor/rectify_processor.cc b/src/api/processor/rectify_processor.cc index 31ce62c..9a45b0f 100644 --- a/src/api/processor/rectify_processor.cc +++ b/src/api/processor/rectify_processor.cc @@ -16,10 +16,10 @@ #include #include -#include - #include +#include "mynteye/logger.h" + #include "device/device.h" MYNTEYE_BEGIN_NAMESPACE diff --git a/src/api/synthetic.cc b/src/api/synthetic.cc index 3c5a194..a1a3730 100644 --- a/src/api/synthetic.cc +++ b/src/api/synthetic.cc @@ -13,12 +13,12 @@ // limitations under the License. #include "api/synthetic.h" -#include - #include #include #include +#include "mynteye/logger.h" + #include "api/plugin.h" #include "api/processor/depth_processor.h" #include "api/processor/disparity_normalized_processor.h" diff --git a/src/device/context.cc b/src/device/context.cc index e5c82c7..ef4f1ef 100644 --- a/src/device/context.cc +++ b/src/device/context.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "device/context.h" -#include +#include "mynteye/logger.h" #include "device/device.h" #include "uvc/uvc.h" diff --git a/src/device/device.cc b/src/device/device.cc index cc4d2b8..2d16d9d 100644 --- a/src/device/device.cc +++ b/src/device/device.cc @@ -13,13 +13,13 @@ // limitations under the License. #include "device/device.h" -#include - #include #include #include #include +#include "mynteye/logger.h" + #include "device/device_s.h" #include "internal/async_callback.h" #include "internal/channels.h" diff --git a/src/device/device_s.cc b/src/device/device_s.cc index fdffe93..377453d 100644 --- a/src/device/device_s.cc +++ b/src/device/device_s.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "device/device_s.h" -#include +#include "mynteye/logger.h" #include "internal/motions.h" diff --git a/src/internal/async_callback_impl.h b/src/internal/async_callback_impl.h index 3c502b3..cfffc0d 100644 --- a/src/internal/async_callback_impl.h +++ b/src/internal/async_callback_impl.h @@ -15,11 +15,11 @@ #define MYNTEYE_INTERNAL_ASYNC_CALLBACK_IMPL_H_ #pragma once -#include - #include #include +#include "mynteye/logger.h" + MYNTEYE_BEGIN_NAMESPACE template diff --git a/src/internal/channels.cc b/src/internal/channels.cc index e8eb253..679fe61 100644 --- a/src/internal/channels.cc +++ b/src/internal/channels.cc @@ -13,8 +13,6 @@ // limitations under the License. #include "internal/channels.h" -#include - #include #include #include @@ -22,6 +20,8 @@ #include #include +#include "mynteye/logger.h" + #include "internal/strings.h" #include "internal/times.h" diff --git a/src/internal/dl.cc b/src/internal/dl.cc index 8ba22b7..2de8150 100644 --- a/src/internal/dl.cc +++ b/src/internal/dl.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "internal/dl.h" -#include +#include "mynteye/logger.h" MYNTEYE_BEGIN_NAMESPACE diff --git a/src/internal/files.cc b/src/internal/files.cc index 7d54020..556d5c9 100644 --- a/src/internal/files.cc +++ b/src/internal/files.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "internal/files.h" -#include +#include "mynteye/logger.h" #if defined(OS_WIN) && !defined(OS_MINGW) && !defined(OS_CYGWIN) #include diff --git a/src/internal/motions.cc b/src/internal/motions.cc index 7183c6a..27d3c67 100644 --- a/src/internal/motions.cc +++ b/src/internal/motions.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "internal/motions.h" -#include +#include "mynteye/logger.h" #include "internal/channels.h" diff --git a/src/internal/streams.cc b/src/internal/streams.cc index 97ae970..1f9fe64 100644 --- a/src/internal/streams.cc +++ b/src/internal/streams.cc @@ -13,13 +13,13 @@ // limitations under the License. #include "internal/streams.h" -#include - #include #include #include #include +#include "mynteye/logger.h" + #include "internal/types.h" MYNTEYE_BEGIN_NAMESPACE diff --git a/src/internal/types.cc b/src/internal/types.cc index c53ff0d..2f05409 100644 --- a/src/internal/types.cc +++ b/src/internal/types.cc @@ -13,12 +13,12 @@ // limitations under the License. #include "internal/types.h" -#include - #include #include #include +#include "mynteye/logger.h" + MYNTEYE_BEGIN_NAMESPACE std::string Version::to_string() const { diff --git a/src/public/types.cc b/src/public/types.cc index 296c8a4..d8b99da 100644 --- a/src/public/types.cc +++ b/src/public/types.cc @@ -13,11 +13,11 @@ // limitations under the License. #include "mynteye/types.h" -#include - #include #include +#include "mynteye/logger.h" + #define FULL_PRECISION \ std::fixed << std::setprecision(std::numeric_limits::max_digits10) diff --git a/src/public/utils.cc b/src/public/utils.cc index 4fc9202..36ba8ff 100644 --- a/src/public/utils.cc +++ b/src/public/utils.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "mynteye/utils.h" -#include +#include "mynteye/logger.h" #include "device/context.h" #include "device/device.h" diff --git a/src/uvc/uvc-libuvc.cc b/src/uvc/uvc-libuvc.cc index 1b260d7..f2a9b92 100644 --- a/src/uvc/uvc-libuvc.cc +++ b/src/uvc/uvc-libuvc.cc @@ -13,9 +13,10 @@ // limitations under the License. #include "uvc/uvc.h" // NOLINT -#include #include +#include "mynteye/logger.h" + // #define ENABLE_DEBUG_SPAM MYNTEYE_BEGIN_NAMESPACE diff --git a/src/uvc/uvc-v4l2.cc b/src/uvc/uvc-v4l2.cc index 06fc8fc..d99a85b 100755 --- a/src/uvc/uvc-v4l2.cc +++ b/src/uvc/uvc-v4l2.cc @@ -25,13 +25,13 @@ #include #include -#include - #include #include #include #include +#include "mynteye/logger.h" + MYNTEYE_BEGIN_NAMESPACE namespace uvc { diff --git a/src/uvc/uvc-wmf.cc b/src/uvc/uvc-wmf.cc index 13f7f36..8e8d9c3 100644 --- a/src/uvc/uvc-wmf.cc +++ b/src/uvc/uvc-wmf.cc @@ -53,7 +53,7 @@ #include -#include +#include "mynteye/logger.h" #define VLOG_INFO VLOG(2) // #define VLOG_INFO LOG(INFO) diff --git a/test/gtest_main.cc b/test/gtest_main.cc index a0e1685..edca54b 100644 --- a/test/gtest_main.cc +++ b/test/gtest_main.cc @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" int main(int argc, char **argv) { glog_init _(argc, argv); diff --git a/tools/dataset/dataset.cc b/tools/dataset/dataset.cc index d156c37..165473f 100644 --- a/tools/dataset/dataset.cc +++ b/tools/dataset/dataset.cc @@ -19,14 +19,13 @@ #include #endif -#include - #include #include #include #include #include "mynteye/files.h" +#include "mynteye/logger.h" #define FULL_PRECISION \ std::fixed << std::setprecision(std::numeric_limits::max_digits10) diff --git a/tools/dataset/record.cc b/tools/dataset/record.cc index e3de362..dedf851 100644 --- a/tools/dataset/record.cc +++ b/tools/dataset/record.cc @@ -14,7 +14,7 @@ #include #include -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/device.h" #include "mynteye/utils.h" diff --git a/tools/writer/device_info_writer.cc b/tools/writer/device_info_writer.cc index 1625b7a..6619a55 100644 --- a/tools/writer/device_info_writer.cc +++ b/tools/writer/device_info_writer.cc @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/device.h" #include "mynteye/utils.h" diff --git a/tools/writer/device_writer.cc b/tools/writer/device_writer.cc index 05a4e46..4a61001 100644 --- a/tools/writer/device_writer.cc +++ b/tools/writer/device_writer.cc @@ -15,12 +15,11 @@ #include -#include - #include #include "mynteye/device.h" #include "mynteye/files.h" +#include "mynteye/logger.h" MYNTEYE_BEGIN_NAMESPACE diff --git a/tools/writer/img_params_writer.cc b/tools/writer/img_params_writer.cc index 77647a5..02950e9 100644 --- a/tools/writer/img_params_writer.cc +++ b/tools/writer/img_params_writer.cc @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/device.h" #include "mynteye/utils.h" diff --git a/tools/writer/imu_params_writer.cc b/tools/writer/imu_params_writer.cc index 9f2034b..a60c3fe 100644 --- a/tools/writer/imu_params_writer.cc +++ b/tools/writer/imu_params_writer.cc @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/device.h" #include "mynteye/utils.h" diff --git a/tools/writer/save_all_infos.cc b/tools/writer/save_all_infos.cc index a4ff051..c67b5d4 100644 --- a/tools/writer/save_all_infos.cc +++ b/tools/writer/save_all_infos.cc @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/device.h" #include "mynteye/utils.h" diff --git a/wrappers/python/src/mynteye_py.cc b/wrappers/python/src/mynteye_py.cc index 8107f55..ad7fbe9 100644 --- a/wrappers/python/src/mynteye_py.cc +++ b/wrappers/python/src/mynteye_py.cc @@ -26,7 +26,7 @@ #include #include "mynteye/api.h" -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" #include "mynteye/utils.h" #include "array_indexing_suite.hpp" @@ -451,7 +451,7 @@ BOOST_PYTHON_MODULE(mynteye_py) { bp::register_ptr_to_python>(); - // glog_init.h - glog_init + // logger.h - glog_init bp::class_("glog_init", bp::no_init) .def("create", &glog_init_create) diff --git a/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc b/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc index 5a03045..6e12566 100644 --- a/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc +++ b/wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc @@ -14,7 +14,7 @@ #include #include -#include "mynteye/glog_init.h" +#include "mynteye/logger.h" int main(int argc, char *argv[]) { glog_init _(argc, argv); 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 fccda6d..5e6e2de 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 @@ -28,8 +28,6 @@ #include #include -#include - #define _USE_MATH_DEFINES #include #include @@ -38,6 +36,7 @@ #include "mynteye/api.h" #include "mynteye/context.h" #include "mynteye/device.h" +#include "mynteye/logger.h" #define FULL_PRECISION \ std::fixed << std::setprecision(std::numeric_limits::max_digits10)