Change includes

samples/api/camera.cc

@@ -14,9 +14,8 @@
 #include <opencv2/highgui/highgui.hpp>
 
 #include "mynteye/logger.h"
-
+#include "mynteye/api/api.h"
-#include "mynteye/api.h"
+#include "mynteye/util/times.h"
-#include "mynteye/times.h"
 
 MYNTEYE_USE_NAMESPACE
 

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 {
 

samples/device/camera.cc

@@ -15,11 +15,9 @@
 #include <opencv2/imgproc/imgproc.hpp>
 
 #include "mynteye/logger.h"
-
+#include "mynteye/device/device.h"
-#include "mynteye/device.h"
+#include "mynteye/device/utils.h"
-#include "mynteye/utils.h"
+#include "mynteye/util/times.h"
-
-#include "mynteye/times.h"
 
 MYNTEYE_USE_NAMESPACE
 

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"
 

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
 

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
 

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"
 

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
 

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
 

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
 

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"
 

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
 

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"
 

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
 

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"
 

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
 

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
 

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
 

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
 

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"

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

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 {

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

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"

tools/dataset/dataset.cc

@@ -24,8 +24,8 @@
 #include <stdexcept>
 #include <utility>
 
-#include "mynteye/files.h"
 #include "mynteye/logger.h"
+#include "mynteye/util/files.h"
 
 #define FULL_PRECISION \
   std::fixed << std::setprecision(std::numeric_limits<double>::max_digits10)

tools/dataset/dataset.h

@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 
-#include "mynteye/callbacks.h"
 #include "mynteye/mynteye.h"
+#include "mynteye/device/callbacks.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

tools/dataset/record.cc

@@ -15,11 +15,9 @@
 #include <opencv2/imgproc/imgproc.hpp>
 
 #include "mynteye/logger.h"
-
+#include "mynteye/device/device.h"
-#include "mynteye/device.h"
+#include "mynteye/device/utils.h"
-#include "mynteye/utils.h"
+#include "mynteye/util/times.h"
-
-#include "mynteye/times.h"
 
 #include "dataset/dataset.h"
 

tools/writer/device_info_writer.cc

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "mynteye/logger.h"
-
+#include "mynteye/device/device.h"
-#include "mynteye/device.h"
+#include "mynteye/device/utils.h"
-#include "mynteye/utils.h"
 
 #include "writer/device_writer.h"
 

tools/writer/device_writer.cc

@@ -13,13 +13,13 @@
 // limitations under the License.
 #include "writer/device_writer.h"
 
-#include <opencv2/core/core.hpp>
-
 #include <vector>
 
-#include "mynteye/device.h"
+#include <opencv2/core/core.hpp>
-#include "mynteye/files.h"
+
 #include "mynteye/logger.h"
+#include "mynteye/device/device.h"
+#include "mynteye/util/files.h"
 
 MYNTEYE_BEGIN_NAMESPACE
 

tools/writer/img_params_writer.cc

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "mynteye/logger.h"
-
+#include "mynteye/device/device.h"
-#include "mynteye/device.h"
+#include "mynteye/device/utils.h"
-#include "mynteye/utils.h"
 
 #include "writer/device_writer.h"
 

tools/writer/imu_params_writer.cc

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "mynteye/logger.h"
-
+#include "mynteye/device/device.h"
-#include "mynteye/device.h"
+#include "mynteye/device/utils.h"
-#include "mynteye/utils.h"
 
 #include "writer/device_writer.h"
 

tools/writer/save_all_infos.cc

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "mynteye/logger.h"
-
+#include "mynteye/device/device.h"
-#include "mynteye/device.h"
+#include "mynteye/device/utils.h"
-#include "mynteye/utils.h"
 
 #include "writer/device_writer.h"
 

wrappers/python/src/mynteye_py.cc

@@ -11,6 +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 <vector>
 
 // #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -23,11 +24,9 @@
 
 #include <opencv2/core/core.hpp>
 
-#include <vector>
-
-#include "mynteye/api.h"
 #include "mynteye/logger.h"
-#include "mynteye/utils.h"
+#include "mynteye/api/api.h"
+#include "mynteye/device/utils.h"
 
 #include "array_indexing_suite.hpp"
 #include "array_ref.hpp"

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

@@ -33,10 +33,10 @@
 #include <map>
 #include <string>
 
-#include "mynteye/api.h"
-#include "mynteye/context.h"
-#include "mynteye/device.h"
 #include "mynteye/logger.h"
+#include "mynteye/api/api.h"
+#include "mynteye/device/context.h"
+#include "mynteye/device/device.h"
 
 #define FULL_PRECISION \
   std::fixed << std::setprecision(std::numeric_limits<double>::max_digits10)