From 565174378418b77d380dd09508d29732c4623b93 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Sat, 6 Oct 2012 22:22:53 +0400 Subject: [PATCH] remove debug imshow from code --- .../include/opencv2/objdetect/objdetect.hpp | 2 + modules/objdetect/src/softcascade.cpp | 44 ++++--------------- modules/objdetect/test/test_softcascade.cpp | 35 ++++++++++++--- 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp index 3724eaadb0..f28d683e58 100644 --- a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp @@ -501,6 +501,8 @@ public: int kind; enum {PEDESTRIAN = 0}; + + Detection(const cv::Rect& r, const float c, int k = PEDESTRIAN) : rect(r), confidence(c), kind(k) {} }; //! An empty cascade will be created. diff --git a/modules/objdetect/src/softcascade.cpp b/modules/objdetect/src/softcascade.cpp index 8d1853c721..cec7741f2b 100644 --- a/modules/objdetect/src/softcascade.cpp +++ b/modules/objdetect/src/softcascade.cpp @@ -204,6 +204,7 @@ struct Level enum { R_SHIFT = 1 << 15 }; float scaling[2]; + typedef cv::SoftCascade::Detection detection_t; Level(const Octave& oct, const float scale, const int shrinkage, const int w, const int h) : octave(&oct), origScale(scale), relScale(scale / oct.scale), shrScale (relScale / (float)shrinkage), @@ -215,12 +216,12 @@ struct Level scaleshift = relScale * (1 << 16); } - void markDetection(const int x, const int y, float confidence, std::vector& detections) const + void markDetection(const int x, const int y, float confidence, std::vector& detections) const { int shrinkage = (*octave).shrinkage; cv::Rect rect(cvRound(x * shrinkage), cvRound(y * shrinkage), objSize.width, objSize.height); - detections.push_back(Object(rect, confidence)); + detections.push_back(detection_t(rect, confidence)); } float rescale(cv::Rect& scaledRect, const float threshold, int idx) const @@ -432,7 +433,8 @@ struct cv::SoftCascade::Filds typedef std::vector::iterator octIt_t; - void detectAt(const int dx, const int dy, const Level& level, const ChannelStorage& storage, std::vector& detections) const + void detectAt(const int dx, const int dy, const Level& level, const ChannelStorage& storage, + std::vector& detections) const { dprintf("detect at: %d %d\n", dx, dy); @@ -685,12 +687,11 @@ bool cv::SoftCascade::load( const string& filename, const float minScale, const return true; } -#define DEBUG_SHOW_RESULT - void cv::SoftCascade::detectMultiScale(const Mat& image, const std::vector& /*rois*/, std::vector& objects, const int /*rejectfactor*/) const { typedef std::vector::const_iterator RIter_t; + // only color images are supperted CV_Assert(image.type() == CV_8UC3); @@ -704,49 +705,20 @@ void cv::SoftCascade::detectMultiScale(const Mat& image, const std::vector detections; - typedef std::vector::const_iterator lIt; - int total = 0, l = 0; + for (lIt it = fld.levels.begin(); it != fld.levels.end(); ++it) { const Level& level = *it; -#if defined WITH_DEBUG_OUT - std::cout << "================================ " << l++ << std::endl; -#else - (void)l; -#endif - // int dx = 79; int dy = 76; for (int dy = 0; dy < level.workRect.height; ++dy) { for (int dx = 0; dx < level.workRect.width; ++dx) { storage.offset = dy * storage.step + dx; - fld.detectAt(dx, dy, level, storage, detections); - - total++; + fld.detectAt(dx, dy, level, storage, objects); } } - -#if defined DEBUG_SHOW_RESULT - cv::Mat out = image.clone(); - - printf("TOTAL: %d from %d\n", (int)detections.size(),total) ; - - for(int i = 0; i < (int)detections.size(); ++i) - { - cv::rectangle(out, detections[i].rect, cv::Scalar(255, 0, 0, 255), 1); - } - - cv::imshow("out", out); - cv::waitKey(0); - std::cout << "work rect: " << level.workRect.width << " " << level.workRect.height << std::endl; -#endif - - detections.clear(); } - // std::swap(detections, objects); } \ No newline at end of file diff --git a/modules/objdetect/test/test_softcascade.cpp b/modules/objdetect/test/test_softcascade.cpp index 00b45f02d1..59428ea5d9 100644 --- a/modules/objdetect/test/test_softcascade.cpp +++ b/modules/objdetect/test/test_softcascade.cpp @@ -59,11 +59,36 @@ TEST(SoftCascade, detect) cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/bahnhof/image_00000000_0.png"); ASSERT_FALSE(colored.empty()); - std::vector objectBoxes; + std::vector objects; std::vector rois; rois.push_back(cv::Rect(0, 0, 640, 480)); - // ASSERT_NO_THROW( - // { - cascade.detectMultiScale(colored, rois, objectBoxes); - // }); + + cascade.detectMultiScale(colored, rois, objects); + + std::cout << "detected: " << (int)objects.size() << std::endl; + + cv::Mat out = colored.clone(); + int level = 0, total = 0; + int levelWidth = objects[0].rect.width; + + for(int i = 0 ; i < (int)objects.size(); ++i) + { + if (objects[i].rect.width != levelWidth) + { + std::cout << "Level: " << level << " total " << total << std::endl; + cv::imshow("out", out); + cv::waitKey(0); + + out = colored.clone(); + levelWidth = objects[i].rect.width; + total = 0; + level++; + } + cv::rectangle(out, objects[i].rect, cv::Scalar(255, 0, 0, 255), 1); + std::cout << "detection: " << objects[i].rect.x + << " " << objects[i].rect.y + << " " << objects[i].rect.width + << " " << objects[i].rect.height << std::endl; + total++; + } } \ No newline at end of file -- GitLab