Merge branch 'master' of https://github.com/avilleret/pix_opencv

avilleret · Jan 18, 2014 · 6262a7d · 6262a7d
2 parents 14b0ab1 + 8f98bc2
commit 6262a7d
Showing 1 changed file with 45 additions and 28 deletions.
diff --git a/pix_opencv_camshift-help.pd b/pix_opencv_camshift-help.pd
@@ -1,4 +1,4 @@
-#N canvas 21 324 964 666 10;
+#N canvas 661 275 964 666 10;
 #X obj 0 114 cnv 15 430 40 empty empty empty 20 12 0 14 -195568 -66577
 0;
 #X text 9 118 Arguments:;
@@ -55,40 +55,40 @@
 #X obj 438 255 cnv 15 500 270 empty empty empty 20 12 0 14 -24198 -66577
 0;
 #X obj 440 552 pix_resize 320 240;
-#X obj 440 423 pix_opencv_camshift;
+#X obj 440 433 pix_opencv_camshift;
 #X obj 551 453 unpack f f f f f;
-#X floatatom 551 478 5 0 0 0 - - -;
-#X floatatom 590 478 5 0 0 0 - - -;
-#X floatatom 628 478 5 0 0 0 - - -;
-#X floatatom 667 478 5 0 0 0 - - -;
-#X floatatom 708 478 5 0 0 0 - - -;
+#X floatatom 551 478 5 0 0 0 - - -, f 5;
+#X floatatom 590 478 5 0 0 0 - - -, f 5;
+#X floatatom 628 478 5 0 0 0 - - -, f 5;
+#X floatatom 667 478 5 0 0 0 - - -, f 5;
+#X floatatom 708 478 5 0 0 0 - - -, f 5;
 #X text 578 502 center Y;
 #X text 628 492 width;
 #X text 663 503 height;
 #X text 538 492 center X;
 #X text 706 494 angle;
 #X text 663 452 for the tracked object;
-#X msg 515 331 backproject \$1;
-#X text 634 332 show the backproject flow image;
-#X obj 612 332 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X msg 515 323 backproject \$1;
+#X text 634 324 show the backproject flow image;
+#X obj 612 324 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
-#X msg 473 268 vmin \$1;
-#X floatatom 529 270 5 0 0 0 - - -;
-#X floatatom 545 288 5 0 0 0 - - -;
-#X msg 491 288 vmax \$1;
-#X floatatom 558 311 5 0 0 0 - - -;
-#X msg 504 310 smin \$1;
-#X text 583 288 V pre-filtering maximal value ( default : 256 );
-#X text 597 309 S pre-filtering minimal value ( default : 30 );
-#X msg 547 394 track \$1 \$2;
-#X text 624 392 track %x %y : mark the object to track;
-#X floatatom 591 355 5 0 0 0 - - -;
-#X floatatom 608 375 5 0 0 0 - - -;
-#X msg 526 353 rwidth \$1;
-#X msg 535 373 rheight \$1;
-#X text 627 353 initial search region width ( default : 20 );
-#X text 646 374 initial search region height ( default : 20 );
-#X text 574 270 V pre-filtering minimal value ( default : 50 );
+#X msg 473 260 vmin \$1;
+#X floatatom 529 262 5 0 0 0 - - -, f 5;
+#X floatatom 545 280 5 0 0 0 - - -, f 5;
+#X msg 491 280 vmax \$1;
+#X floatatom 558 303 5 0 0 0 - - -, f 5;
+#X msg 504 302 smin \$1;
+#X text 583 280 V pre-filtering maximal value ( default : 256 );
+#X text 597 301 S pre-filtering minimal value ( default : 30 );
+#X msg 547 386 track \$1 \$2;
+#X text 624 384 track %x %y : mark the object to track;
+#X floatatom 591 347 5 0 0 0 - - -, f 5;
+#X floatatom 608 367 5 0 0 0 - - -, f 5;
+#X msg 526 345 rwidth \$1;
+#X msg 535 365 rheight \$1;
+#X text 627 345 initial search region width ( default : 20 );
+#X text 646 366 initial search region height ( default : 20 );
+#X text 574 262 V pre-filtering minimal value ( default : 50 );
 #X text 15 31 pix_opencv_camshift : continuously adaptive mean-shift
 algorithm to track objects based on a hidden histogram of the hue component
 of pixels.;
@@ -99,7 +99,7 @@ of pixels.;
 -1;
 #X obj 686 171 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144
 -1 -1;
-#X floatatom 668 136 5 0 10000 1 frame# - -;
+#X floatatom 668 136 5 0 10000 1 frame# - -, f 5;
 #X obj 629 25 openpanel;
 #X msg 629 45 open \$1;
 #X obj 617 154 pix_film;
@@ -139,6 +139,22 @@ of pixels.;
 0;
 #X text 11 164 written by Yves Degoyon ( ydegoyon@gmail.com ) \, inspired
 by OpenCV samples code.;
+#N canvas 1 95 450 300 mouseSelection 0;
+#X obj 161 100 gemmouse;
+#X obj 183 132 sel 1;
+#X obj 161 266 outlet;
+#X obj 161 201 pack 0 0;
+#X obj 161 175 f;
+#X msg 161 223 track \$1 \$2;
+#X connect 0 0 4 1;
+#X connect 0 1 3 1;
+#X connect 0 2 1 0;
+#X connect 1 0 4 0;
+#X connect 3 0 5 0;
+#X connect 4 0 3 0;
+#X connect 5 0 2 0;
+#X restore 546 410 pd mouseSelection;
+#X text 657 410 click on Gem window to select feature to track;
 #X connect 6 0 12 0;
 #X connect 8 0 9 0;
 #X connect 9 0 8 0;
@@ -188,3 +204,4 @@ by OpenCV samples code.;
 #X connect 67 0 63 0;
 #X connect 68 0 63 0;
 #X connect 69 0 47 0;
+#X connect 73 0 13 0;