Change includes

2018-10-27 21:51:44 +08:00
parent 972ab79a76
commit e95a5e6b1d
34 changed files with 62 additions and 72 deletions
--- a/samples/api/camera.cc
+++ b/samples/api/camera.cc
@@ -14,9 +14,8 @@
 #include <opencv2/highgui/highgui.hpp>

 #include "mynteye/logger.h"
-
-#include "mynteye/api.h"
-#include "mynteye/times.h"
+#include "mynteye/api/api.h"
+#include "mynteye/util/times.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/api/get_depth_with_region.cc
+++ b/samples/api/get_depth_with_region.cc
@@ -14,7 +14,7 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 namespace {

--- a/samples/device/camera.cc
+++ b/samples/device/camera.cc
@@ -15,11 +15,9 @@
 #include <opencv2/imgproc/imgproc.hpp>

 #include "mynteye/logger.h"
-
-#include "mynteye/device.h"
-#include "mynteye/utils.h"
-
-#include "mynteye/times.h"
+#include "mynteye/device/device.h"
+#include "mynteye/device/utils.h"
+#include "mynteye/util/times.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/auto_exposure.cc
+++ b/samples/tutorials/control/auto_exposure.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/control/framerate.cc
+++ b/samples/tutorials/control/framerate.cc
@@ -11,13 +11,13 @@
 // 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 <opencv2/highgui/highgui.hpp>
-
 #include <atomic>

-#include "mynteye/api.h"
+#include <opencv2/highgui/highgui.hpp>
+
 #include "mynteye/logger.h"
-#include "mynteye/times.h"
+#include "mynteye/api/api.h"
+#include "mynteye/util/times.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/infrared.cc
+++ b/samples/tutorials/control/infrared.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/control/manual_exposure.cc
+++ b/samples/tutorials/control/manual_exposure.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/data/get_depth.cc
+++ b/samples/tutorials/data/get_depth.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_device_info.cc
+++ b/samples/tutorials/data/get_device_info.cc
@@ -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.
-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_disparity.cc
+++ b/samples/tutorials/data/get_disparity.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_from_callbacks.cc
+++ b/samples/tutorials/data/get_from_callbacks.cc
@@ -11,15 +11,15 @@
 // 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 <opencv2/highgui/highgui.hpp>
-
 #include <atomic>
 #include <memory>
 #include <mutex>
 #include <sstream>

-#include "mynteye/api.h"
+#include <opencv2/highgui/highgui.hpp>
+
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/data/get_img_params.cc
+++ b/samples/tutorials/data/get_img_params.cc
@@ -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.
-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_imu.cc
+++ b/samples/tutorials/data/get_imu.cc
@@ -13,8 +13,8 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 #include "util/cv_painter.h"

--- a/samples/tutorials/data/get_imu_params.cc
+++ b/samples/tutorials/data/get_imu_params.cc
@@ -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.
-#include "mynteye/api.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_points.cc
+++ b/samples/tutorials/data/get_points.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 #include "util/pc_viewer.h"

--- a/samples/tutorials/data/get_stereo.cc
+++ b/samples/tutorials/data/get_stereo.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_stereo_rectified.cc
+++ b/samples/tutorials/data/get_stereo_rectified.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/data/get_with_plugin.cc
+++ b/samples/tutorials/data/get_with_plugin.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <opencv2/highgui/highgui.hpp>

-#include "mynteye/api.h"
+#include "mynteye/api/api.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/intermediate/get_all_device_info.cc
+++ b/samples/tutorials/intermediate/get_all_device_info.cc
@@ -11,9 +11,9 @@
 // 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/context.h"
-#include "mynteye/device.h"
 #include "mynteye/logger.h"
+#include "mynteye/device/context.h"
+#include "mynteye/device/device.h"

 MYNTEYE_USE_NAMESPACE

--- a/samples/tutorials/intermediate/get_depth_and_points.cc
+++ b/samples/tutorials/intermediate/get_depth_and_points.cc
@@ -14,8 +14,8 @@
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>

-#include "mynteye/api.h"
 // #include "mynteye/logger.h"
+#include "mynteye/api/api.h"

 #include "util/cv_painter.h"
 #include "util/pc_viewer.h"
--- a/samples/tutorials/util/cv_painter.cc
+++ b/samples/tutorials/util/cv_painter.cc
@@ -13,15 +13,15 @@
 // limitations under the License.
 #include "util/cv_painter.h"

-#include <opencv2/imgproc/imgproc.hpp>
-
 #include <iomanip>
 #include <iostream>
 #include <memory>
 #include <utility>

+#include <opencv2/imgproc/imgproc.hpp>
+
 #include "mynteye/logger.h"
-#include "mynteye/utils.h"
+#include "mynteye/device/utils.h"

 #define FONT_FACE cv::FONT_HERSHEY_PLAIN
 #define FONT_SCALE 1
--- a/samples/tutorials/util/cv_painter.h
+++ b/samples/tutorials/util/cv_painter.h
@@ -15,10 +15,10 @@
 #define MYNTEYE_TUTORIALS_CV_PAINTER_H_
 #pragma once

-#include <opencv2/core/core.hpp>
-
 #include <string>

+#include <opencv2/core/core.hpp>
+
 #include "mynteye/types.h"

 class CVPainter {
--- a/samples/tutorials/util/pc_viewer.h
+++ b/samples/tutorials/util/pc_viewer.h
@@ -15,12 +15,12 @@
 #define MYNTEYE_TUTORIALS_PC_VIEWER_H_
 #pragma once

+#include <memory>
+
 #include <opencv2/core/core.hpp>

 #include <pcl/visualization/pcl_visualizer.h>

-#include <memory>
-
 class PCViewer {
 public:
  PCViewer();
--- a/samples/uvc/camera.cc
+++ b/samples/uvc/camera.cc
@@ -11,15 +11,15 @@
 // 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 <opencv2/highgui/highgui.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
-
 #include <chrono>
 #include <condition_variable>
 #include <iomanip>
 #include <iostream>
 #include <mutex>

+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+
 #include "mynteye/logger.h"
 #include "mynteye/mynteye.h"
 #include "mynteye/types.h"