From 98743470446a50a4351052fcd2d42dcc427d063e Mon Sep 17 00:00:00 2001
From: Antoine Villeret <avilleret@users.sourceforge.net>
Date: Fri, 8 Feb 2013 14:28:16 +0000
Subject: - change output blob message to "cvblob" - update help file

svn path=/trunk/externals/pix_opencv/; revision=17029
---
 pix_opencv_blobtrack-help.pd | 34 +++++++++++++++++-----------------
 pix_opencv_blobtrack.cc      |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pix_opencv_blobtrack-help.pd b/pix_opencv_blobtrack-help.pd
index 314852c..24ceefe 100644
--- a/pix_opencv_blobtrack-help.pd
+++ b/pix_opencv_blobtrack-help.pd
@@ -1,4 +1,4 @@
-#N canvas 1008 397 818 513 10;
+#N canvas 1006 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
@@ -52,7 +52,6 @@ tracker and a trajectory post processor.;
 #X obj 520 18 loadbang;
 #X obj 606 295 print dumpout;
 #X floatatom 501 293 5 0 0 0 - - -;
-#X obj 501 274 route blobnum blob;
 #N canvas 1072 385 709 722 showblob 0;
 #X obj 187 13 inlet blobinformation;
 #X obj 279 316 gemlist;
@@ -208,21 +207,22 @@ is taken (input \, foreground mask or input with tracking information)
 and algorithms... check out the pd-properties;
 #X text 65 399 and for each blob : ID \, x \, y \, width \, height
 \, state (valid or not);
+#X obj 501 274 route blobnum cvblob;
 #X connect 12 0 13 0;
 #X connect 13 0 12 0;
-#X connect 15 0 23 0;
-#X connect 16 0 30 0;
-#X connect 17 0 30 0;
+#X connect 15 0 22 0;
+#X connect 16 0 29 0;
+#X connect 17 0 29 0;
 #X connect 18 0 17 0;
-#X connect 21 0 20 0;
-#X connect 21 1 22 0;
-#X connect 21 2 19 0;
-#X connect 24 0 26 0;
-#X connect 25 0 15 0;
-#X connect 25 1 21 0;
-#X connect 26 0 25 0;
-#X connect 27 0 25 0;
-#X connect 30 0 24 0;
-#X connect 36 0 38 0;
-#X connect 37 0 36 0;
-#X connect 38 0 30 0;
+#X connect 23 0 25 0;
+#X connect 24 0 15 0;
+#X connect 24 1 45 0;
+#X connect 25 0 24 0;
+#X connect 26 0 24 0;
+#X connect 29 0 23 0;
+#X connect 35 0 37 0;
+#X connect 36 0 35 0;
+#X connect 37 0 29 0;
+#X connect 45 0 20 0;
+#X connect 45 1 21 0;
+#X connect 45 2 19 0;
diff --git a/pix_opencv_blobtrack.cc b/pix_opencv_blobtrack.cc
index d2ed9ed..9181528 100644
--- a/pix_opencv_blobtrack.cc
+++ b/pix_opencv_blobtrack.cc
@@ -144,7 +144,7 @@ void pix_opencv_blobtrack :: RunBlobTrackingAuto( IplImage* img )
 			//~ SETFLOAT(ap++, m_tracker->GetState(blob->ID));
 		}
 		
-		outlet_anything(m_dataout, gensym("blob"), blob_atom_size, blob_atom);
+		outlet_anything(m_dataout, gensym("cvblob"), blob_atom_size, blob_atom);
 		
 		if(blob_atom) delete blob_atom;
 		blob_atom = NULL;
-- 
cgit v1.2.1