fix color picking

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

2 files changed, 121 insertions, 76 deletions

diff --git a/pix_opencv_colorfilt-help.pd b/pix_opencv_colorfilt-help.pd
index 1163a7b..1b83abb 100644
--- a/pix_opencv_colorfilt-help.pd
+++ b/pix_opencv_colorfilt-help.pd
@@ -1,5 +1,4 @@
-#N canvas 27 6 925 684 10;
-#X obj 277 -24 gemhead;
+#N canvas 345 27 925 684 10;
 #X obj 183 555 pix_texture;
 #X obj 659 -55 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577
 0;
@@ -17,48 +16,28 @@
 #X connect 1 0 2 0;
 #X restore 289 80 pd Gem.init;
 #X obj 162 241 gemwin;
-#X msg 161 188 create \, 1;
-#X msg 237 189 destroy;
+#X msg 327 189 destroy;
 #X msg 283 161 frame 5;
 #X obj 164 126 t b b b;
+#X msg 161 188 dimen 320 240 \, create \, 1;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
-#X connect 2 0 10 0;
+#X connect 2 0 9 0;
 #X connect 2 1 4 0;
-#X connect 2 1 8 0;
+#X connect 2 1 7 0;
 #X connect 3 0 0 0;
 #X connect 4 0 0 0;
 #X connect 7 0 6 0;
 #X connect 8 0 6 0;
-#X connect 9 0 6 0;
-#X connect 10 0 7 0;
-#X connect 10 2 9 0;
+#X connect 9 0 10 0;
+#X connect 9 2 8 0;
+#X connect 10 0 6 0;
 #X restore 669 -11 pd gemwin;
 #X msg 669 -29 destroy;
-#X obj 170 -57 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
--1;
-#X obj 337 144 unpack 0 0 0;
-#X floatatom 327 167 5 0 0 3 length - -;
-#X floatatom 376 167 5 0 0 3 width - -;
-#X floatatom 426 167 5 0 0 3 height - -;
-#X obj 227 118 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144
--1 -1;
-#X floatatom 209 83 5 0 10000 1 frame# - -;
-#X obj 170 -28 openpanel;
-#X msg 170 -8 open \$1;
-#X obj 158 101 pix_film;
-#X msg 176 35 auto \$1;
-#X obj 176 17 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1
-;
 #X obj 178 299 cnv 15 600 250 empty empty empty 20 12 0 14 -4034 -66577
 0;
 #X text 667 -49 Create window and render;
-#X text 373 101 written by Yves Degoyon ( ydegoyon@gmail.com );
-#X msg 271 18 colorspace RGBA;
-#X msg 376 18 colorspace RGB;
-#X msg 480 18 colorspace Grey;
-#X obj 277 -2 loadbang;
-#X obj 183 474 pix_opencv_colorfilt;
+#X text 432 585 written by Yves Degoyon ( ydegoyon@gmail.com );
 #X obj 183 574 rectangle 5.3 4;
 #X floatatom 215 505 5 0 0 0 - - -;
 #X floatatom 260 504 5 0 0 0 - - -;
@@ -78,51 +57,113 @@
 #X msg 807 167 bang;
 #X floatatom 757 242 5 0 0 0 - - -;
 #X floatatom 810 245 5 0 0 0 - - -;
-#X text 374 66 pix_opencv_colorfilt : color filter;
-#X text 373 77 you can set the selected color with its RGB components
+#X text 433 550 pix_opencv_colorfilt : color filter;
+#X text 434 562 you can set the selected color with its RGB components
 or by selecting a piksel in the video window;
 #X msg 239 317 pick \$1 \$2;
 #X text 315 316 pick a color from the video;
-#X connect 0 0 14 0;
-#X connect 1 0 25 0;
-#X connect 3 0 4 0;
-#X connect 4 0 3 0;
-#X connect 5 0 12 0;
-#X connect 6 0 7 0;
-#X connect 6 1 8 0;
-#X connect 6 2 9 0;
+#X obj 352 -33 gemhead;
+#X obj 364 -6 bng 25 250 50 0 load empty empty 0 -6 0 8 -262144 -1
+-1;
+#X obj 421 169 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144
+-1 -1;
+#X floatatom 403 134 5 0 10000 1 frame# - -;
+#X obj 364 23 openpanel;
+#X msg 364 43 open \$1;
+#X obj 352 152 pix_film;
+#X msg 370 86 auto \$1;
+#X obj 370 68 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1
+;
+#X msg 465 69 colorspace RGBA;
+#X msg 570 69 colorspace RGB;
+#X msg 466 92 colorspace Grey;
+#X obj 465 41 loadbang;
+#N canvas 0 0 450 300 vswitch 0;
+#X obj 144 263 outlet;
+#X obj 36 26 inlet;
+#X obj 260 29 inlet;
+#X obj 36 133 spigot;
+#X obj 260 141 spigot;
+#X obj 119 64 loadbang;
+#X msg 83 93 0;
+#X msg 113 93 1;
+#X msg 296 104 0;
+#X msg 326 104 1;
+#X obj 399 34 inlet;
+#X obj 399 67 select 0;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 3 0 0 0;
+#X connect 4 0 0 0;
+#X connect 5 0 7 0;
+#X connect 5 0 8 0;
+#X connect 6 0 3 1;
+#X connect 7 0 3 1;
+#X connect 8 0 4 1;
+#X connect 9 0 4 1;
 #X connect 10 0 11 0;
-#X connect 11 0 14 1;
-#X connect 12 0 13 0;
-#X connect 13 0 14 0;
-#X connect 14 0 24 0;
-#X connect 14 1 6 0;
-#X connect 14 2 10 0;
-#X connect 15 0 14 0;
-#X connect 16 0 15 0;
-#X connect 20 0 14 0;
-#X connect 21 0 14 0;
-#X connect 22 0 14 0;
-#X connect 23 0 20 0;
-#X connect 24 0 1 0;
-#X connect 24 1 26 0;
-#X connect 24 2 27 0;
-#X connect 24 3 28 0;
-#X connect 30 0 24 1;
-#X connect 30 1 24 2;
-#X connect 30 2 24 3;
-#X connect 31 0 24 0;
-#X connect 32 0 31 0;
-#X connect 34 0 36 1;
-#X connect 34 1 35 1;
-#X connect 34 2 39 0;
-#X connect 35 0 38 1;
-#X connect 35 0 42 0;
-#X connect 36 0 38 0;
-#X connect 36 0 41 0;
+#X connect 11 0 7 0;
+#X connect 11 0 8 0;
+#X connect 11 1 9 0;
+#X connect 11 1 6 0;
+#X restore 181 224 pd vswitch;
+#X obj 249 224 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 115 150 pix_video;
+#X obj 116 -16 gemhead;
+#X msg 154 75 device 0;
+#X msg 163 106 driver 1;
+#X msg 140 21 dialog;
+#X msg 145 51 device /dev/dv1394-0;
+#X obj 183 474 pix_opencv_colorfilt;
+#X obj 181 257 pix_resize 320 240;
+#X connect 0 0 7 0;
+#X connect 2 0 3 0;
+#X connect 3 0 2 0;
+#X connect 12 0 50 1;
+#X connect 12 1 50 2;
+#X connect 12 2 50 3;
+#X connect 13 0 50 0;
+#X connect 14 0 13 0;
+#X connect 16 0 18 1;
+#X connect 16 1 17 1;
+#X connect 16 2 21 0;
+#X connect 17 0 20 1;
+#X connect 17 0 24 0;
+#X connect 18 0 20 0;
+#X connect 18 0 23 0;
+#X connect 19 0 18 0;
+#X connect 19 1 17 0;
+#X connect 20 0 27 0;
+#X connect 21 0 22 0;
+#X connect 22 0 19 0;
+#X connect 27 0 50 0;
+#X connect 29 0 35 0;
+#X connect 30 0 33 0;
+#X connect 31 0 32 0;
+#X connect 32 0 35 1;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 35 0 42 1;
+#X connect 35 2 31 0;
+#X connect 36 0 35 0;
 #X connect 37 0 36 0;
-#X connect 37 1 35 0;
-#X connect 38 0 45 0;
-#X connect 39 0 40 0;
-#X connect 40 0 37 0;
-#X connect 45 0 24 0;
+#X connect 38 0 35 0;
+#X connect 38 0 44 0;
+#X connect 39 0 35 0;
+#X connect 40 0 35 0;
+#X connect 41 0 38 0;
+#X connect 41 0 37 0;
+#X connect 42 0 51 0;
+#X connect 43 0 42 2;
+#X connect 44 0 42 0;
+#X connect 45 0 44 0;
+#X connect 46 0 44 0;
+#X connect 47 0 44 0;
+#X connect 48 0 44 0;
+#X connect 49 0 44 0;
+#X connect 50 0 0 0;
+#X connect 50 1 8 0;
+#X connect 50 2 9 0;
+#X connect 50 3 10 0;
+#X connect 51 0 50 0;
diff --git a/pix_opencv_motempl-help.pd b/pix_opencv_motempl-help.pd
index 5fd7618..d491f8c 100644
--- a/pix_opencv_motempl-help.pd
+++ b/pix_opencv_motempl-help.pd
@@ -1,4 +1,4 @@
-#N canvas 0 25 1659 940 10;
+#N canvas 0 0 1249 684 10;
 #X obj 535 783 pix_texture;
 #X obj 535 811 square 2;
 #X obj 504 497 cnv 15 550 251 empty empty empty 20 12 0 14 -24198 -66577
@@ -103,7 +103,7 @@ movement history;
 #X msg 662 145 open \$1;
 #X obj 650 254 pix_film;
 #X msg 668 188 auto \$1;
-#X obj 668 170 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0
+#X obj 668 170 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1
 1;
 #X msg 763 171 colorspace RGBA;
 #X msg 868 171 colorspace RGB;
@@ -151,6 +151,8 @@ movement history;
 #X msg 461 208 driver 1;
 #X msg 438 123 dialog;
 #X msg 443 153 device /dev/dv1394-0;
+#X obj 485 461 pix_resize 320 240;
+#X msg 673 433 dimen 128 128;
 #X connect 0 0 1 0;
 #X connect 15 0 3 0;
 #X connect 15 1 4 0;
@@ -211,7 +213,7 @@ movement history;
 #X connect 74 0 76 0;
 #X connect 75 0 74 0;
 #X connect 76 0 58 0;
-#X connect 77 0 43 0;
+#X connect 77 0 86 0;
 #X connect 78 0 73 0;
 #X connect 78 0 75 0;
 #X connect 79 0 78 2;
@@ -221,3 +223,5 @@ movement history;
 #X connect 83 0 80 0;
 #X connect 84 0 80 0;
 #X connect 85 0 80 0;
+#X connect 86 0 43 0;
+#X connect 87 0 86 0;