From 2ee1e781e01ebdedef10c7f30580a2641ac10650 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Sat, 19 Sep 2009 13:32:54 +0000 Subject: fixing help patches svn path=/trunk/externals/pix_opencv/; revision=12401 --- Makefile | 6 +- pix_opencv_bgstats-help.pd | 177 +++++++++++++++++++++------------- pix_opencv_hu_compare-help.pd | 131 ++++++++++++++++--------- pix_opencv_laplace-help.pd | 18 ++-- pix_opencv_lk-help.pd | 46 ++++----- pix_opencv_pgh_compare-help.pd | 193 ++++++++++++++++++++++--------------- pix_opencv_surf-help.pd | 213 ++++++++++++++++++++++++----------------- pix_opencv_threshold-help.pd | 4 +- 8 files changed, 480 insertions(+), 308 deletions(-) diff --git a/Makefile b/Makefile index d97d8a8..3f89146 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PD_DIR = /usr/src/pd-svn/trunk/pd -GEM_DIR = /usr/src/pd-svn/trunk/Gem +PD_DIR = /usr/local/pd +GEM_DIR = /usr/local/pd/gem GEM_OPENCV_VERSION = 0.2 @@ -28,7 +28,7 @@ endif .SUFFIXES = $(EXTENSION) SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc -SOURCES_OPT = +SOURCES_OPT = pix_opencv_surf.cc all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) diff --git a/pix_opencv_bgstats-help.pd b/pix_opencv_bgstats-help.pd index fa1d841..2f0504d 100644 --- a/pix_opencv_bgstats-help.pd +++ b/pix_opencv_bgstats-help.pd @@ -1,8 +1,7 @@ -#N canvas 6 49 1069 675 10; -#X obj 407 -28 gemhead; +#N canvas 84 123 1069 675 10; #X obj 365 487 pix_texture; #X obj 365 515 square 2; -#X obj 20 165 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 +#X obj 716 155 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 0; #N canvas 0 22 454 304 gemwin 0; #X obj 67 89 outlet; @@ -34,31 +33,13 @@ #X connect 9 0 6 0; #X connect 10 0 7 0; #X connect 10 2 9 0; -#X restore 25 209 pd gemwin; -#X msg 25 185 destroy; -#X text 21 165 Create window and render; -#X obj 200 368 pix_texture; -#X obj 200 396 square 2; -#X obj 266 167 translateXYZ -2 0 0; -#X obj 367 224 separator; +#X restore 728 201 pd gemwin; +#X msg 728 177 destroy; +#X text 724 157 Create window and render; +#X obj 213 486 pix_texture; +#X obj 213 514 square 2; #X obj 346 281 cnv 15 550 200 empty empty empty 20 12 0 14 -24198 -66577 0; -#X obj 511 -66 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --1; -#X obj 524 128 unpack 0 0 0; -#X floatatom 514 151 5 0 0 3 length - -; -#X floatatom 563 151 5 0 0 3 width - -; -#X floatatom 613 151 5 0 0 3 height - -; -#X obj 568 109 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 --1 -1; -#X floatatom 550 74 5 0 10000 1 frame# - -; -#X obj 511 -37 openpanel; -#X msg 511 -17 open \$1; -#X obj 499 92 pix_film; -#X msg 517 26 auto \$1; -#X obj 517 8 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 -; -#X obj 364 259 translateXYZ 4 0 0; #X obj 363 452 pix_opencv_bgstats; #X obj 467 300 / 100; #X floatatom 508 302 5 0 0 0 - - -; @@ -75,10 +56,6 @@ the foreground ( default : 0.1 seconds ); #X text 542 367 minimum size of foreground objects; #X text 491 406 resetting the background; #X text 512 348 ( default : 2 ); -#X msg 561 47 colorspace RGBA; -#X obj 584 20 loadbang; -#X msg 678 45 colorspace RGB; -#X msg 778 45 colorspace Grey; #X text 26 69 Comments and support @ ydegoyon.gmail.com; #X text 25 -20 Objects disappear from the background after a certain amount of time of presence ( alpha ) \, they are then considered as @@ -89,39 +66,107 @@ that are less than a minumum size ( minarea parameter ).; #X text 27 -47 pix_opencv_bgstats : background and foreground extraction using a statitical method.; #X msg 406 300 alpha \$1; -#X connect 0 0 21 0; -#X connect 1 0 2 0; -#X connect 4 0 5 0; -#X connect 5 0 4 0; -#X connect 7 0 8 0; -#X connect 9 0 7 0; -#X connect 9 0 10 0; -#X connect 10 0 24 0; -#X connect 12 0 19 0; -#X connect 13 0 14 0; -#X connect 13 1 15 0; -#X connect 13 2 16 0; -#X connect 17 0 18 0; -#X connect 18 0 21 1; -#X connect 19 0 20 0; -#X connect 20 0 21 0; -#X connect 21 0 9 0; -#X connect 21 1 13 0; -#X connect 21 2 17 0; -#X connect 22 0 21 0; -#X connect 23 0 22 0; -#X connect 24 0 25 0; -#X connect 25 0 1 0; -#X connect 26 0 48 0; -#X connect 27 0 26 0; -#X connect 27 0 26 1; -#X connect 28 0 29 0; -#X connect 29 0 25 0; -#X connect 30 0 31 0; -#X connect 31 0 25 0; -#X connect 33 0 25 0; -#X connect 40 0 21 0; -#X connect 41 0 40 0; -#X connect 42 0 21 0; -#X connect 43 0 21 0; -#X connect 48 0 25 0; +#X obj 677 -113 gemhead; +#X obj 361 212 separator; +#X obj 689 -86 bng 25 250 50 0 load empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 746 89 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +-1 -1; +#X floatatom 728 54 5 0 10000 1 frame# - -; +#X obj 689 -57 openpanel; +#X msg 689 -37 open \$1; +#X obj 677 72 pix_film; +#X msg 695 6 auto \$1; +#X obj 695 -12 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +1; +#X msg 790 -11 colorspace RGBA; +#X msg 895 -11 colorspace RGB; +#X msg 999 -11 colorspace Grey; +#X obj 790 -39 loadbang; +#X obj 360 183 pix_separator; +#X obj 209 215 separator; +#X obj 209 186 pix_separator; +#X obj 209 250 translateXYZ -2 0 0; +#X obj 361 247 translateXYZ 2 0 0; +#N canvas 5 49 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 7 0; +#X connect 11 0 8 0; +#X connect 11 1 9 0; +#X connect 11 1 6 0; +#X restore 302 140 pd vswitch; +#X obj 370 140 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 440 70 pix_video; +#X obj 440 -94 gemhead; +#X msg 479 -5 device 0; +#X msg 488 26 driver 1; +#X msg 465 -59 dialog; +#X msg 470 -29 device /dev/dv1394-0; +#X connect 0 0 1 0; +#X connect 3 0 4 0; +#X connect 4 0 3 0; +#X connect 6 0 7 0; +#X connect 9 0 0 0; +#X connect 10 0 28 0; +#X connect 11 0 10 0; +#X connect 11 0 10 1; +#X connect 12 0 13 0; +#X connect 13 0 9 0; +#X connect 14 0 15 0; +#X connect 15 0 9 0; +#X connect 17 0 9 0; +#X connect 28 0 9 0; +#X connect 29 0 36 0; +#X connect 30 0 47 0; +#X connect 31 0 34 0; +#X connect 32 0 33 0; +#X connect 33 0 36 1; +#X connect 34 0 35 0; +#X connect 35 0 36 0; +#X connect 36 0 48 1; +#X connect 36 2 32 0; +#X connect 37 0 36 0; +#X connect 38 0 37 0; +#X connect 39 0 36 0; +#X connect 39 0 50 0; +#X connect 40 0 36 0; +#X connect 41 0 36 0; +#X connect 42 0 39 0; +#X connect 42 0 38 0; +#X connect 43 0 30 0; +#X connect 44 0 46 0; +#X connect 45 0 44 0; +#X connect 46 0 6 0; +#X connect 47 0 9 0; +#X connect 48 0 43 0; +#X connect 48 0 45 0; +#X connect 49 0 48 2; +#X connect 50 0 48 0; +#X connect 51 0 50 0; +#X connect 52 0 50 0; +#X connect 53 0 50 0; +#X connect 54 0 50 0; +#X connect 55 0 50 0; diff --git a/pix_opencv_hu_compare-help.pd b/pix_opencv_hu_compare-help.pd index cba6fb6..d7b1f46 100644 --- a/pix_opencv_hu_compare-help.pd +++ b/pix_opencv_hu_compare-help.pd @@ -1,5 +1,5 @@ -#N canvas 495 86 1154 642 10; -#X obj 838 6 gemhead; +#N canvas 266 86 1154 642 10; +#X obj 937 -7 gemhead; #X obj 372 500 pix_texture; #X obj 372 528 square 2; #X obj 9 -28 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 @@ -39,16 +39,16 @@ #X text 15 -23 Create window and render; #X obj 363 232 cnv 15 700 250 empty empty empty 20 12 0 14 -24198 -66577 0; -#X obj 485 -90 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +#X obj 619 -90 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X obj 542 85 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +#X obj 676 85 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 -1 -1; -#X floatatom 524 50 5 0 10000 1 frame# - -; -#X obj 485 -61 openpanel; -#X msg 485 -41 open \$1; -#X obj 473 68 pix_film; -#X msg 491 2 auto \$1; -#X obj 491 -16 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 +#X floatatom 658 50 5 0 10000 1 frame# - -; +#X obj 619 -61 openpanel; +#X msg 619 -41 open \$1; +#X obj 607 68 pix_film; +#X msg 625 2 auto \$1; +#X obj 625 -16 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 373 395 pix_opencv_hu_compare; #X floatatom 506 439 30 0 0 0 - - -; @@ -58,7 +58,7 @@ -1 -1; #X obj 683 458 < 0.1; #X obj 783 437 hsl 128 15 0 0.2 0 0 cdist empty empty -2 -8 0 10 -262144 --1 -1 6900 1; +-1 -1 0 1; #X text 696 420 criteria value; #X floatatom 701 439 10 0 0 0 - - -; #X text 528 376 calculating their hu moments ( CvMatchShape ); @@ -85,38 +85,75 @@ #X text 12 -57 Written by Yves Degoyon ( ydegoyon@gmail.com ); #X text 13 -85 pix_opencv_hu_compare :: compare contours using their hu moments using CvMatchShape.; -#X text 532 -88 playing a video file; -#X text 550 -75 ( try estrella.mov ); -#X msg 755 -67 bang; -#X text 801 -74 loading a pattern image; -#X text 800 -61 ( try estrella.jpg ); -#X text 754 -92 Compare to a pattern; -#X obj 755 9 pix_image; -#X obj 757 -40 openpanel; -#X msg 756 -13 open \$1; -#X floatatom 908 126 5 0 0 0 - - -; -#X text 946 125 threshold (default 13) to use when comparing pixel +#X text 666 -88 playing a video file; +#X text 684 -75 ( try estrella.mov ); +#X msg 854 -80 bang; +#X text 900 -87 loading a pattern image; +#X text 899 -74 ( try estrella.jpg ); +#X text 853 -105 Compare to a pattern; +#X obj 854 -4 pix_image; +#X obj 856 -53 openpanel; +#X msg 855 -26 open \$1; +#X floatatom 1007 113 5 0 0 0 - - -; +#X text 836 192 threshold (default 13) to use when comparing pixel colors; -#X obj 976 99 loadbang; -#X msg 945 99 160; -#X obj 877 98 r tresh; -#X floatatom 606 154 5 0 0 0 - - -; -#X obj 674 152 loadbang; -#X msg 646 152 160; -#X obj 607 172 s tresh; -#X obj 886 158 pix_texture; -#X obj 754 125 pix_opencv_threshold; -#X obj 473 173 pix_opencv_threshold; -#X obj 886 186 square 2; -#X obj 754 71 translateXYZ -2 0 0; -#X obj 755 39 pix_resize 320 240; -#X obj 473 101 pix_resize 320 240; -#X obj 549 -24 loadbang; -#X msg 549 1 colorspace RGBA; -#X msg 650 0 colorspace RGB; -#X msg 612 -25 colorspace Grey; -#X obj 417 -4 gemhead; -#X obj 477 142 translateXYZ 2 0 0; +#X obj 1075 86 loadbang; +#X msg 1044 86 160; +#X obj 976 85 r tresh; +#X floatatom 511 185 5 0 0 0 - - -; +#X obj 579 183 loadbang; +#X msg 551 183 160; +#X obj 512 203 s tresh; +#X obj 985 145 pix_texture; +#X obj 853 112 pix_opencv_threshold; +#X obj 378 204 pix_opencv_threshold; +#X obj 985 173 square 2; +#X obj 853 58 translateXYZ -2 0 0; +#X obj 854 26 pix_resize 320 240; +#X obj 381 153 pix_resize 320 240; +#X obj 683 -24 loadbang; +#X msg 683 1 colorspace RGBA; +#X msg 685 22 colorspace RGB; +#X msg 746 -25 colorspace Grey; +#X obj 687 -52 gemhead; +#X obj 382 173 translateXYZ 2 0 0; +#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 7 0; +#X connect 11 0 8 0; +#X connect 11 1 9 0; +#X connect 11 1 6 0; +#X restore 379 109 pd vswitch; +#X obj 447 109 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 374 60 pix_video; +#X obj 378 -88 gemhead; +#X msg 413 -15 device 0; +#X msg 422 16 driver 1; +#X msg 399 -69 dialog; +#X msg 404 -39 device /dev/dv1394-0; #X connect 0 0 49 0; #X connect 1 0 2 0; #X connect 4 0 5 0; @@ -126,7 +163,7 @@ colors; #X connect 10 0 13 1; #X connect 11 0 12 0; #X connect 12 0 13 0; -#X connect 13 0 67 0; +#X connect 13 0 74 1; #X connect 13 2 9 0; #X connect 14 0 13 0; #X connect 15 0 14 0; @@ -174,3 +211,11 @@ colors; #X connect 71 0 49 0; #X connect 72 0 13 0; #X connect 73 0 63 0; +#X connect 74 0 67 0; +#X connect 75 0 74 2; +#X connect 76 0 74 0; +#X connect 77 0 76 0; +#X connect 78 0 76 0; +#X connect 79 0 76 0; +#X connect 80 0 76 0; +#X connect 81 0 76 0; diff --git a/pix_opencv_laplace-help.pd b/pix_opencv_laplace-help.pd index 1a6af62..9e05d87 100644 --- a/pix_opencv_laplace-help.pd +++ b/pix_opencv_laplace-help.pd @@ -1,4 +1,4 @@ -#N canvas 430 219 670 547 10; +#N canvas 184 49 872 790 10; #X obj 347 393 cnv 15 200 70 empty empty empty 20 12 0 14 -24198 -66577 0; #X obj 374 435 pix_opencv_laplace; @@ -7,11 +7,11 @@ #X msg 486 410 5; #X msg 518 410 7; #X text 381 392 aperture size ( default 3 ); -#X text -94 80 Written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org +#X text 517 343 Written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org ); -#X text -94 69 used as an edge detector; -#X text -95 56 pix_opencv_laplace : laplace filter; -#X obj -96 -31 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 +#X text 517 332 used as an edge detector; +#X text 516 319 pix_opencv_laplace : laplace filter; +#X obj 515 232 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 0; #N canvas 0 22 454 304 gemwin 0; #X obj 67 89 outlet; @@ -43,9 +43,9 @@ #X connect 9 0 6 0; #X connect 10 0 7 0; #X connect 10 2 9 0; -#X restore -91 13 pd gemwin; -#X msg -91 -8 create; -#X text -90 -26 Create window and render; +#X restore 520 276 pd gemwin; +#X msg 520 255 create; +#X text 521 237 Create window and render; #X obj 493 -11 gemhead; #X obj 374 316 separator; #X obj 505 16 bng 25 250 50 0 load empty empty 0 -6 0 8 -262144 -1 @@ -57,7 +57,7 @@ #X msg 505 65 open \$1; #X obj 493 174 pix_film; #X msg 511 108 auto \$1; -#X obj 511 90 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +#X obj 511 90 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X msg 606 91 colorspace RGBA; #X msg 711 91 colorspace RGB; diff --git a/pix_opencv_lk-help.pd b/pix_opencv_lk-help.pd index e95231f..ae8fec2 100644 --- a/pix_opencv_lk-help.pd +++ b/pix_opencv_lk-help.pd @@ -1,4 +1,4 @@ -#N canvas 378 68 1192 685 10; +#N canvas 228 92 1192 685 10; #X obj 140 -12 cnv 15 600 450 empty empty empty 20 12 0 14 -24198 -66577 0; #X floatatom 288 328 5 0 0 0 - - -; @@ -58,7 +58,7 @@ #X floatatom 425 217 5 0 0 0 - - -; #X text 465 217 frame tolerance for point identification ( default : 5 ); -#X text -230 -324 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org +#X text -232 -324 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org ) and Yves Degoyon ( ydegoyon@gmail.com ); #X text -231 -336 Corner points detection based on Shi and Tomasi; #X text -231 -348 pix_opencv_lk : Lukas-Kanade corner points tracking @@ -68,22 +68,22 @@ #X floatatom 769 59 5 0 0 0 - - -; #X floatatom 822 62 5 0 0 0 - - -; #X msg 350 283 pdelaunay 1 500; -#X obj 357 -411 gemhead; -#X obj 369 -384 bng 25 250 50 0 load empty empty 0 -6 0 8 -262144 -1 +#X obj 341 -335 gemhead; +#X obj 353 -308 bng 25 250 50 0 load empty empty 0 -6 0 8 -262144 -1 -1; -#X obj 426 -209 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +#X obj 410 -133 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 -1 -1; -#X floatatom 408 -244 5 0 10000 1 frame# - -; -#X obj 369 -355 openpanel; -#X msg 369 -335 open \$1; -#X obj 357 -226 pix_film; -#X msg 375 -292 auto \$1; -#X obj 375 -310 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 +#X floatatom 392 -168 5 0 10000 1 frame# - -; +#X obj 353 -279 openpanel; +#X msg 353 -259 open \$1; +#X obj 341 -150 pix_film; +#X msg 359 -216 auto \$1; +#X obj 359 -234 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; -#X msg 470 -309 colorspace RGBA; -#X msg 575 -309 colorspace RGB; -#X msg 679 -309 colorspace Grey; -#X obj 470 -337 loadbang; +#X msg 454 -233 colorspace RGBA; +#X msg 559 -233 colorspace RGB; +#X msg 663 -233 colorspace Grey; +#X obj 454 -261 loadbang; #N canvas 0 0 450 300 vswitch 0; #X obj 144 263 outlet; #X obj 36 26 inlet; @@ -112,15 +112,15 @@ #X connect 11 0 8 0; #X connect 11 1 9 0; #X connect 11 1 6 0; -#X restore 175 -152 pd vswitch; -#X obj 247 -156 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0 +#X restore 178 -115 pd vswitch; +#X obj 250 -119 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0 1; -#X obj 120 -228 pix_video; -#X obj 120 -416 gemhead; -#X msg 159 -303 device 0; -#X msg 168 -272 driver 1; -#X msg 145 -357 dialog; -#X msg 150 -327 device /dev/dv1394-0; +#X obj 161 -166 pix_video; +#X obj 163 -320 gemhead; +#X msg 200 -241 device 0; +#X msg 209 -210 driver 1; +#X msg 186 -295 dialog; +#X msg 191 -265 device /dev/dv1394-0; #X obj 178 469 pix_texture; #X obj -231 -425 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 0; diff --git a/pix_opencv_pgh_compare-help.pd b/pix_opencv_pgh_compare-help.pd index 6421e77..c5cefa4 100644 --- a/pix_opencv_pgh_compare-help.pd +++ b/pix_opencv_pgh_compare-help.pd @@ -1,5 +1,5 @@ -#N canvas 482 166 1154 642 10; -#X obj 821 9 gemhead; +#N canvas 266 176 1154 642 10; +#X obj 897 4 gemhead; #X obj 372 500 pix_texture; #X obj 372 528 square 2; #X obj 18 26 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 @@ -39,17 +39,17 @@ #X text 25 30 Create window and render; #X obj 363 232 cnv 15 700 250 empty empty empty 20 12 0 14 -24198 -66577 0; -#X obj 485 -90 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +#X obj 553 -63 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X obj 542 85 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +#X obj 610 112 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 -1 -1; -#X floatatom 524 50 5 0 10000 1 frame# - -; -#X obj 485 -61 openpanel; -#X msg 485 -41 open \$1; -#X obj 473 68 pix_film; -#X msg 491 2 auto \$1; -#X obj 491 -16 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 -1; +#X floatatom 592 77 5 0 10000 1 frame# - -; +#X obj 553 -34 openpanel; +#X msg 553 -14 open \$1; +#X obj 552 94 pix_film; +#X msg 559 29 auto \$1; +#X obj 559 11 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +; #X floatatom 506 439 30 0 0 0 - - -; #X text 511 422 distance; #X obj 730 457 route 1; @@ -70,34 +70,32 @@ #X msg 480 290 clear; #X text 588 290 recalculates the pattern contour; #X obj 529 291 r reset; -#X text 532 -88 playing a video file; -#X text 550 -75 ( try estrella.mov ); -#X msg 755 -67 bang; -#X text 801 -74 loading a pattern image; -#X text 800 -61 ( try estrella.jpg ); -#X text 754 -92 Compare to a pattern; -#X obj 755 9 pix_image; -#X obj 757 -40 openpanel; -#X obj 755 159 separator; -#X msg 756 -13 open \$1; -#X floatatom 908 126 5 0 0 0 - - -; -#X text 946 125 threshold (default 13) to use when comparing pixel -colors; -#X obj 976 99 loadbang; -#X msg 945 99 160; -#X obj 877 98 r tresh; -#X floatatom 606 154 5 0 0 0 - - -; -#X obj 674 152 loadbang; -#X msg 646 152 160; -#X obj 607 172 s tresh; -#X obj 886 158 pix_texture; -#X obj 754 125 pix_opencv_threshold; -#X obj 473 173 pix_opencv_threshold; -#X obj 886 186 square 2; -#X obj 754 71 translateXYZ -2 0 0; -#X obj 755 39 pix_resize 320 240; -#X obj 755 186 translateXYZ 4 0 0; -#X obj 474 122 pix_resize 320 240; +#X text 600 -61 playing a video file; +#X text 618 -48 ( try estrella.mov ); +#X msg 831 -72 bang; +#X text 877 -79 loading a pattern image; +#X text 876 -66 ( try estrella.jpg ); +#X text 830 -97 Compare to a pattern; +#X obj 831 4 pix_image; +#X obj 833 -45 openpanel; +#X obj 831 154 separator; +#X msg 832 -18 open \$1; +#X floatatom 984 121 5 0 0 0 - - -; +#X obj 1052 94 loadbang; +#X msg 1021 94 160; +#X obj 953 93 r tresh; +#X floatatom 507 187 5 0 0 0 - - -; +#X obj 575 185 loadbang; +#X msg 547 185 160; +#X obj 508 205 s tresh; +#X obj 962 153 pix_texture; +#X obj 830 120 pix_opencv_threshold; +#X obj 374 206 pix_opencv_threshold; +#X obj 962 181 square 2; +#X obj 830 66 translateXYZ -2 0 0; +#X obj 831 34 pix_resize 320 240; +#X obj 831 181 translateXYZ 4 0 0; +#X obj 374 177 pix_resize 320 240; #X obj 374 395 pix_opencv_pgh_compare; #X text 17 -80 pix_opencv_pgh_compare :: compare contours calculating their PGH histograms.; @@ -105,10 +103,47 @@ their PGH histograms.; example code from OpenCV book; #X obj 683 458 < 0.05; #X text 612 326 ( adjust to your situation : default : 0.05 ); -#X obj 548 -27 loadbang; -#X msg 548 -2 colorspace RGBA; -#X msg 652 -2 colorspace RGB; -#X msg 611 -28 colorspace Grey; +#X obj 616 0 loadbang; +#X msg 616 25 colorspace RGBA; +#X msg 720 25 colorspace RGB; +#X msg 679 -1 colorspace Grey; +#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 7 0; +#X connect 11 0 8 0; +#X connect 11 1 9 0; +#X connect 11 1 6 0; +#X restore 374 132 pd vswitch; +#X obj 443 131 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 372 100 pix_video; +#X obj 373 -54 gemhead; +#X msg 411 25 device 0; +#X msg 420 56 driver 1; +#X msg 397 -29 dialog; +#X msg 402 1 device /dev/dv1394-0; #X connect 0 0 38 0; #X connect 1 0 2 0; #X connect 4 0 5 0; @@ -118,49 +153,57 @@ example code from OpenCV book; #X connect 10 0 13 1; #X connect 11 0 12 0; #X connect 12 0 13 0; -#X connect 13 0 58 0; +#X connect 13 0 67 1; #X connect 13 2 9 0; #X connect 14 0 13 0; #X connect 15 0 14 0; -#X connect 16 0 62 0; +#X connect 16 0 61 0; #X connect 18 0 19 0; #X connect 20 0 22 0; -#X connect 20 0 62 1; -#X connect 23 0 59 0; +#X connect 20 0 61 1; +#X connect 23 0 58 0; #X connect 24 0 23 0; -#X connect 26 0 59 0; +#X connect 26 0 58 0; #X connect 27 0 26 0; -#X connect 29 0 59 0; +#X connect 29 0 58 0; #X connect 31 0 29 0; #X connect 34 0 39 0; -#X connect 38 0 56 0; +#X connect 38 0 55 0; #X connect 39 0 41 0; -#X connect 40 0 57 0; +#X connect 40 0 56 0; #X connect 41 0 38 0; -#X connect 42 0 52 2; -#X connect 44 0 45 0; +#X connect 42 0 51 2; +#X connect 43 0 44 0; +#X connect 44 0 42 0; #X connect 45 0 42 0; -#X connect 46 0 42 0; -#X connect 47 0 50 0; -#X connect 47 0 53 2; -#X connect 48 0 49 0; -#X connect 49 0 47 0; -#X connect 51 0 54 0; -#X connect 52 0 40 0; -#X connect 52 0 51 0; -#X connect 52 0 59 1; -#X connect 53 0 59 0; -#X connect 55 0 52 0; -#X connect 56 0 55 0; -#X connect 57 0 13 0; -#X connect 58 0 53 0; -#X connect 59 0 1 0; -#X connect 59 1 16 0; -#X connect 62 0 18 0; -#X connect 64 0 65 0; -#X connect 65 0 13 0; +#X connect 46 0 49 0; +#X connect 46 0 52 2; +#X connect 47 0 48 0; +#X connect 48 0 46 0; +#X connect 50 0 53 0; +#X connect 51 0 40 0; +#X connect 51 0 50 0; +#X connect 51 0 58 1; +#X connect 52 0 58 0; +#X connect 54 0 51 0; +#X connect 55 0 54 0; +#X connect 56 0 13 0; +#X connect 57 0 52 0; +#X connect 58 0 1 0; +#X connect 58 1 16 0; +#X connect 61 0 18 0; +#X connect 63 0 64 0; +#X connect 64 0 13 0; +#X connect 64 0 38 0; #X connect 65 0 38 0; -#X connect 66 0 38 0; +#X connect 65 0 13 0; #X connect 66 0 13 0; -#X connect 67 0 13 0; -#X connect 67 0 38 0; +#X connect 66 0 38 0; +#X connect 67 0 57 0; +#X connect 68 0 67 2; +#X connect 69 0 67 0; +#X connect 70 0 69 0; +#X connect 71 0 69 0; +#X connect 72 0 69 0; +#X connect 73 0 69 0; +#X connect 74 0 69 0; diff --git a/pix_opencv_surf-help.pd b/pix_opencv_surf-help.pd index 5e5168d..e60d1db 100644 --- a/pix_opencv_surf-help.pd +++ b/pix_opencv_surf-help.pd @@ -1,9 +1,8 @@ -#N canvas 117 89 1211 737 10; -#X obj 218 -57 gemhead; -#X obj 212 459 pix_texture; -#X obj 28 132 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 +#N canvas 122 88 1211 737 10; +#X obj 361 637 pix_texture; +#X obj 32 -122 cnv 15 220 70 empty empty empty 20 12 0 14 -195568 -66577 0; -#N canvas 189 149 454 304 gemwin 0; +#N canvas 194 173 454 304 gemwin 0; #X obj 130 218 gemwin; #X obj 67 89 outlet; #X obj 67 10 inlet; @@ -41,26 +40,11 @@ #X connect 9 2 11 0; #X connect 10 0 0 0; #X connect 11 0 0 0; -#X restore 35 178 pd gemwin; -#X msg 35 157 destroy; -#X text 36 136 Create window and render; +#X restore 39 -76 pd gemwin; +#X msg 39 -97 destroy; +#X text 40 -118 Create window and render; #X obj 340 180 cnv 15 600 450 empty empty empty 20 12 0 14 -24198 -66577 0; -#X obj 333 -86 bng 25 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --1; -#X obj 346 108 unpack 0 0 0; -#X floatatom 336 131 5 0 0 3 length - -; -#X floatatom 385 131 5 0 0 3 width - -; -#X floatatom 435 131 5 0 0 3 height - -; -#X obj 390 89 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 --1 -1; -#X floatatom 382 72 5 0 10000 1 frame# - -; -#X obj 333 -57 openpanel; -#X msg 333 -37 open \$1; -#X obj 321 72 pix_film; -#X msg 339 6 auto \$1; -#X obj 339 -12 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 -1; #X obj 485 575 unpack f f; #X floatatom 486 600 5 0 0 0 - - -; #X floatatom 544 601 5 0 0 0 - - -; @@ -76,13 +60,7 @@ #X msg 1019 176 bang; #X floatatom 969 251 5 0 0 0 - - -; #X floatatom 1022 254 5 0 0 0 - - -; -#X obj 212 518 rectangle 4 3; -#X obj 212 489 pix_resize 320 240; -#X obj 410 -7 loadbang; -#X msg 410 18 colorspace RGBA; -#X msg 514 18 colorspace RGB; -#X msg 473 -8 colorspace Grey; -#X obj 384 524 pix_opencv_surf; +#X obj 360 524 pix_opencv_surf; #X obj 467 252 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X msg 382 253 nightmode \$1; @@ -116,64 +94,125 @@ #X text 476 273 mark all points; #X msg 416 293 mark none; #X text 486 294 suppress all marks; -#X text 654 27 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org +#X text 635 -81 written by Lluis Gomez i Bigorda ( lluisgomez@hangar.org ) and Yves Degoyon ( ydegoyon@gmail.com ); -#X text 652 4 pix_opencv_surf : SURF ( Speed Up Robust Features ) points -detection and tracking; +#X text 633 -104 pix_opencv_surf : SURF ( Speed Up Robust Features +) points detection and tracking; #X text 478 224 hessian threshold ( default 1000 ); -#X connect 0 0 16 0; -#X connect 1 0 35 0; -#X connect 3 0 4 0; -#X connect 4 0 3 0; -#X connect 7 0 14 0; -#X connect 8 0 9 0; -#X connect 8 1 10 0; -#X connect 8 2 11 0; -#X connect 12 0 13 0; +#X obj 360 669 rectangle 5.3 4; +#X obj 515 -102 gemhead; +#X obj 527 -75 bng 25 250 50 0 load empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 584 100 bng 15 250 50 0 empty empty end_reached 20 7 0 10 -262144 +-1 -1; +#X floatatom 566 65 5 0 10000 1 frame# - -; +#X obj 527 -46 openpanel; +#X msg 527 -26 open \$1; +#X obj 515 83 pix_film; +#X msg 533 17 auto \$1; +#X obj 533 -1 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +; +#X msg 628 0 colorspace RGBA; +#X msg 733 0 colorspace RGB; +#X msg 630 24 colorspace Grey; +#X obj 628 -28 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 7 0; +#X connect 11 0 8 0; +#X connect 11 1 9 0; +#X connect 11 1 6 0; +#X restore 357 114 pd vswitch; +#X obj 429 110 tgl 15 0 empty load empty 17 7 0 10 -262144 -1 -1 0 +1; +#X obj 340 63 pix_video; +#X obj 342 -91 gemhead; +#X msg 379 -12 device 0; +#X msg 388 19 driver 1; +#X msg 365 -66 dialog; +#X msg 370 -36 device /dev/dv1394-0; +#X obj 357 151 pix_resize 320 240; +#X connect 0 0 52 0; +#X connect 2 0 3 0; +#X connect 3 0 2 0; +#X connect 6 0 7 0; +#X connect 6 1 8 0; +#X connect 11 0 6 0; +#X connect 12 0 14 1; +#X connect 12 1 13 1; +#X connect 12 2 17 0; #X connect 13 0 16 1; -#X connect 14 0 15 0; -#X connect 15 0 16 0; -#X connect 16 0 40 0; -#X connect 16 1 8 0; -#X connect 16 2 12 0; -#X connect 17 0 16 0; -#X connect 18 0 17 0; -#X connect 19 0 20 0; -#X connect 19 1 21 0; -#X connect 24 0 19 0; -#X connect 25 0 27 1; -#X connect 25 1 26 1; -#X connect 25 2 30 0; -#X connect 26 0 29 1; -#X connect 26 0 33 0; -#X connect 27 0 29 0; -#X connect 27 0 32 0; -#X connect 28 0 27 0; -#X connect 28 1 26 0; -#X connect 29 0 44 0; -#X connect 30 0 31 0; -#X connect 31 0 28 0; -#X connect 35 0 34 0; -#X connect 36 0 37 0; -#X connect 37 0 16 0; -#X connect 38 0 16 0; -#X connect 39 0 16 0; -#X connect 40 0 1 0; -#X connect 40 1 24 0; -#X connect 41 0 42 0; -#X connect 42 0 40 0; -#X connect 44 0 40 0; -#X connect 45 0 40 0; -#X connect 47 0 40 0; -#X connect 49 0 40 0; -#X connect 51 0 49 0; -#X connect 54 0 40 0; -#X connect 55 0 40 0; -#X connect 57 0 45 0; -#X connect 58 0 40 0; -#X connect 59 0 40 0; +#X connect 13 0 20 0; +#X connect 14 0 16 0; +#X connect 14 0 19 0; +#X connect 15 0 14 0; +#X connect 15 1 13 0; +#X connect 16 0 25 0; +#X connect 17 0 18 0; +#X connect 18 0 15 0; +#X connect 21 0 0 0; +#X connect 21 1 11 0; +#X connect 22 0 23 0; +#X connect 23 0 21 0; +#X connect 25 0 21 0; +#X connect 26 0 21 0; +#X connect 28 0 21 0; +#X connect 30 0 21 0; +#X connect 32 0 30 0; +#X connect 35 0 21 0; +#X connect 36 0 21 0; +#X connect 38 0 26 0; +#X connect 39 0 21 0; +#X connect 40 0 21 0; +#X connect 41 0 40 0; +#X connect 42 0 43 0; +#X connect 43 0 21 0; +#X connect 45 0 21 0; +#X connect 47 0 21 0; +#X connect 53 0 59 0; +#X connect 54 0 57 0; +#X connect 55 0 56 0; +#X connect 56 0 59 1; +#X connect 57 0 58 0; +#X connect 58 0 59 0; +#X connect 59 0 66 1; +#X connect 59 2 55 0; #X connect 60 0 59 0; -#X connect 61 0 62 0; -#X connect 62 0 40 0; -#X connect 64 0 40 0; -#X connect 66 0 40 0; +#X connect 61 0 60 0; +#X connect 62 0 59 0; +#X connect 62 0 68 0; +#X connect 63 0 59 0; +#X connect 64 0 59 0; +#X connect 65 0 62 0; +#X connect 65 0 61 0; +#X connect 66 0 74 0; +#X connect 67 0 66 2; +#X connect 68 0 66 0; +#X connect 69 0 68 0; +#X connect 70 0 68 0; +#X connect 71 0 68 0; +#X connect 72 0 68 0; +#X connect 73 0 68 0; +#X connect 74 0 21 0; diff --git a/pix_opencv_threshold-help.pd b/pix_opencv_threshold-help.pd index 1854cef..32b7472 100644 --- a/pix_opencv_threshold-help.pd +++ b/pix_opencv_threshold-help.pd @@ -1,4 +1,4 @@ -#N canvas 577 161 1077 791 10; +#N canvas 343 49 1077 791 10; #X obj 174 365 cnv 15 600 180 empty empty empty 20 12 0 14 -4034 -66577 0; #X floatatom 300 424 5 0 0 0 - - -; @@ -68,7 +68,7 @@ #X msg 322 0 open \$1; #X obj 310 109 pix_film; #X msg 328 43 auto \$1; -#X obj 328 25 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +#X obj 328 25 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; #X text -282 -36 Create window and render; #X msg 423 26 colorspace RGBA; -- cgit v1.2.1