From 63a8a60bdbcb8044c33a370e462cfc3e1e72cd06 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Wed, 3 Dec 2014 16:08:53 +0300 Subject: [PATCH] Fixed cvv module build - updated header inclusions - added export instruction to public methods - fixed some small problems --- modules/cvv/CMakeLists.txt | 2 +- modules/cvv/include/opencv2/cvv.hpp | 26 +++++++++++++++++++ modules/cvv/include/opencv2/cvv/cvv.hpp | 25 +++--------------- modules/cvv/include/opencv2/cvv/dmatch.hpp | 6 ++--- modules/cvv/include/opencv2/cvv/filter.hpp | 4 +-- .../cvv/include/opencv2/cvv/final_show.hpp | 3 ++- .../cvv/include/opencv2/cvv/show_image.hpp | 4 +-- modules/cvv/samples/cvv_demo.cpp | 13 ++++++---- modules/cvv/src/extension_api/api.hpp | 2 +- .../cvv/src/gui/rawview_group_subtable.cpp | 6 ++--- modules/cvv/src/gui/rawview_table_row.cpp | 2 ++ modules/cvv/src/gui/rawview_table_row.hpp | 4 +-- modules/cvv/src/impl/call.hpp | 4 +-- modules/cvv/src/impl/data_controller.hpp | 2 +- modules/cvv/src/impl/filter_call.hpp | 2 +- modules/cvv/src/impl/match_call.hpp | 4 +-- modules/cvv/src/impl/single_image_call.hpp | 2 +- modules/cvv/src/qtutil/autofilterwidget.hpp | 2 +- .../src/qtutil/filter/diffFilterWidget.cpp | 6 ++--- .../src/qtutil/filter/grayfilterwidget.hpp | 2 +- .../src/qtutil/filter/overlayfilterwidget.cpp | 2 +- .../src/qtutil/filter/sobelfilterwidget.cpp | 3 ++- .../cvv/src/qtutil/filterfunctionwidget.hpp | 2 +- .../cvv/src/qtutil/filterselectorwidget.hpp | 2 +- modules/cvv/src/qtutil/histogram.cpp | 6 ++--- modules/cvv/src/qtutil/histogram.hpp | 5 ++-- .../cvv/src/qtutil/matchview/colorutil.hpp | 2 +- .../cvv/src/qtutil/matchview/cvvkeypoint.hpp | 4 +-- modules/cvv/src/qtutil/matchview/cvvmatch.hpp | 4 +-- .../matchview/falsecolorkeypointpen.hpp | 2 +- .../qtutil/matchview/falsecolormatchpen.hpp | 2 +- .../matchview/keypointintervallselection.hpp | 2 +- .../qtutil/matchview/keypointmanagement.hpp | 2 +- .../matchview/keypointportionselector.hpp | 2 +- .../qtutil/matchview/keypointselection.hpp | 2 +- .../matchview/keypointselectionselector.hpp | 2 +- .../matchview/keypointsettingsselector.hpp | 2 +- .../qtutil/matchview/keypointshowsetting.hpp | 2 +- .../qtutil/matchview/keypointvaluechooser.hpp | 2 +- .../matchview/matchintervallselection.hpp | 2 +- .../src/qtutil/matchview/matchmanagement.hpp | 2 +- .../qtutil/matchview/matchportionselector.hpp | 2 +- .../cvv/src/qtutil/matchview/matchscene.hpp | 4 +-- .../src/qtutil/matchview/matchselection.hpp | 2 +- .../matchview/matchselectionselector.hpp | 2 +- .../matchview/matchsettingsselector.hpp | 2 +- .../src/qtutil/matchview/matchshowsetting.hpp | 2 +- .../src/qtutil/matchview/rawview_window.hpp | 4 +-- .../qtutil/matchview/showinrawviewwidget.hpp | 2 +- modules/cvv/src/qtutil/signalslot.hpp | 2 +- modules/cvv/src/qtutil/types.hpp | 2 +- modules/cvv/src/qtutil/util.cpp | 2 -- modules/cvv/src/qtutil/util.hpp | 5 ++-- modules/cvv/src/qtutil/zoomableimage.cpp | 1 + modules/cvv/src/qtutil/zoomableimage.hpp | 2 +- .../cvv/src/qtutil/zoomableimageoptpanel.hpp | 2 +- modules/cvv/src/view/defaultfilterview.hpp | 2 +- modules/cvv/src/view/dual_filter_view.cpp | 2 +- modules/cvv/src/view/filter_view.hpp | 2 +- modules/cvv/src/view/image_view.cpp | 2 +- modules/cvv/src/view/image_view.hpp | 7 +++-- modules/cvv/src/view/linematchview.hpp | 4 +-- modules/cvv/src/view/match_view.hpp | 4 +-- modules/cvv/src/view/pointmatchview.hpp | 4 +-- modules/cvv/src/view/rawview.hpp | 20 +++++++------- modules/cvv/src/view/singlefilterview.hpp | 2 +- .../cvv/src/view/translationsmatchview.hpp | 4 +-- modules/cvv/test/test_precomp.hpp | 4 +-- 68 files changed, 141 insertions(+), 127 deletions(-) create mode 100644 modules/cvv/include/opencv2/cvv.hpp diff --git a/modules/cvv/CMakeLists.txt b/modules/cvv/CMakeLists.txt index 609e5cc09..2bcbb1b7a 100644 --- a/modules/cvv/CMakeLists.txt +++ b/modules/cvv/CMakeLists.txt @@ -5,7 +5,7 @@ endif() # we need C++11 and want warnings: set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -pedantic") -ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow) +ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wmissing-declarations) # Qt5 set(CMAKE_AUTOMOC ON) diff --git a/modules/cvv/include/opencv2/cvv.hpp b/modules/cvv/include/opencv2/cvv.hpp new file mode 100644 index 000000000..38dfadbb1 --- /dev/null +++ b/modules/cvv/include/opencv2/cvv.hpp @@ -0,0 +1,26 @@ +#ifndef __OPENCV_CVV_HPP__ +#define __OPENCV_CVV_HPP__ + +/** +@defgroup cvv GUI for Interactive Visual Debugging of Computer Vision Programs + +Namespace for all functions is **cvv**, i.e. *cvv::showImage()*. + +Compilation: + +- For development, i.e. for cvv GUI to show up, compile your code using cvv with + *g++ -DCVVISUAL_DEBUGMODE*. +- For release, i.e. cvv calls doing nothing, compile your code without above flag. + +See cvv tutorial for a commented example application using cvv. + +*/ + +#include +#include +#include +#include +#include +#include + +#endif //__OPENCV_CVV_HPP__ diff --git a/modules/cvv/include/opencv2/cvv/cvv.hpp b/modules/cvv/include/opencv2/cvv/cvv.hpp index ef9e29b0f..592096db7 100644 --- a/modules/cvv/include/opencv2/cvv/cvv.hpp +++ b/modules/cvv/include/opencv2/cvv/cvv.hpp @@ -1,22 +1,5 @@ -/** -@defgroup cvv GUI for Interactive Visual Debugging of Computer Vision Programs - -Namespace for all functions is **cvv**, i.e. *cvv::showImage()*. - -Compilation: - -- For development, i.e. for cvv GUI to show up, compile your code using cvv with - *g++ -DCVVISUAL_DEBUGMODE*. -- For release, i.e. cvv calls doing nothing, compile your code without above flag. - -See cvv tutorial for a commented example application using cvv. - -*/ - -#include -#include -#include -#include -#include -#include +#ifdef __OPENCV_BUILD +#error this is a compatibility header which should not be used inside the OpenCV library +#endif +#include "opencv2/cvv.hpp" diff --git a/modules/cvv/include/opencv2/cvv/dmatch.hpp b/modules/cvv/include/opencv2/cvv/dmatch.hpp index 597bced31..d152cb43a 100644 --- a/modules/cvv/include/opencv2/cvv/dmatch.hpp +++ b/modules/cvv/include/opencv2/cvv/dmatch.hpp @@ -3,8 +3,8 @@ #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "call_meta_data.hpp" #include "debug_mode.hpp" @@ -21,7 +21,7 @@ namespace cvv namespace impl { -void debugDMatch(cv::InputArray img1, std::vector keypoints1, +CV_EXPORTS void debugDMatch(cv::InputArray img1, std::vector keypoints1, cv::InputArray img2, std::vector keypoints2, std::vector matches, const CallMetaData &data, const char *description, const char *view, diff --git a/modules/cvv/include/opencv2/cvv/filter.hpp b/modules/cvv/include/opencv2/cvv/filter.hpp index 07cc3b1db..824df2437 100644 --- a/modules/cvv/include/opencv2/cvv/filter.hpp +++ b/modules/cvv/include/opencv2/cvv/filter.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "call_meta_data.hpp" #include "debug_mode.hpp" @@ -21,7 +21,7 @@ namespace cvv namespace impl { // implementation outside API -void debugFilter(cv::InputArray original, cv::InputArray result, +CV_EXPORTS void debugFilter(cv::InputArray original, cv::InputArray result, const CallMetaData &data, const char *description, const char *view); } // namespace impl diff --git a/modules/cvv/include/opencv2/cvv/final_show.hpp b/modules/cvv/include/opencv2/cvv/final_show.hpp index 29df5eec2..60a096c90 100644 --- a/modules/cvv/include/opencv2/cvv/final_show.hpp +++ b/modules/cvv/include/opencv2/cvv/final_show.hpp @@ -1,6 +1,7 @@ #ifndef CVVISUAL_FINAL_SHOW_HPP #define CVVISUAL_FINAL_SHOW_HPP +#include "opencv2/core.hpp" #include "debug_mode.hpp" namespace cvv @@ -11,7 +12,7 @@ namespace cvv namespace impl { -void finalShow(); +CV_EXPORTS void finalShow(); } /** @brief Passes the control to the debug-window for a last time. diff --git a/modules/cvv/include/opencv2/cvv/show_image.hpp b/modules/cvv/include/opencv2/cvv/show_image.hpp index bf56e7e49..417dfb2ac 100644 --- a/modules/cvv/include/opencv2/cvv/show_image.hpp +++ b/modules/cvv/include/opencv2/cvv/show_image.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "call_meta_data.hpp" #include "debug_mode.hpp" @@ -21,7 +21,7 @@ namespace cvv namespace impl { // implementation outside API -void showImage(cv::InputArray img, const CallMetaData &data, +CV_EXPORTS void showImage(cv::InputArray img, const CallMetaData &data, const char *description, const char *view); } // namespace impl diff --git a/modules/cvv/samples/cvv_demo.cpp b/modules/cvv/samples/cvv_demo.cpp index b8f5bd4d2..096d7f608 100644 --- a/modules/cvv/samples/cvv_demo.cpp +++ b/modules/cvv/samples/cvv_demo.cpp @@ -3,9 +3,11 @@ #include // library includes -#include -#include -#include +#include +#include +#include +#include +#include #define CVVISUAL_DEBUGMODE #include @@ -14,6 +16,7 @@ #include #include +using namespace cv; template std::string toString(const T& p_arg) { @@ -83,7 +86,7 @@ main(int argc, char** argv) cv::Mat prevDescriptors; int maxFeatureCount = 500; - cv::ORB detector(maxFeatureCount); + Ptr detector = ORB::create(maxFeatureCount); cv::BFMatcher matcher(cv::NORM_HAMMING); @@ -105,7 +108,7 @@ main(int argc, char** argv) // detect ORB features std::vector keypoints; cv::Mat descriptors; - detector(imgGray, cv::noArray(), keypoints, descriptors); + detector->detectAndCompute(imgGray, cv::noArray(), keypoints, descriptors); printf("%d: detected %zd keypoints\n", imgId, keypoints.size()); // match them to previous image (if available) diff --git a/modules/cvv/src/extension_api/api.hpp b/modules/cvv/src/extension_api/api.hpp index cab7b6c16..746fb3d39 100644 --- a/modules/cvv/src/extension_api/api.hpp +++ b/modules/cvv/src/extension_api/api.hpp @@ -1,7 +1,7 @@ #ifndef CVVISUAL_EXTENSION_API_HPP #define CVVISUAL_EXTENSION_API_HPP -#include +#include #include #include diff --git a/modules/cvv/src/gui/rawview_group_subtable.cpp b/modules/cvv/src/gui/rawview_group_subtable.cpp index cd2daac43..c6f6f6e36 100644 --- a/modules/cvv/src/gui/rawview_group_subtable.cpp +++ b/modules/cvv/src/gui/rawview_group_subtable.cpp @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -128,7 +128,7 @@ void RawviewGroupSubtable::customMenuRequested(QPoint location) { menu->addAction(new QAction("Show selected rows in view", this)); } - + auto formats = RawviewTableRow::getAvailableTextFormats(); for (auto format : formats) { diff --git a/modules/cvv/src/gui/rawview_table_row.cpp b/modules/cvv/src/gui/rawview_table_row.cpp index 6d7b45b11..c69cb47d1 100644 --- a/modules/cvv/src/gui/rawview_table_row.cpp +++ b/modules/cvv/src/gui/rawview_table_row.cpp @@ -10,6 +10,8 @@ #include "../qtutil/util.hpp" #include "../stfl/stringutils.hpp" +#include + namespace cvv { namespace gui diff --git a/modules/cvv/src/gui/rawview_table_row.hpp b/modules/cvv/src/gui/rawview_table_row.hpp index e42f81be7..8a8ae1712 100644 --- a/modules/cvv/src/gui/rawview_table_row.hpp +++ b/modules/cvv/src/gui/rawview_table_row.hpp @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/modules/cvv/src/impl/call.hpp b/modules/cvv/src/impl/call.hpp index 042510947..e7e924aa5 100644 --- a/modules/cvv/src/impl/call.hpp +++ b/modules/cvv/src/impl/call.hpp @@ -5,8 +5,8 @@ #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "opencv2/cvv/call_meta_data.hpp" diff --git a/modules/cvv/src/impl/data_controller.hpp b/modules/cvv/src/impl/data_controller.hpp index 18956d1c2..015a84c85 100644 --- a/modules/cvv/src/impl/data_controller.hpp +++ b/modules/cvv/src/impl/data_controller.hpp @@ -4,7 +4,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "call.hpp" #include "../controller/view_controller.hpp" diff --git a/modules/cvv/src/impl/filter_call.hpp b/modules/cvv/src/impl/filter_call.hpp index 885873c8d..445f108bb 100644 --- a/modules/cvv/src/impl/filter_call.hpp +++ b/modules/cvv/src/impl/filter_call.hpp @@ -5,7 +5,7 @@ #include "call.hpp" -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" namespace cvv { diff --git a/modules/cvv/src/impl/match_call.hpp b/modules/cvv/src/impl/match_call.hpp index e4cd14ddd..ee548510b 100644 --- a/modules/cvv/src/impl/match_call.hpp +++ b/modules/cvv/src/impl/match_call.hpp @@ -5,8 +5,8 @@ #include #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "call.hpp" diff --git a/modules/cvv/src/impl/single_image_call.hpp b/modules/cvv/src/impl/single_image_call.hpp index 5d04b1f68..81d748d3d 100644 --- a/modules/cvv/src/impl/single_image_call.hpp +++ b/modules/cvv/src/impl/single_image_call.hpp @@ -5,7 +5,7 @@ #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" namespace cvv { diff --git a/modules/cvv/src/qtutil/autofilterwidget.hpp b/modules/cvv/src/qtutil/autofilterwidget.hpp index d36ecfdc7..3024f139b 100644 --- a/modules/cvv/src/qtutil/autofilterwidget.hpp +++ b/modules/cvv/src/qtutil/autofilterwidget.hpp @@ -5,7 +5,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include #include diff --git a/modules/cvv/src/qtutil/filter/diffFilterWidget.cpp b/modules/cvv/src/qtutil/filter/diffFilterWidget.cpp index 7a819d106..05e296389 100644 --- a/modules/cvv/src/qtutil/filter/diffFilterWidget.cpp +++ b/modules/cvv/src/qtutil/filter/diffFilterWidget.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include diff --git a/modules/cvv/src/qtutil/filter/grayfilterwidget.hpp b/modules/cvv/src/qtutil/filter/grayfilterwidget.hpp index 4aec4eced..5701192c9 100644 --- a/modules/cvv/src/qtutil/filter/grayfilterwidget.hpp +++ b/modules/cvv/src/qtutil/filter/grayfilterwidget.hpp @@ -10,7 +10,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "../filterfunctionwidget.hpp" #include "../../util/observer_ptr.hpp" diff --git a/modules/cvv/src/qtutil/filter/overlayfilterwidget.cpp b/modules/cvv/src/qtutil/filter/overlayfilterwidget.cpp index f153253a2..a3e5d2fd9 100644 --- a/modules/cvv/src/qtutil/filter/overlayfilterwidget.cpp +++ b/modules/cvv/src/qtutil/filter/overlayfilterwidget.cpp @@ -1,5 +1,5 @@ -#include +#include #include #include "QLabel" diff --git a/modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp b/modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp index c3311c685..acb86229a 100644 --- a/modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp +++ b/modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp @@ -1,6 +1,7 @@ #include "sobelfilterwidget.hpp" -#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/imgproc.hpp" +#include "opencv2/imgproc/types_c.h" #include #include diff --git a/modules/cvv/src/qtutil/filterfunctionwidget.hpp b/modules/cvv/src/qtutil/filterfunctionwidget.hpp index da6c16347..a55f7fc53 100644 --- a/modules/cvv/src/qtutil/filterfunctionwidget.hpp +++ b/modules/cvv/src/qtutil/filterfunctionwidget.hpp @@ -9,7 +9,7 @@ #include // OCV -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" // cvv #include "signalslot.hpp" diff --git a/modules/cvv/src/qtutil/filterselectorwidget.hpp b/modules/cvv/src/qtutil/filterselectorwidget.hpp index d4a2887e7..bbadc20fc 100644 --- a/modules/cvv/src/qtutil/filterselectorwidget.hpp +++ b/modules/cvv/src/qtutil/filterselectorwidget.hpp @@ -12,7 +12,7 @@ #include // OCV -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" // CVV #include "signalslot.hpp" diff --git a/modules/cvv/src/qtutil/histogram.cpp b/modules/cvv/src/qtutil/histogram.cpp index ddfbe2528..e5227009f 100644 --- a/modules/cvv/src/qtutil/histogram.cpp +++ b/modules/cvv/src/qtutil/histogram.cpp @@ -123,10 +123,10 @@ cv::Mat Histogram::drawHist(const std::vector& channelHists, cv::Size h int thickness = 1; for (int binTextId = 0; binTextId < binCount; binTextId += binTextStep) { - auto text = QString::number(binTextId).toStdString(); - auto textSize = cv::getTextSize(text, fontFace, fontScale, thickness, NULL); + auto text = QString::number(binTextId).toLatin1(); + auto textSize = cv::getTextSize(text.data(), fontFace, fontScale, thickness, NULL); auto textPt = cv::Point(std::max(0, binWidth * binTextId - textSize.width/2), histSize.height); - cv::putText(histMat, text, textPt, fontFace, fontScale, textColor, thickness); + cv::putText(histMat, text.data(), textPt, fontFace, fontScale, textColor, thickness); auto linePt1 = cv::Point(binWidth * binTextId, 0); auto linePt2 = cv::Point(binWidth * binTextId, histSize.height - textSize.height); cv::line(histMat, linePt1, linePt2, textColor); diff --git a/modules/cvv/src/qtutil/histogram.hpp b/modules/cvv/src/qtutil/histogram.hpp index 33b44ba3a..1aabcda36 100644 --- a/modules/cvv/src/qtutil/histogram.hpp +++ b/modules/cvv/src/qtutil/histogram.hpp @@ -3,9 +3,8 @@ #include -#include -#include -#include +#include +#include #include "zoomableimage.hpp" diff --git a/modules/cvv/src/qtutil/matchview/colorutil.hpp b/modules/cvv/src/qtutil/matchview/colorutil.hpp index 21064919c..bdc3a6624 100644 --- a/modules/cvv/src/qtutil/matchview/colorutil.hpp +++ b/modules/cvv/src/qtutil/matchview/colorutil.hpp @@ -5,7 +5,7 @@ #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" namespace cvv { diff --git a/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp b/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp index 7b1911835..4ab57ba2d 100644 --- a/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp +++ b/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp @@ -9,8 +9,8 @@ #include #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "keypointsettings.hpp" #include "../zoomableimage.hpp" diff --git a/modules/cvv/src/qtutil/matchview/cvvmatch.hpp b/modules/cvv/src/qtutil/matchview/cvvmatch.hpp index dd57d952a..adedc212e 100644 --- a/modules/cvv/src/qtutil/matchview/cvvmatch.hpp +++ b/modules/cvv/src/qtutil/matchview/cvvmatch.hpp @@ -9,8 +9,8 @@ #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "matchsettings.hpp" #include "cvvkeypoint.hpp" diff --git a/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp b/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp index 137e7b04d..555730d2b 100644 --- a/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp +++ b/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointvaluechooser.hpp" #include "keypointsettings.hpp" diff --git a/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp b/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp index ca3ba0fc8..259c5f09a 100644 --- a/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp +++ b/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchsettings.hpp" diff --git a/modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp b/modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp index c6dcb8040..7f88cc532 100644 --- a/modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp @@ -1,7 +1,7 @@ #ifndef CVVISUAL_KEY_POINT_INTERVALL_SELECTOR #define CVVISUAL_KEY_POINT_INTERVALL_SELECTOR -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointselection.hpp" #include "keypointvaluechooser.hpp" diff --git a/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp b/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp index a81286015..1c85a442b 100644 --- a/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp @@ -5,7 +5,7 @@ #include "../../util/util.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointselectionselector.hpp" #include "keypointsettingsselector.hpp" diff --git a/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp b/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp index 77c382c95..ac03b648c 100644 --- a/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointselection.hpp" #include "keypointvaluechooser.hpp" diff --git a/modules/cvv/src/qtutil/matchview/keypointselection.hpp b/modules/cvv/src/qtutil/matchview/keypointselection.hpp index 02cafcafd..0d567dfd2 100644 --- a/modules/cvv/src/qtutil/matchview/keypointselection.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointselection.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" namespace cvv{ namespace qtutil{ diff --git a/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp b/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp index e272bb013..d4ccfc7b1 100644 --- a/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointselection.hpp" #include "../registerhelper.hpp" diff --git a/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp b/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp index 9049217b4..6c99099f4 100644 --- a/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointsettings.hpp" #include "../registerhelper.hpp" diff --git a/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp b/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp index 8b9eac5c6..46c984a07 100644 --- a/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp @@ -5,7 +5,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "keypointsettings.hpp" namespace cvv{ namespace qtutil{ diff --git a/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp b/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp index 845b4f273..4a050729a 100644 --- a/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp @@ -4,7 +4,7 @@ #include #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" namespace cvv{ namespace qtutil{ diff --git a/modules/cvv/src/qtutil/matchview/matchintervallselection.hpp b/modules/cvv/src/qtutil/matchview/matchintervallselection.hpp index cfbff6cdb..53985b793 100644 --- a/modules/cvv/src/qtutil/matchview/matchintervallselection.hpp +++ b/modules/cvv/src/qtutil/matchview/matchintervallselection.hpp @@ -1,7 +1,7 @@ #ifndef CVVISUAL_MATCH_INTERVALL_SELECTOR #define CVVISUAL_MATCH_INTERVALL_SELECTOR -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchselection.hpp" #include "../intervallselector.hpp" diff --git a/modules/cvv/src/qtutil/matchview/matchmanagement.hpp b/modules/cvv/src/qtutil/matchview/matchmanagement.hpp index 63142450e..ab617892d 100644 --- a/modules/cvv/src/qtutil/matchview/matchmanagement.hpp +++ b/modules/cvv/src/qtutil/matchview/matchmanagement.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchselectionselector.hpp" #include "matchsettingsselector.hpp" diff --git a/modules/cvv/src/qtutil/matchview/matchportionselector.hpp b/modules/cvv/src/qtutil/matchview/matchportionselector.hpp index 783cb8180..e860914f9 100644 --- a/modules/cvv/src/qtutil/matchview/matchportionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/matchportionselector.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchselection.hpp" #include "../portionselector.hpp" diff --git a/modules/cvv/src/qtutil/matchview/matchscene.hpp b/modules/cvv/src/qtutil/matchview/matchscene.hpp index 001e358aa..e9b739737 100644 --- a/modules/cvv/src/qtutil/matchview/matchscene.hpp +++ b/modules/cvv/src/qtutil/matchview/matchscene.hpp @@ -8,8 +8,8 @@ #include #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "cvvmatch.hpp" #include "cvvkeypoint.hpp" #include "zoomableproxyobject.hpp" diff --git a/modules/cvv/src/qtutil/matchview/matchselection.hpp b/modules/cvv/src/qtutil/matchview/matchselection.hpp index 4499d775f..f5a85e550 100644 --- a/modules/cvv/src/qtutil/matchview/matchselection.hpp +++ b/modules/cvv/src/qtutil/matchview/matchselection.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" namespace cvv{ namespace qtutil{ diff --git a/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp b/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp index 09265fef4..e245b8308 100644 --- a/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchselection.hpp" #include "../registerhelper.hpp" diff --git a/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp b/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp index e1ecc9ba1..5c73e9e8f 100644 --- a/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp +++ b/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchsettings.hpp" #include "../registerhelper.hpp" diff --git a/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp b/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp index 544ad7ffd..4fd4c814a 100644 --- a/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp +++ b/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp @@ -5,7 +5,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchsettings.hpp" #include "cvvmatch.hpp" diff --git a/modules/cvv/src/qtutil/matchview/rawview_window.hpp b/modules/cvv/src/qtutil/matchview/rawview_window.hpp index 56e82ba11..7198c2cdc 100644 --- a/modules/cvv/src/qtutil/matchview/rawview_window.hpp +++ b/modules/cvv/src/qtutil/matchview/rawview_window.hpp @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp b/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp index d496197f9..2961b7232 100644 --- a/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp +++ b/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/features2d.hpp" #include "matchmanagement.hpp" #include "keypointmanagement.hpp" diff --git a/modules/cvv/src/qtutil/signalslot.hpp b/modules/cvv/src/qtutil/signalslot.hpp index 634e48f12..d00140b5e 100644 --- a/modules/cvv/src/qtutil/signalslot.hpp +++ b/modules/cvv/src/qtutil/signalslot.hpp @@ -5,7 +5,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include // QT #include diff --git a/modules/cvv/src/qtutil/types.hpp b/modules/cvv/src/qtutil/types.hpp index 78330bb54..872ffd10d 100644 --- a/modules/cvv/src/qtutil/types.hpp +++ b/modules/cvv/src/qtutil/types.hpp @@ -1,7 +1,7 @@ #ifndef CVVISUAL_TYPES_HPP #define CVVISUAL_TYPES_HPP -#include "opencv2/core/core.hpp" +#include namespace cvv diff --git a/modules/cvv/src/qtutil/util.cpp b/modules/cvv/src/qtutil/util.cpp index 945132883..b1c59f3bc 100644 --- a/modules/cvv/src/qtutil/util.cpp +++ b/modules/cvv/src/qtutil/util.cpp @@ -5,8 +5,6 @@ #include #include -#include - #include #include #include diff --git a/modules/cvv/src/qtutil/util.hpp b/modules/cvv/src/qtutil/util.hpp index f47726cba..bd13dee27 100644 --- a/modules/cvv/src/qtutil/util.hpp +++ b/modules/cvv/src/qtutil/util.hpp @@ -9,8 +9,9 @@ #include #include -#include "opencv2/core/core.hpp" -#include "opencv2/opencv.hpp" +#include "opencv2/core.hpp" +#include "opencv2/imgproc.hpp" +#include "opencv2/features2d.hpp" namespace cvv diff --git a/modules/cvv/src/qtutil/zoomableimage.cpp b/modules/cvv/src/qtutil/zoomableimage.cpp index be76c2dc4..6f9220c12 100644 --- a/modules/cvv/src/qtutil/zoomableimage.cpp +++ b/modules/cvv/src/qtutil/zoomableimage.cpp @@ -12,6 +12,7 @@ #include "types.hpp" #include +#include /** * @brief Puts a value into a stringstream. (used to print char and uchar as a diff --git a/modules/cvv/src/qtutil/zoomableimage.hpp b/modules/cvv/src/qtutil/zoomableimage.hpp index 17a015448..785a238ab 100644 --- a/modules/cvv/src/qtutil/zoomableimage.hpp +++ b/modules/cvv/src/qtutil/zoomableimage.hpp @@ -12,7 +12,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "util.hpp" #include "../util/util.hpp" diff --git a/modules/cvv/src/qtutil/zoomableimageoptpanel.hpp b/modules/cvv/src/qtutil/zoomableimageoptpanel.hpp index 64b6723e0..96cbbd7e3 100644 --- a/modules/cvv/src/qtutil/zoomableimageoptpanel.hpp +++ b/modules/cvv/src/qtutil/zoomableimageoptpanel.hpp @@ -6,7 +6,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "zoomableimage.hpp" #include "util.hpp" diff --git a/modules/cvv/src/view/defaultfilterview.hpp b/modules/cvv/src/view/defaultfilterview.hpp index 8925fea59..e16722e34 100644 --- a/modules/cvv/src/view/defaultfilterview.hpp +++ b/modules/cvv/src/view/defaultfilterview.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "filter_view.hpp" diff --git a/modules/cvv/src/view/dual_filter_view.cpp b/modules/cvv/src/view/dual_filter_view.cpp index 3bf2abe83..37e0fa32a 100644 --- a/modules/cvv/src/view/dual_filter_view.cpp +++ b/modules/cvv/src/view/dual_filter_view.cpp @@ -5,7 +5,7 @@ #include #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include #include diff --git a/modules/cvv/src/view/filter_view.hpp b/modules/cvv/src/view/filter_view.hpp index 8cf2b374b..a2837514b 100644 --- a/modules/cvv/src/view/filter_view.hpp +++ b/modules/cvv/src/view/filter_view.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace cvv { diff --git a/modules/cvv/src/view/image_view.cpp b/modules/cvv/src/view/image_view.cpp index c7d08bd12..3f5077bc2 100644 --- a/modules/cvv/src/view/image_view.cpp +++ b/modules/cvv/src/view/image_view.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "../qtutil/accordion.hpp" #include "../qtutil/zoomableimageoptpanel.hpp" diff --git a/modules/cvv/src/view/image_view.hpp b/modules/cvv/src/view/image_view.hpp index 829a31fa2..961e49750 100644 --- a/modules/cvv/src/view/image_view.hpp +++ b/modules/cvv/src/view/image_view.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "../qtutil/zoomableimage.hpp" #include "../util/observer_ptr.hpp" @@ -44,12 +44,12 @@ signals: * @param parent of this QWidget. **/ ImageView(const cv::Mat &image, QWidget *parent = nullptr); - + /** * @brief Shows the full image. */ void showFullImage(); - + private: util::ObserverPtr image; }; @@ -57,4 +57,3 @@ signals: } // namespaces #endif - diff --git a/modules/cvv/src/view/linematchview.hpp b/modules/cvv/src/view/linematchview.hpp index f08f83827..049c02fd6 100644 --- a/modules/cvv/src/view/linematchview.hpp +++ b/modules/cvv/src/view/linematchview.hpp @@ -3,8 +3,8 @@ #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "../qtutil/matchview/matchmanagement.hpp" #include "../qtutil/matchview/keypointmanagement.hpp" diff --git a/modules/cvv/src/view/match_view.hpp b/modules/cvv/src/view/match_view.hpp index 32baa0899..074951d44 100644 --- a/modules/cvv/src/view/match_view.hpp +++ b/modules/cvv/src/view/match_view.hpp @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include #include "../impl/match_call.hpp" diff --git a/modules/cvv/src/view/pointmatchview.hpp b/modules/cvv/src/view/pointmatchview.hpp index 1eb18a2d0..e9919ac21 100644 --- a/modules/cvv/src/view/pointmatchview.hpp +++ b/modules/cvv/src/view/pointmatchview.hpp @@ -3,8 +3,8 @@ #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "../qtutil/matchview/matchmanagement.hpp" #include "match_view.hpp" diff --git a/modules/cvv/src/view/rawview.hpp b/modules/cvv/src/view/rawview.hpp index 665d88d9c..94678b0df 100644 --- a/modules/cvv/src/view/rawview.hpp +++ b/modules/cvv/src/view/rawview.hpp @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include #include @@ -74,7 +74,7 @@ public: * @param parent of this QWidget. */ Rawview(const impl::MatchCall &call, QWidget *parent = nullptr) - : Rawview(call.keyPoints1(), call.keyPoints2(), + : Rawview(call.keyPoints1(), call.keyPoints2(), call.matches(), call.usesTrainDescriptor()) { setParent(parent); @@ -87,11 +87,11 @@ public: * menus? */ bool doesShowShowInViewMenu(); - + virtual std::vector getMatchSelection(); virtual std::vector getKeyPointSelection(); - + signals: /** * @brief Requests to update the left footer of the window that displays @@ -119,7 +119,7 @@ signals: * @param keyPoints seleted single key points */ void keyPointsSelected(const std::vector &keyPoints); - + public slots: /** @@ -138,11 +138,11 @@ public slots: */ void selectKeyPoints(const std::vector &keyPoints); - + virtual void setMatchSelection(std::vector matches); virtual void setKeyPointSelection(std::vector keyPoints); - + /** * @brief Issues the matchesSelected and the keyPointsSelected signal. * It uses the referenced key points (via the given matches) to find the @@ -150,7 +150,7 @@ public slots: * @param matches the user selected matches. */ void matchesKeyPointsSelected(const std::vector &matches); - + private slots: void filterQuery(QString query); @@ -170,7 +170,7 @@ private: gui::RawviewTable *table; bool showShowInViewMenu = false; bool usesTrainDescriptor = true; - + void initEngine(); }; } diff --git a/modules/cvv/src/view/singlefilterview.hpp b/modules/cvv/src/view/singlefilterview.hpp index 6368241c1..7bc1a8826 100644 --- a/modules/cvv/src/view/singlefilterview.hpp +++ b/modules/cvv/src/view/singlefilterview.hpp @@ -3,7 +3,7 @@ #include -#include "opencv2/core/core.hpp" +#include "opencv2/core.hpp" #include "filter_view.hpp" #include "../impl/filter_call.hpp" diff --git a/modules/cvv/src/view/translationsmatchview.hpp b/modules/cvv/src/view/translationsmatchview.hpp index b2f48cfab..3cbdcd47e 100644 --- a/modules/cvv/src/view/translationsmatchview.hpp +++ b/modules/cvv/src/view/translationsmatchview.hpp @@ -3,8 +3,8 @@ #include -#include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" +#include "opencv2/core.hpp" +#include "opencv2/features2d.hpp" #include "../qtutil/matchview/matchmanagement.hpp" #include "../qtutil/matchview/keypointmanagement.hpp" diff --git a/modules/cvv/test/test_precomp.hpp b/modules/cvv/test/test_precomp.hpp index a2cf12fd4..ec8333687 100644 --- a/modules/cvv/test/test_precomp.hpp +++ b/modules/cvv/test/test_precomp.hpp @@ -11,7 +11,7 @@ #include #include -#include -#include +#include +#include #endif