From 03757ce89faca704969118b6a229ad4963c55a19 Mon Sep 17 00:00:00 2001 From: gaillaro Date: Sun, 1 May 2005 11:18:21 +0000 Subject: * reglage de l'influence du yuv * integration de la nouvelle camera --- 2005/i/robert/src/ovision/see/magnifier.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '2005/i/robert/src/ovision/see/magnifier.cc') diff --git a/2005/i/robert/src/ovision/see/magnifier.cc b/2005/i/robert/src/ovision/see/magnifier.cc index e819437..5811328 100644 --- a/2005/i/robert/src/ovision/see/magnifier.cc +++ b/2005/i/robert/src/ovision/see/magnifier.cc @@ -49,12 +49,6 @@ Magnifier::analyse (std::vector &zoneList) // parcours de toutes les zones extraites for(std::vector::iterator iter = zoneList.begin (); iter != zoneList.end (); ++iter) { - // on vire si trop petit - // XXX test avec l'aire ? - //if (((iter->xmax - (iter->xmin)) * (iter->ymax - iter->ymin)) < oconfig_-> - if (((iter->xmax - iter->xmin) < oconfig_->minLengthZone) - || ((iter->ymax - iter->ymin) < oconfig_->minLengthZone)) - continue; // Vérifie qu'il n'y a pas de doublon if (!checkIsUnique (*iter, itemList_)) continue; @@ -106,6 +100,7 @@ Magnifier::scan () { if ((iter->ymax + dist > jter->ymin) && (abs(iter->xmin - jter->xmin) < 40) && (abs(iter->xmax - jter->xmax) < 40)) { + jter->circleUp = true; find = true; break; } @@ -253,6 +248,10 @@ Magnifier::addItem (Zone &zone, std::vector *list) { // TODO remplir les flags : partial, ... zone.area = (zone.xmax - zone.xmin) * (zone.ymax - zone.ymin); + if ((zone.xmax == img_->width_) || (zone.xmin == 0) + || (zone.ymax == img_->height_) || (zone.ymin == 0)) + zone.partial = true; + else zone.partial = false; list[zone.id].push_back (zone); } @@ -322,6 +321,7 @@ Magnifier::showZone (const Zone &z) const std::cout << " position : " << z.xmin << ", " << z.xmax << ", " << z.ymin << ", " << z.ymax << "\n"; std::cout << " alone : " << z.alone << "\n"; std::cout << " density: " << z.density << "\n"; + std::cout << " circleUp: " << z.circleUp << "\n"; std::cout << " ratio/vertical: " << z.ratio << " " << (z.vertical?"vertical":"") << "\n"; // std::cout << " orientation : " << z.pcX_ << ", " << z.pcY_ << "\n"; std::cout << " partial : " << z.partial << "\n"; -- cgit v1.2.3