summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/ovision/ui
diff options
context:
space:
mode:
authorgaillaro2005-04-23 18:58:44 +0000
committergaillaro2005-04-23 18:58:44 +0000
commitfb075a07e3347a357e18b7df3795909b0d6f4918 (patch)
treecfb7093961ecece093cc9644b5f031a1d904a395 /2005/i/robert/src/ovision/ui
parentf10b66edc5bd8af45d1013e56679cbf3efb930a3 (diff)
* ajout détection des groupes de quilles
* essai de detection des vis * detection verticalité
Diffstat (limited to '2005/i/robert/src/ovision/ui')
-rw-r--r--2005/i/robert/src/ovision/ui/live.cc4
-rw-r--r--2005/i/robert/src/ovision/ui/ui.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/2005/i/robert/src/ovision/ui/live.cc b/2005/i/robert/src/ovision/ui/live.cc
index bd5e680..62bd1ad 100644
--- a/2005/i/robert/src/ovision/ui/live.cc
+++ b/2005/i/robert/src/ovision/ui/live.cc
@@ -54,7 +54,7 @@ Live::init (const Image::PixelFormat pf, const char *filename,
case cam:
{
Video4Linux *r;
- r = new Video4Linux ("/dev/video", pf);
+ r = new Video4Linux ("/dev/video", pf, oconfig_->brightness);
r->calibrate ();
r->setAdaptive (0);
reader_ = reinterpret_cast<ImageReader*> (r);
@@ -73,7 +73,7 @@ Live::init (const Image::PixelFormat pf, const char *filename,
segm = new SegmLearn;
segm->setMode (pf);
segm->buildNN (oconfig->nnNbColor, Segm::loadFromFile);
- mag = new Magnifier (img, segm);
+ mag = new Magnifier (img, segm, Group::ZoneType (oconfig->uiGroupToDisplay));
segmAndGroup ();
// Affichage de l'image pilote avec la couleur d'aquisition et en RGB
tex[1] = loadImage (img->width_, img->height_, data[0], tex[1]);
diff --git a/2005/i/robert/src/ovision/ui/ui.cc b/2005/i/robert/src/ovision/ui/ui.cc
index 7183c4c..b91d9d5 100644
--- a/2005/i/robert/src/ovision/ui/ui.cc
+++ b/2005/i/robert/src/ovision/ui/ui.cc
@@ -1098,6 +1098,7 @@ UI::menu ()
case 8: // Regeneration de poids
int nbColor;
nbColor = chooseColor (NB_COULEUR, oconfig->nnNbColor);
+ oconfig->nnNbColor = nbColor;
newNN (nbColor);
break;