fix broken example

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

1 files changed, 52 insertions, 123 deletions

diff --git a/examples/01_boundingrect+pmpd_ambient/01_boundingrect+pmpd_ambient.pd b/examples/01_boundingrect+pmpd_ambient/01_boundingrect+pmpd_ambient.pd
index 08bd136..fb06f28 100755
--- a/examples/01_boundingrect+pmpd_ambient/01_boundingrect+pmpd_ambient.pd
+++ b/examples/01_boundingrect+pmpd_ambient/01_boundingrect+pmpd_ambient.pd
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-#N canvas 556 25 1099 664 12;
-=======
-#N canvas 556 80 1099 664 12;
-#X declare -path ../..;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
+#N canvas 554 96 1099 664 12;
 #N canvas 310 102 970 684 structure 0;
 #X obj 124 43 pd_mass -0.7 0.7 \$0;
 #X obj 189 113 pd_link \$0;
@@ -175,20 +170,20 @@
 #X connect 40 0 4 0;
 #X connect 40 1 7 0;
 #X restore 272 322 pd structure;
-#N canvas 623 135 504 293 init 0;
+#N canvas 621 151 504 293 init 0;
 #X msg 200 169 setK \$1;
 #X msg 274 143 setD \$1;
 #X msg 416 115 setM \$1;
-#X floatatom 200 94 5 -10 200 0 - - -;
-#X floatatom 274 92 5 0 0 0 - - -;
-#X floatatom 416 92 5 0 0 0 - - -;
+#X floatatom 200 94 5 -10 200 0 - - -, f 5;
+#X floatatom 274 92 5 0 0 0 - - -, f 5;
+#X floatatom 416 92 5 0 0 0 - - -, f 5;
 #X obj 200 143 / 10;
 #X obj 200 117 + 1;
 #X obj 274 116 / 10;
 #X msg 200 67 100;
 #X msg 274 68 25;
 #X msg 416 66 50;
-#X floatatom 341 92 5 0 0 0 - - -;
+#X floatatom 341 92 5 0 0 0 - - -, f 5;
 #X obj 341 116 / 10;
 #X msg 341 143 setD2 \$1;
 #X msg 341 68 1;
@@ -242,7 +237,7 @@
 #X obj 18 131 cnv 15 600 90 empty empty empty 20 12 0 14 -260097 -66577
 0;
 #X obj 447 222 t b b;
-#X obj 447 138 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1
+#X obj 447 138 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0
 1;
 #X obj 525 153 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
@@ -297,15 +292,15 @@ and pd_link abstraction patches in same folder as this one.;
 #X text 546 147 <- here you can RESET ALL;
 #X obj 24 863 cnv 15 650 250 empty empty empty 20 12 0 14 -258113 -66577
 0;
-#X floatatom 602 1047 5 0 0 0 - - -;
+#X floatatom 602 1047 5 0 0 0 - - -, f 5;
 #X obj 493 1083 pix_opencv_contours_boundingrect;
-#X floatatom 657 893 5 0 0 0 - - -;
+#X floatatom 657 893 5 0 0 0 - - -, f 5;
 #X obj 493 893 pix_opencv_bgsubstract;
 #X msg 665 830 set;
 #X obj 493 942 pix_opencv_morphology;
-#X floatatom 658 943 5 0 0 0 - - -;
+#X floatatom 658 943 5 0 0 0 - - -, f 5;
 #X obj 493 988 pix_opencv_morphology;
-#X floatatom 658 989 5 0 0 0 - - -;
+#X floatatom 658 989 5 0 0 0 - - -, f 5;
 #X msg 602 1024 1000;
 #X obj 647 1023 loadbang;
 #X msg 657 869 24;
@@ -318,17 +313,17 @@ and pd_link abstraction patches in same folder as this one.;
 #X msg 930 1470 setXmax \$1;
 #X msg 1012 1473 setYmin \$1;
 #X msg 1013 1447 setYmax \$1;
-#X floatatom 996 1235 5 0 0 0 - - -;
-#X floatatom 1054 1234 5 0 0 0 - - -;
-#X floatatom 1104 1234 5 0 0 0 - - -;
-#X floatatom 1155 1233 5 0 0 0 - - -;
-#X floatatom 996 1336 5 0 0 0 - - -;
-#X floatatom 1055 1338 5 0 0 0 - - -;
-#X floatatom 1104 1326 5 0 0 0 - - -;
-#X floatatom 1155 1326 5 0 0 0 - - -;
+#X floatatom 996 1235 5 0 0 0 - - -, f 5;
+#X floatatom 1054 1234 5 0 0 0 - - -, f 5;
+#X floatatom 1104 1234 5 0 0 0 - - -, f 5;
+#X floatatom 1155 1233 5 0 0 0 - - -, f 5;
+#X floatatom 996 1336 5 0 0 0 - - -, f 5;
+#X floatatom 1055 1338 5 0 0 0 - - -, f 5;
+#X floatatom 1104 1326 5 0 0 0 - - -, f 5;
+#X floatatom 1155 1326 5 0 0 0 - - -, f 5;
 #X obj 994 1367 +;
-#X floatatom 994 1395 5 0 0 0 - - -;
-#X floatatom 1055 1393 5 0 0 0 - - -;
+#X floatatom 994 1395 5 0 0 0 - - -, f 5;
+#X floatatom 1055 1393 5 0 0 0 - - -, f 5;
 #X obj 1055 1313 * -1;
 #X obj 1055 1366 -;
 #X obj 1054 1260 - 72;
@@ -348,17 +343,17 @@ and pd_link abstraction patches in same folder as this one.;
 #X msg 1292 1472 setXmax \$1;
 #X msg 1374 1475 setYmin \$1;
 #X msg 1375 1449 setYmax \$1;
-#X floatatom 1358 1237 5 0 0 0 - - -;
-#X floatatom 1416 1236 5 0 0 0 - - -;
-#X floatatom 1466 1236 5 0 0 0 - - -;
-#X floatatom 1517 1235 5 0 0 0 - - -;
-#X floatatom 1358 1340 5 0 0 0 - - -;
-#X floatatom 1417 1340 5 0 0 0 - - -;
-#X floatatom 1466 1328 5 0 0 0 - - -;
-#X floatatom 1517 1328 5 0 0 0 - - -;
+#X floatatom 1358 1237 5 0 0 0 - - -, f 5;
+#X floatatom 1416 1236 5 0 0 0 - - -, f 5;
+#X floatatom 1466 1236 5 0 0 0 - - -, f 5;
+#X floatatom 1517 1235 5 0 0 0 - - -, f 5;
+#X floatatom 1358 1340 5 0 0 0 - - -, f 5;
+#X floatatom 1417 1340 5 0 0 0 - - -, f 5;
+#X floatatom 1466 1328 5 0 0 0 - - -, f 5;
+#X floatatom 1517 1328 5 0 0 0 - - -, f 5;
 #X obj 1356 1369 +;
-#X floatatom 1356 1397 5 0 0 0 - - -;
-#X floatatom 1417 1395 5 0 0 0 - - -;
+#X floatatom 1356 1397 5 0 0 0 - - -, f 5;
+#X floatatom 1417 1395 5 0 0 0 - - -, f 5;
 #X obj 1417 1315 * -1;
 #X obj 1417 1368 -;
 #X obj 1416 1262 - 72;
@@ -377,17 +372,17 @@ and pd_link abstraction patches in same folder as this one.;
 #X msg 1685 1468 setXmax \$1;
 #X msg 1767 1471 setYmin \$1;
 #X msg 1768 1445 setYmax \$1;
-#X floatatom 1751 1233 5 0 0 0 - - -;
-#X floatatom 1809 1232 5 0 0 0 - - -;
-#X floatatom 1859 1232 5 0 0 0 - - -;
-#X floatatom 1910 1231 5 0 0 0 - - -;
-#X floatatom 1751 1334 5 0 0 0 - - -;
-#X floatatom 1810 1336 5 0 0 0 - - -;
-#X floatatom 1859 1324 5 0 0 0 - - -;
-#X floatatom 1910 1324 5 0 0 0 - - -;
+#X floatatom 1751 1233 5 0 0 0 - - -, f 5;
+#X floatatom 1809 1232 5 0 0 0 - - -, f 5;
+#X floatatom 1859 1232 5 0 0 0 - - -, f 5;
+#X floatatom 1910 1231 5 0 0 0 - - -, f 5;
+#X floatatom 1751 1334 5 0 0 0 - - -, f 5;
+#X floatatom 1810 1336 5 0 0 0 - - -, f 5;
+#X floatatom 1859 1324 5 0 0 0 - - -, f 5;
+#X floatatom 1910 1324 5 0 0 0 - - -, f 5;
 #X obj 1749 1365 +;
-#X floatatom 1749 1393 5 0 0 0 - - -;
-#X floatatom 1810 1391 5 0 0 0 - - -;
+#X floatatom 1749 1393 5 0 0 0 - - -, f 5;
+#X floatatom 1810 1391 5 0 0 0 - - -, f 5;
 #X obj 1810 1311 * -1;
 #X obj 1810 1364 -;
 #X obj 1809 1258 - 72;
@@ -404,10 +399,7 @@ and pd_link abstraction patches in same folder as this one.;
 #X obj 1751 1203 unpack 0 0 0 0;
 #X obj 698 894 cnv 15 310 20 empty empty empty 20 12 0 14 -258113 -66577
 0;
-<<<<<<< HEAD
 #X text 698 893 <- threshold fo the background substraction;
-=======
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X obj 699 941 cnv 15 310 20 empty empty empty 20 12 0 14 -258113 -66577
 0;
 #X obj 700 987 cnv 15 310 20 empty empty empty 20 12 0 14 -258113 -66577
@@ -423,17 +415,17 @@ and pd_link abstraction patches in same folder as this one.;
 ;
 #X obj 22 1182 cnv 15 800 250 empty empty empty 20 12 0 14 -261234
 -66577 0;
-#X floatatom 603 1239 5 0 0 0 - - -;
-#X floatatom 661 1238 5 0 0 0 - - -;
-#X floatatom 711 1238 5 0 0 0 - - -;
-#X floatatom 762 1237 5 0 0 0 - - -;
-#X floatatom 603 1342 5 0 0 0 - - -;
-#X floatatom 662 1342 5 0 0 0 - - -;
-#X floatatom 711 1330 5 0 0 0 - - -;
-#X floatatom 762 1330 5 0 0 0 - - -;
+#X floatatom 603 1239 5 0 0 0 - - -, f 5;
+#X floatatom 661 1238 5 0 0 0 - - -, f 5;
+#X floatatom 711 1238 5 0 0 0 - - -, f 5;
+#X floatatom 762 1237 5 0 0 0 - - -, f 5;
+#X floatatom 603 1342 5 0 0 0 - - -, f 5;
+#X floatatom 662 1342 5 0 0 0 - - -, f 5;
+#X floatatom 711 1330 5 0 0 0 - - -, f 5;
+#X floatatom 762 1330 5 0 0 0 - - -, f 5;
 #X obj 601 1371 +;
-#X floatatom 601 1399 5 0 0 0 - - -;
-#X floatatom 662 1397 5 0 0 0 - - -;
+#X floatatom 601 1399 5 0 0 0 - - -, f 5;
+#X floatatom 662 1397 5 0 0 0 - - -, f 5;
 #X obj 662 1317 * -1;
 #X obj 662 1370 -;
 #X obj 661 1264 - 72;
@@ -469,31 +461,19 @@ of them we want to be able to interact with our structure;
 0;
 #X obj 287 1668 spigot;
 #X obj 326 1643 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
-<<<<<<< HEAD
-1 1;
-=======
 0 1;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X text 46 886 4.- Setup the parameters for your analysis;
 #X text 44 1654 5.- hide the analysis;
 #X text 347 1641 <- click here to chow the original video image;
 #X obj 492 1719 translateXYZ 0 0 -0.1;
 #X obj 491 1695 separator;
 #X obj 287 1697 separator;
-#X floatatom 654 1718 5 0 0 0 - - -;
+#X floatatom 654 1718 5 0 0 0 - - -, f 5;
 #X obj 288 1724 translateXYZ 0 0 -0.05;
 #X obj 492 834 pix_resize 180 144;
-<<<<<<< HEAD
 #X connect 2 0 3 0;
 #X connect 4 0 219 0;
 #X connect 5 0 229 0;
-=======
-#X obj 764 243 declare -path ../..;
-#X text 698 893 <- threshold of the background substraction;
-#X connect 2 0 3 0;
-#X connect 4 0 218 0;
-#X connect 5 0 228 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 6 0 7 0;
 #X connect 8 0 69 0;
 #X connect 11 0 13 0;
@@ -529,11 +509,7 @@ of them we want to be able to interact with our structure;
 #X connect 60 0 51 0;
 #X connect 61 0 51 0;
 #X connect 65 0 66 1;
-<<<<<<< HEAD
 #X connect 66 0 225 0;
-=======
-#X connect 66 0 224 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 66 1 111 0;
 #X connect 67 0 68 1;
 #X connect 68 0 70 0;
@@ -582,11 +558,7 @@ of them we want to be able to interact with our structure;
 #X connect 110 1 87 0;
 #X connect 110 2 88 0;
 #X connect 110 3 89 0;
-<<<<<<< HEAD
 #X connect 111 0 204 0;
-=======
-#X connect 111 0 203 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589
 #X connect 111 1 110 0;
 #X connect 111 2 140 0;
 #X connect 111 3 169 0;
@@ -654,7 +626,6 @@ of them we want to be able to interact with our structure;
 #X connect 169 1 146 0;
 #X connect 169 2 147 0;
 #X connect 169 3 148 0;
-<<<<<<< HEAD
 #X connect 181 0 195 0;
 #X connect 182 0 194 0;
 #X connect 183 0 198 0;
@@ -695,45 +666,3 @@ of them we want to be able to interact with our structure;
 #X connect 227 0 224 3;
 #X connect 228 0 2 0;
 #X connect 229 0 68 0;
-=======
-#X connect 180 0 194 0;
-#X connect 181 0 193 0;
-#X connect 182 0 197 0;
-#X connect 183 0 198 0;
-#X connect 184 0 188 0;
-#X connect 184 0 206 0;
-#X connect 185 0 192 0;
-#X connect 185 0 209 0;
-#X connect 186 0 188 1;
-#X connect 187 0 192 1;
-#X connect 188 0 189 0;
-#X connect 188 0 207 0;
-#X connect 191 0 185 0;
-#X connect 192 0 190 0;
-#X connect 192 0 208 0;
-#X connect 193 0 195 0;
-#X connect 194 0 196 0;
-#X connect 195 0 191 0;
-#X connect 196 0 184 0;
-#X connect 197 0 186 0;
-#X connect 198 0 187 0;
-#X connect 199 0 203 0;
-#X connect 200 0 210 0;
-#X connect 202 0 199 0;
-#X connect 203 0 180 0;
-#X connect 203 1 181 0;
-#X connect 203 2 182 0;
-#X connect 203 3 183 0;
-#X connect 206 0 210 0;
-#X connect 207 0 210 0;
-#X connect 208 0 210 0;
-#X connect 209 0 210 0;
-#X connect 218 0 225 0;
-#X connect 219 0 218 1;
-#X connect 223 0 6 0;
-#X connect 224 0 223 0;
-#X connect 225 0 227 0;
-#X connect 226 0 223 3;
-#X connect 227 0 2 0;
-#X connect 228 0 68 0;
->>>>>>> 09729232bf1a52aa509cf5341d4186ba42576589