tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop

Browse Source
This commit is contained in:
TinyOh 2019-02-02 14:12:27 +08:00
commit 56212380e4
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/api/CMakeLists.txt
View File

@ -30,12 +30,8 @@ make_executable(camera_a
## get_depth_with_region ## get_depth_with_region
if(OpenCV_VERSION VERSION_LESS 4.0)
make_executable(get_depth_with_region make_executable(get_depth_with_region
SRCS get_depth_with_region.cc SRCS get_depth_with_region.cc
LINK_LIBS mynteye ${OpenCV_LIBS} LINK_LIBS mynteye ${OpenCV_LIBS}
DLL_SEARCH_PATHS ${PRO_DIR}/_install/bin ${OpenCV_LIB_SEARCH_PATH} DLL_SEARCH_PATHS ${PRO_DIR}/_install/bin ${OpenCV_LIB_SEARCH_PATH}
) )
endif()

6
samples/api/get_depth_with_region.cc
View File

@ -30,17 +30,17 @@ class DepthRegion {
*/ */
void OnMouse(const int &event, const int &x, const int &y, const int &flags) { void OnMouse(const int &event, const int &x, const int &y, const int &flags) {
MYNTEYE_UNUSED(flags) MYNTEYE_UNUSED(flags)
if (event != CV_EVENT_MOUSEMOVE && event != CV_EVENT_LBUTTONDOWN) { if (event != cv::EVENT_MOUSEMOVE && event != cv::EVENT_LBUTTONDOWN) {
return; return;
} }
show_ = true; show_ = true;
if (event == CV_EVENT_MOUSEMOVE) { if (event == cv::EVENT_MOUSEMOVE) {
if (!selected_) { if (!selected_) {
point_.x = x; point_.x = x;
point_.y = y; point_.y = y;
} }
} else if (event == CV_EVENT_LBUTTONDOWN) { } else if (event == cv::EVENT_LBUTTONDOWN) {
if (selected_) { if (selected_) {
if (x >= static_cast<int>(point_.x - n_) && if (x >= static_cast<int>(point_.x - n_) &&
x <= static_cast<int>(point_.x + n_) && x <= static_cast<int>(point_.x + n_) &&

4
samples/tutorials/CMakeLists.txt
View File

@ -129,8 +129,6 @@ make_executable2(ctrl_manual_exposure
if(PCL_FOUND) if(PCL_FOUND)
if(OpenCV_VERSION VERSION_LESS 4.0)
make_executable2(get_depth_and_points make_executable2(get_depth_and_points
SRCS intermediate/get_depth_and_points.cc util/cv_painter.cc util/pc_viewer.cc SRCS intermediate/get_depth_and_points.cc util/cv_painter.cc util/pc_viewer.cc
WITH_OPENCV WITH_PCL WITH_OPENCV WITH_PCL
@ -138,6 +136,4 @@ make_executable2(get_depth_and_points
endif() endif()
endif()
# advanced level # advanced level

6
samples/tutorials/intermediate/get_depth_and_points.cc
View File

@ -34,17 +34,17 @@ class DepthRegion {
*/ */
void OnMouse(const int &event, const int &x, const int &y, const int &flags) { void OnMouse(const int &event, const int &x, const int &y, const int &flags) {
MYNTEYE_UNUSED(flags) MYNTEYE_UNUSED(flags)
if (event != CV_EVENT_MOUSEMOVE && event != CV_EVENT_LBUTTONDOWN) { if (event != cv::EVENT_MOUSEMOVE && event != cv::EVENT_LBUTTONDOWN) {
return; return;
} }
show_ = true; show_ = true;
if (event == CV_EVENT_MOUSEMOVE) { if (event == cv::EVENT_MOUSEMOVE) {
if (!selected_) { if (!selected_) {
point_.x = x; point_.x = x;
point_.y = y; point_.y = y;
} }
} else if (event == CV_EVENT_LBUTTONDOWN) { } else if (event == cv::EVENT_LBUTTONDOWN) {
if (selected_) { if (selected_) {
if (x >= static_cast<int>(point_.x - n_) && if (x >= static_cast<int>(point_.x - n_) &&
x <= static_cast<int>(point_.x + n_) && x <= static_cast<int>(point_.x + n_) &&