Change log header

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

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;` ，重新编译。

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 <glog/logging.h>
@@ -62,4 +62,4 @@ struct glog_init {
   }
 };
 
-#endif  // MYNTEYE_GLOG_INIT_H_ NOLINT
+#endif  // MYNTEYE_LOGGER_H_

samples/api/camera.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #include "mynteye/api.h"
 #include "mynteye/times.h"

samples/api/get_depth_with_region.cc

@@ -14,8 +14,6 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 namespace {

samples/device/camera.cc

@@ -14,7 +14,7 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 
 #include "mynteye/device.h"
 #include "mynteye/utils.h"

samples/tutorials/control/auto_exposure.cc

@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 #include "util/cv_painter.h"
 

samples/tutorials/control/framerate.cc

@@ -13,11 +13,10 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include <atomic>
 
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 #include "mynteye/times.h"
 
 MYNTEYE_USE_NAMESPACE

samples/tutorials/control/infrared.cc

@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/control/manual_exposure.cc

@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 #include "util/cv_painter.h"
 

samples/tutorials/data/get_depth.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 MYNTEYE_USE_NAMESPACE

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 <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_disparity.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 MYNTEYE_USE_NAMESPACE

samples/tutorials/data/get_from_callbacks.cc

@@ -13,14 +13,13 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include <atomic>
 #include <memory>
 #include <mutex>
 #include <sstream>
 
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 #include "util/cv_painter.h"
 

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 <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_imu.cc

@@ -13,9 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 #include "util/cv_painter.h"
 

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 <glog/logging.h>
-
 #include "mynteye/api.h"
+#include "mynteye/logger.h"
 
 MYNTEYE_USE_NAMESPACE
 

samples/tutorials/data/get_points.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 #include "util/pc_viewer.h"

samples/tutorials/data/get_stereo.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 MYNTEYE_USE_NAMESPACE

samples/tutorials/data/get_stereo_rectified.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 MYNTEYE_USE_NAMESPACE

samples/tutorials/data/get_with_plugin.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 MYNTEYE_USE_NAMESPACE

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
 

samples/tutorials/intermediate/get_depth_and_points.cc

@@ -14,8 +14,6 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include <glog/logging.h>
-
 #include "mynteye/api.h"
 
 #include "util/cv_painter.h"

samples/tutorials/util/cv_painter.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include "util/cv_painter.h"
 
-#include <glog/logging.h>
-
 #include <opencv2/imgproc/imgproc.hpp>
 
 #include <iomanip>
@@ -22,6 +20,7 @@
 #include <memory>
 #include <utility>
 
+#include "mynteye/logger.h"
 #include "mynteye/utils.h"
 
 #define FONT_FACE cv::FONT_HERSHEY_PLAIN

samples/tutorials/util/pc_viewer.cc

@@ -13,12 +13,12 @@
 // limitations under the License.
 #include "util/pc_viewer.h"
 
-#include <glog/logging.h>
-
 // #include <pcl/common/common_headers.h>
 
 #include <cmath>
 
+#include "mynteye/logger.h"
+
 std::shared_ptr<pcl::visualization::PCLVisualizer> CustomColorVis(
     pcl::PointCloud<pcl::PointXYZ>::ConstPtr pc) {
   // --------------------------------------------

samples/uvc/camera.cc

@@ -20,7 +20,7 @@
 #include <iostream>
 #include <mutex>
 
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"
 #include "uvc/uvc.h"

src/api/api.cc

@@ -18,12 +18,10 @@
 #include <boost/range/iterator_range.hpp>
 #endif
 
-#include <glog/logging.h>
-
 #include <algorithm>
 #include <thread>
 
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 #include "mynteye/utils.h"
 
 #include "api/plugin.h"

src/api/processor/depth_processor.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "api/processor/depth_processor.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #include <utility>
 

src/api/processor/disparity_normalized_processor.cc

@@ -15,10 +15,10 @@
 
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include <glog/logging.h>
-
 #include <utility>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 const char DisparityNormalizedProcessor::NAME[] =

src/api/processor/disparity_processor.cc

@@ -15,10 +15,10 @@
 
 #include <opencv2/calib3d/calib3d.hpp>
 
-#include <glog/logging.h>
-
 #include <utility>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 const char DisparityProcessor::NAME[] = "DisparityProcessor";

src/api/processor/points_processor.cc

@@ -15,10 +15,10 @@
 
 #include <opencv2/calib3d/calib3d.hpp>
 
-#include <glog/logging.h>
-
 #include <utility>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 const char PointsProcessor::NAME[] = "PointsProcessor";

src/api/processor/processor.cc

@@ -13,11 +13,11 @@
 // limitations under the License.
 #include "api/processor/processor.h"
 
-#include <glog/logging.h>
-
 #include <exception>
 #include <utility>
 
+#include "mynteye/logger.h"
+
 #include "internal/strings.h"
 #include "internal/times.h"
 

src/api/processor/rectify_processor.cc

@@ -16,10 +16,10 @@
 #include <opencv2/calib3d/calib3d.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include <glog/logging.h>
-
 #include <utility>
 
+#include "mynteye/logger.h"
+
 #include "device/device.h"
 
 MYNTEYE_BEGIN_NAMESPACE

src/api/synthetic.cc

@@ -13,12 +13,12 @@
 // limitations under the License.
 #include "api/synthetic.h"
 
-#include <glog/logging.h>
-
 #include <algorithm>
 #include <functional>
 #include <stdexcept>
 
+#include "mynteye/logger.h"
+
 #include "api/plugin.h"
 #include "api/processor/depth_processor.h"
 #include "api/processor/disparity_normalized_processor.h"

src/device/context.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "device/context.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #include "device/device.h"
 #include "uvc/uvc.h"

src/device/device.cc

@@ -13,13 +13,13 @@
 // limitations under the License.
 #include "device/device.h"
 
-#include <glog/logging.h>
-
 #include <algorithm>
 #include <iterator>
 #include <stdexcept>
 #include <utility>
 
+#include "mynteye/logger.h"
+
 #include "device/device_s.h"
 #include "internal/async_callback.h"
 #include "internal/channels.h"

src/device/device_s.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "device/device_s.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #include "internal/motions.h"
 

src/internal/async_callback_impl.h

@@ -15,11 +15,11 @@
 #define MYNTEYE_INTERNAL_ASYNC_CALLBACK_IMPL_H_
 #pragma once
 
-#include <glog/logging.h>
-
 #include <string>
 #include <utility>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 template <class Data>

src/internal/channels.cc

@@ -13,8 +13,6 @@
 // limitations under the License.
 #include "internal/channels.h"
 
-#include <glog/logging.h>
-
 #include <bitset>
 #include <chrono>
 #include <iomanip>
@@ -22,6 +20,8 @@
 #include <sstream>
 #include <stdexcept>
 
+#include "mynteye/logger.h"
+
 #include "internal/strings.h"
 #include "internal/times.h"
 

src/internal/dl.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "internal/dl.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

src/internal/files.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "internal/files.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #if defined(OS_WIN) && !defined(OS_MINGW) && !defined(OS_CYGWIN)
 #include <direct.h>

src/internal/motions.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "internal/motions.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #include "internal/channels.h"
 

src/internal/streams.cc

@@ -13,13 +13,13 @@
 // limitations under the License.
 #include "internal/streams.h"
 
-#include <glog/logging.h>
-
 #include <algorithm>
 #include <chrono>
 #include <iomanip>
 #include <stdexcept>
 
+#include "mynteye/logger.h"
+
 #include "internal/types.h"
 
 MYNTEYE_BEGIN_NAMESPACE

src/internal/types.cc

@@ -13,12 +13,12 @@
 // limitations under the License.
 #include "internal/types.h"
 
-#include <glog/logging.h>
-
 #include <algorithm>
 #include <iomanip>
 #include <iostream>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 std::string Version::to_string() const {

src/public/types.cc

@@ -13,11 +13,11 @@
 // limitations under the License.
 #include "mynteye/types.h"
 
-#include <glog/logging.h>
-
 #include <iomanip>
 #include <limits>
 
+#include "mynteye/logger.h"
+
 #define FULL_PRECISION \
   std::fixed << std::setprecision(std::numeric_limits<double>::max_digits10)
 

src/public/utils.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "mynteye/utils.h"
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #include "device/context.h"
 #include "device/device.h"

src/uvc/uvc-libuvc.cc

@@ -13,9 +13,10 @@
 // limitations under the License.
 #include "uvc/uvc.h"  // NOLINT
 
-#include <glog/logging.h>
 #include <libuvc/libuvc.h>
 
+#include "mynteye/logger.h"
+
 // #define ENABLE_DEBUG_SPAM
 
 MYNTEYE_BEGIN_NAMESPACE

src/uvc/uvc-v4l2.cc

@@ -25,13 +25,13 @@
 #include <linux/uvcvideo.h>
 #include <linux/videodev2.h>
 
-#include <glog/logging.h>
-
 #include <chrono>
 #include <fstream>
 #include <string>
 #include <thread>
 
+#include "mynteye/logger.h"
+
 MYNTEYE_BEGIN_NAMESPACE
 
 namespace uvc {

src/uvc/uvc-wmf.cc

@@ -53,7 +53,7 @@
 
 #include <strsafe.h>
 
-#include <glog/logging.h>
+#include "mynteye/logger.h"
 
 #define VLOG_INFO VLOG(2)
 // #define VLOG_INFO LOG(INFO)

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);

tools/dataset/dataset.cc

@@ -19,14 +19,13 @@
 #include <opencv2/imgcodecs/imgcodecs.hpp>
 #endif
 
-#include <glog/logging.h>
-
 #include <iomanip>
 #include <limits>
 #include <stdexcept>
 #include <utility>
 
 #include "mynteye/files.h"
+#include "mynteye/logger.h"
 
 #define FULL_PRECISION \
   std::fixed << std::setprecision(std::numeric_limits<double>::max_digits10)

tools/dataset/record.cc

@@ -14,7 +14,7 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 
 #include "mynteye/device.h"
 #include "mynteye/utils.h"

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"

tools/writer/device_writer.cc

@@ -15,12 +15,11 @@
 
 #include <opencv2/core/core.hpp>
 
-#include <glog/logging.h>
-
 #include <vector>
 
 #include "mynteye/device.h"
 #include "mynteye/files.h"
+#include "mynteye/logger.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

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"

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"

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"

wrappers/python/src/mynteye_py.cc

@@ -26,7 +26,7 @@
 #include <vector>
 
 #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<std::shared_ptr<APIWrap>>();
 
-  // glog_init.h - glog_init
+  // logger.h - glog_init
 
   bp::class_<glog_init, boost::noncopyable>("glog_init", bp::no_init)
       .def("create", &glog_init_create)

wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_node.cc

@@ -14,7 +14,7 @@
 #include <nodelet/loader.h>
 #include <ros/ros.h>
 
-#include "mynteye/glog_init.h"
+#include "mynteye/logger.h"
 
 int main(int argc, char *argv[]) {
   glog_init _(argc, argv);

wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc

@@ -28,8 +28,6 @@
 #include <mynt_eye_ros_wrapper/GetInfo.h>
 #include <mynt_eye_ros_wrapper/Temp.h>
 
-#include <glog/logging.h>
-
 #define _USE_MATH_DEFINES
 #include <cmath>
 #include <map>
@@ -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<double>::max_digits10)