LGD/hand_control
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

more filter changes

Browse source
This commit is contained in:
Paul Janin 2015-05-22 17:39:33 +02:00
parent 68ada0a28c
commit f2dc7112da
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/filtre.cpp
View file

@ -32,10 +32,10 @@ class Callback {
assert(zmax > 0); assert(zmax > 0);
assert(hue >= 0); assert(hue >= 0);
assert(hue <= 360.); assert(hue <= 360.);
assert(sat >= 0); assert(sat_min >= 0);
assert(sat <= 1.); assert(sat_max <= 1.);
assert(val >= 0); assert(val_min >= 0);
assert(val <= 1.); assert(val_max <= 1.);
} }
private: private:
@ -68,22 +68,14 @@ class Callback {
return std::min(diff1, diff2); return std::min(diff1, diff2);
} }
<<<<<<< HEAD
float sat(const Point& pt) float sat(const Point& pt)
=======
float sat_dist(const Point& pt)
>>>>>>> 016c5b01c8e2d4513b333d32b0e0689e985e6776
{ {
float h, s, v, diff1, diff2; float h, s, v, diff1, diff2;
pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v); pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v);
return s; return s;
} }
<<<<<<< HEAD
float val(const Point& pt) float val(const Point& pt)
=======
float val_dist(const Point& pt)
>>>>>>> 016c5b01c8e2d4513b333d32b0e0689e985e6776
{ {
float h, s, v, diff1, diff2; float h, s, v, diff1, diff2;
pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v); pcl::tracking::RGB2HSV(pt.r, pt.g, pt.b, h, s, v);