|
@@ -88,33 +88,33 @@ int CTeaSort::detect(
|
|
|
//5 detect
|
|
|
vector<Bbox> droplets_raw;
|
|
|
int dn = detect_impl(m_raw_img, drop_regions, droplets_raw);
|
|
|
- if (dn < 2 && m_dtype == img_type::tea_grab) {
|
|
|
- //up-down flip
|
|
|
- cv::Mat flip_img;
|
|
|
- cv::flip(m_raw_img, flip_img, 0);
|
|
|
- if (m_cp.image_show) {
|
|
|
- imshow_wait("flip_img", flip_img);
|
|
|
- }
|
|
|
-
|
|
|
- vector<Bbox> droplets_flip;
|
|
|
- int dn_flip = detect_impl(flip_img, drop_regions, droplets_flip);
|
|
|
- for (auto&b: droplets_flip) {
|
|
|
- int y2 = flip_img.rows - b.y1;
|
|
|
- int y1 = flip_img.rows - b.y2;
|
|
|
- b.y1 = y1;
|
|
|
- b.y2 = y2;
|
|
|
-
|
|
|
- for (int i = 0; i < 5; ++i) {
|
|
|
- b.ppoint[2 * i + 1] = flip_img.rows - b.ppoint[2 * i + 1];
|
|
|
- }
|
|
|
- }
|
|
|
- if (dn_flip > 0) {
|
|
|
- droplets_raw.insert(
|
|
|
- droplets_raw.end(),
|
|
|
- droplets_flip.begin(),
|
|
|
- droplets_flip.end());
|
|
|
- }
|
|
|
- }
|
|
|
+ //if (dn < 2 && m_dtype == img_type::tea_grab) {
|
|
|
+ // //up-down flip
|
|
|
+ // cv::Mat flip_img;
|
|
|
+ // cv::flip(m_raw_img, flip_img, 0);
|
|
|
+ // if (m_cp.image_show) {
|
|
|
+ // imshow_wait("flip_img", flip_img);
|
|
|
+ // }
|
|
|
+
|
|
|
+ // vector<Bbox> droplets_flip;
|
|
|
+ // int dn_flip = detect_impl(flip_img, drop_regions, droplets_flip);
|
|
|
+ // for (auto&b: droplets_flip) {
|
|
|
+ // int y2 = flip_img.rows - b.y1;
|
|
|
+ // int y1 = flip_img.rows - b.y2;
|
|
|
+ // b.y1 = y1;
|
|
|
+ // b.y2 = y2;
|
|
|
+ //
|
|
|
+ // for (int i = 0; i < 5; ++i) {
|
|
|
+ // b.ppoint[2 * i + 1] = flip_img.rows - b.ppoint[2 * i + 1];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (dn_flip > 0) {
|
|
|
+ // droplets_raw.insert(
|
|
|
+ // droplets_raw.end(),
|
|
|
+ // droplets_flip.begin(),
|
|
|
+ // droplets_flip.end());
|
|
|
+ // }
|
|
|
+ //}
|
|
|
/*for (auto rect : drop_regions) {
|
|
|
Mat roi = m_raw_img(rect);
|
|
|
vector<Bbox> head_droplets = m_drop_detector.RunModel(roi, m_pLogger);
|