small changes

svn path=/trunk/externals/pix_opencv/; revision=17155

2 files changed, 66 insertions, 47 deletions

diff --git a/pix_opencv_blobtrack-help.pd b/pix_opencv_blobtrack-help.pd
index e26fd2a..8d0e2bf 100644
--- a/pix_opencv_blobtrack-help.pd
+++ b/pix_opencv_blobtrack-help.pd
@@ -1,4 +1,4 @@
-#N canvas 994 439 818 513 10;
+#N canvas 937 403 818 513 10;
 #X obj 7 200 cnv 15 430 300 empty empty empty 20 12 0 14 -233017 -66577
 0;
 #X obj 7 156 cnv 15 430 40 empty empty empty 20 12 0 14 -195568 -66577
@@ -49,7 +49,7 @@ tracker and a trajectory post processor.;
 #X obj 454 364 pix_texture;
 #X obj 454 30 gemhead;
 #X floatatom 531 323 5 0 0 0 blob_num - -;
-#N canvas 1068 357 709 722 showblob 0;
+#N canvas 1062 357 709 722 showblob 0;
 #X obj 187 13 inlet blobinformation;
 #X obj 279 316 gemlist;
 #X obj 279 296 t b a;
@@ -72,7 +72,6 @@ tracker and a trajectory post processor.;
 #X obj 279 426 color 1 0 0 0.2;
 #X obj 279 336 separator;
 #X msg 499 499 \$1;
-#X obj 279 676 text2d;
 #X obj 279 616 color 1 1 0 1;
 #X obj 158 198 list split 6;
 #X msg 124 167 \$2;
@@ -87,14 +86,15 @@ tracker and a trajectory post processor.;
 #X text 336 194 here is an example on how to display blobs with Gem
 ;
 #X obj 279 446 scaleXYZ 10.666 -8 0;
+#X obj 279 677 text2d;
 #X connect 0 0 6 1;
 #X connect 1 0 20 0;
 #X connect 2 0 1 0;
 #X connect 2 1 17 0;
 #X connect 3 0 7 0;
-#X connect 4 0 24 0;
-#X connect 5 0 25 0;
-#X connect 5 1 24 0;
+#X connect 4 0 23 0;
+#X connect 5 0 24 0;
+#X connect 5 1 23 0;
 #X connect 6 0 5 0;
 #X connect 7 0 6 0;
 #X connect 7 1 1 1;
@@ -113,32 +113,31 @@ tracker and a trajectory post processor.;
 #X connect 17 1 16 0;
 #X connect 17 1 15 0;
 #X connect 17 1 21 0;
-#X connect 17 1 28 0;
-#X connect 18 0 33 0;
-#X connect 19 0 35 0;
+#X connect 17 1 27 0;
+#X connect 18 0 32 0;
+#X connect 19 0 34 0;
 #X connect 20 0 11 0;
-#X connect 21 0 22 0;
-#X connect 23 0 22 0;
-#X connect 24 0 8 0;
-#X connect 24 1 4 1;
-#X connect 25 0 24 1;
-#X connect 26 0 27 0;
-#X connect 27 0 22 1;
+#X connect 21 0 35 0;
+#X connect 22 0 35 0;
+#X connect 23 0 8 0;
+#X connect 23 1 4 1;
+#X connect 24 0 23 1;
+#X connect 25 0 26 0;
+#X connect 26 0 35 1;
+#X connect 27 0 28 0;
 #X connect 28 0 29 0;
 #X connect 29 0 30 0;
-#X connect 30 0 31 0;
-#X connect 30 1 32 0;
+#X connect 29 1 31 0;
+#X connect 30 0 19 1;
 #X connect 31 0 19 1;
-#X connect 32 0 19 1;
-#X connect 33 0 23 0;
-#X connect 35 0 12 0;
+#X connect 32 0 22 0;
+#X connect 34 0 12 0;
 #X restore 568 320 pd showblob;
 #X obj 454 124 pix_resize 320 240;
-#X obj 454 255 pix_opencv_blobtrack;
 #X obj 454 173 pix_rgba;
 #X obj 471 227 r \$0-properties;
 #X text 464 153 input format : rgba or grey;
-#N canvas 681 239 713 583 properties 0;
+#N canvas 23 463 806 579 properties 0;
 #X msg 99 407 monitorStage \$1;
 #X msg 4 21 getModule;
 #X msg 4 41 getModule fg;
@@ -151,7 +150,7 @@ tracker and a trajectory post processor.;
 #X msg 147 194 setModule fg FG_1;
 #X text 98 342 monitoring stage :;
 #X obj 99 359 vradio 15 1 0 3 empty empty empty 0 -8 0 10 -262144 -1
--1 0;
+-1 1;
 #X text 117 358 input image;
 #X text 116 374 foreground mask;
 #X text 116 389 diplsay blobs;
@@ -164,13 +163,19 @@ tracker and a trajectory post processor.;
 variant to load;
 #X msg 12 160 setModule fg FG_1 \, setModule bd BD_Simple \, setModule
 bt CC \, setModule btpp none \, setModule bta none;
-#X msg 201 249 getParam fg;
-#X floatatom 201 277 5 0 0 0 - - -;
-#X msg 201 295 setParam fg NG \$1;
-#X text 279 242 getParam <module name> : returns all parameters for
+#X msg 241 229 getParam fg;
+#X floatatom 241 257 5 0 0 0 - - -;
+#X msg 241 275 setParam fg NG \$1;
+#X text 319 222 getParam <module name> : returns all parameters for
 a given module;
-#X text 319 295 setParam <module name> <param name> <value> : set a
+#X text 359 275 setParam <module name> <param name> <value> : set a
 module parameter \, value could be float or symbol;
+#X msg 33 222 setModule fg FG_0;
+#X floatatom 241 295 5 0 0 0 - - -;
+#X msg 241 313 setParam fg alpha1 \$1;
+#X msg 192 106 setModule fg FG_0 \, setModule bd BD_Simple \, setModule
+bt CC \, setModule btpp none \, setModule bta none \, setParam fg alpha1
+0.35;
 #X connect 0 0 15 0;
 #X connect 1 0 16 0;
 #X connect 2 0 16 0;
@@ -189,6 +194,10 @@ module parameter \, value could be float or symbol;
 #X connect 22 0 16 0;
 #X connect 23 0 24 0;
 #X connect 24 0 16 0;
+#X connect 27 0 16 0;
+#X connect 28 0 29 0;
+#X connect 29 0 16 0;
+#X connect 30 0 16 0;
 #X restore 595 230 pd properties;
 #X obj 454 70 pix_film;
 #X text 459 96 the bigger the image is \, the more CPU expensive the
@@ -238,22 +247,23 @@ and algorithms... check out the pd-properties;
 #X connect 5 0 6 0;
 #X connect 8 0 6 0;
 #X restore 645 322 pd info;
+#X obj 454 255 pix_opencv_blobtrack;
 #X connect 12 0 13 0;
 #X connect 13 0 12 0;
-#X connect 15 0 41 0;
-#X connect 16 0 25 0;
-#X connect 19 0 21 0;
-#X connect 20 0 15 0;
-#X connect 20 1 44 0;
-#X connect 21 0 20 0;
-#X connect 22 0 20 0;
-#X connect 25 0 19 0;
-#X connect 25 2 42 0;
-#X connect 31 0 40 0;
-#X connect 32 0 31 0;
-#X connect 40 0 25 0;
-#X connect 42 0 25 1;
-#X connect 43 0 17 0;
-#X connect 44 0 43 0;
-#X connect 44 0 18 0;
-#X connect 44 1 45 0;
+#X connect 15 0 40 0;
+#X connect 16 0 24 0;
+#X connect 19 0 20 0;
+#X connect 20 0 45 0;
+#X connect 21 0 45 0;
+#X connect 24 0 19 0;
+#X connect 24 2 41 0;
+#X connect 30 0 39 0;
+#X connect 31 0 30 0;
+#X connect 39 0 24 0;
+#X connect 41 0 24 1;
+#X connect 42 0 17 0;
+#X connect 43 0 42 0;
+#X connect 43 0 18 0;
+#X connect 43 1 44 0;
+#X connect 45 0 15 0;
+#X connect 45 1 43 0;
diff --git a/pix_opencv_blobtrack.cc b/pix_opencv_blobtrack.cc
index 8fb4752..df6ec6f 100644
--- a/pix_opencv_blobtrack.cc
+++ b/pix_opencv_blobtrack.cc
@@ -488,11 +488,20 @@ void pix_opencv_blobtrack :: getParamMess(t_symbol*s, int argc, t_atom*argv)
         }
         
     t_atom a_param[4];
+    t_atom a_params;
     
     a_param[0] = argv[0];
     
     if(pM->GetParamName(0) == NULL ) return;
-
+    
+    for (i=0; ; ++i)
+    {
+       const char*   param = pM->GetParamName(i);
+       if(param == NULL)break;
+    }
+    SETFLOAT(&a_params, i);
+    outlet_anything(m_dataout, gensym("params"), 1, &a_params);
+    
     for (i=0; ; ++i)
     {
         const char*   param = pM->GetParamName(i);