summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/ovision/see/magnifier.cc
diff options
context:
space:
mode:
Diffstat (limited to '2005/i/robert/src/ovision/see/magnifier.cc')
-rw-r--r--2005/i/robert/src/ovision/see/magnifier.cc18
1 files changed, 11 insertions, 7 deletions
diff --git a/2005/i/robert/src/ovision/see/magnifier.cc b/2005/i/robert/src/ovision/see/magnifier.cc
index f26e367..82485b4 100644
--- a/2005/i/robert/src/ovision/see/magnifier.cc
+++ b/2005/i/robert/src/ovision/see/magnifier.cc
@@ -88,19 +88,23 @@ Magnifier::analyse (std::vector<Zone> &zoneList)
bool
Magnifier::scan ()
{
+ bool hasChanged = false;
std::vector<Zone> *newList = new std::vector<Zone>[Group::nbZoneType];
for (int i=0; i <Group::nbZoneType; ++i)
{
for(std::vector<Zone>::iterator iter = itemList_[i].begin (); iter != itemList_[i].end (); ++iter)
{
if (!checkIsUnique (*iter, newList))
+ {
+ hasChanged = true;
continue;
+ }
add (*iter, newList);
}
// delete [] itemList_;
itemList_ = newList;
}
- return false;
+ return hasChanged;
}
void
@@ -132,8 +136,8 @@ Magnifier::add (Zone &zone, std::vector<Zone> *list)
bool
isInside (const Zone &z1, const Zone &z2)
{
- const int maxOut = 300;
- int out = 0;
+// const int maxOut = 300;
+// int out = 0;
// test si le centre est ŕ l'intérieur
if ((z1.centerx <= z2.xmax) && (z1.centerx >= z2.xmin)
&& (z1.centery <= z2.ymax) && (z1.centery >= z2.ymin))
@@ -246,11 +250,11 @@ Magnifier::addItem (Zone &zone, std::vector<Zone> *list)
void
Magnifier::showItems (const Group::ZoneType type) const
{
- std::cout << "Items :\n";
+ std::cout << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
+ std::cout << Group::translateToColorName (type) << "\n";
for (std::vector<Zone>::const_iterator iter = itemList_[type].begin (); iter != itemList_[type].end (); ++iter)
- std::cout << (int)iter->id << " " << iter->xmin << " " << iter->xmax << " "
- << iter->ymin << " " << iter->ymax << "\n";
- std::cout << std::endl;
+ showZone (*iter);
+ std::cout << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
}