summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/ovision/ui/live.cc
diff options
context:
space:
mode:
Diffstat (limited to '2005/i/robert/src/ovision/ui/live.cc')
-rw-r--r--2005/i/robert/src/ovision/ui/live.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/2005/i/robert/src/ovision/ui/live.cc b/2005/i/robert/src/ovision/ui/live.cc
index caa4e1b..c7b8b09 100644
--- a/2005/i/robert/src/ovision/ui/live.cc
+++ b/2005/i/robert/src/ovision/ui/live.cc
@@ -29,7 +29,7 @@ Live::Live (const unsigned nbImg, const ImageInput imgInput)
/// Initialisation
void
-Live::init (const char *filename, const Image::PixelFormat pf,
+Live::init (const Image::PixelFormat pf, const char *filename,
const unsigned width, const unsigned height)
{
tex = new unsigned[nbImg_];
@@ -88,7 +88,7 @@ Live::init (const char *filename, const Image::PixelFormat pf,
/// Mis à jour de l'image
void
-Live::updateImg (const char *filename, const Image::PixelFormat pf,
+Live::updateImg (const Image::PixelFormat pf, const char *filename,
const unsigned width, const unsigned height)
{
segm->setMode (pf);
@@ -107,6 +107,9 @@ Live::updateImg (const char *filename, const Image::PixelFormat pf,
}
break;
case cam:
+ {
+ std::cout << "<Live::updateImg> Changement d'image caméra" << std::endl;
+ }
case socket:
break;
}
@@ -153,7 +156,7 @@ Live::segmAndGroup (const int numColorToShow)
std::cout << numColorToShow << std::endl;
// Création des groupes
delete group;
- group = new Group(img, segm);
+ group = new Group (img, segm);
std::vector<Zone> list;
if (numColorToShow >= 0)
{
@@ -162,7 +165,7 @@ Live::segmAndGroup (const int numColorToShow)
}
else
{
- group->jumpPoints(oconfig->groupColor);
+ group->jumpPoints (oconfig->groupColor);
mag->analyse (group->getZoneList ());
list = mag->getItemList ((Group::ZoneType)oconfig->uiGroupToDisplay);
}