Revision: 10130 http://pure-data.svn.sourceforge.net/pure-data/?rev=10130&view=rev Author: eighthave Date: 2008-07-01 07:35:47 -0700 (Tue, 01 Jul 2008)
Log Message: ----------- fixed min/max inlets so that they actually work, fixing the bug that Olsen found
Modified Paths: -------------- branches/pd-extended/v0-40/externals/mapping/autoscale.pd branches/pd-extended/v0-40/externals/mapping/help/autoscale-help.pd
Modified: branches/pd-extended/v0-40/externals/mapping/autoscale.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/autoscale.pd 2008-07-01 12:07:35 UTC (rev 10129) +++ branches/pd-extended/v0-40/externals/mapping/autoscale.pd 2008-07-01 14:35:47 UTC (rev 10130) @@ -1,46 +1,48 @@ -#N canvas 411 85 761 507 10; -#X obj 5 20 inlet; -#X obj 112 424 outlet; -#X obj 112 153 trigger float float float bang bang; -#X obj 112 321 expr (($f1 - $f2) * (($f5 - $f4) / ($f3 - $f2))) + $f4 +#N canvas 722 218 702 488 10; +#X obj 35 20 inlet; +#X obj 184 424 outlet; +#X obj 184 321 expr (($f1 - $f2) * (($f5 - $f4) / ($f3 - $f2))) + $f4 ; #X text 2 446 (C) Copyright 2004 Hans-Christoph Steiner hans@at.or.at ; #X text 219 461 released under the GNU GPL; #X text 417 458 $Author: eighthave $; -#X obj 368 20 inlet; -#X obj 469 20 inlet; -#X text 335 6 output min; -#X text 436 6 output max; -#X text 44 21 data to be scaled; -#X obj 522 20 inlet reset; -#N canvas 0 22 454 304 output 0; -#X obj 32 24 inlet; -#X obj 334 24 inlet; -#X obj 22 273 outlet; -#X obj 338 274 outlet; -#X text 78 273 min; -#X text 74 25 min; -#X text 380 26 max; -#X text 386 274 max; -#X obj 69 54 loadbang; -#X obj 37 167 expr if ($f1 == $f2 , 0 , $f1) ; if ($f1 == $f2 , +#X obj 398 20 inlet; +#X obj 499 20 inlet; +#X text 365 6 output min; +#X text 466 6 output max; +#X text 74 21 data to be scaled; +#X obj 552 20 inlet reset; +#N canvas 691 127 481 311 output 0; +#X obj 6 23 inlet; +#X obj 294 25 inlet; +#X obj 6 270 outlet; +#X obj 177 273 outlet; +#X text 62 270 min; +#X text 48 24 min; +#X text 340 27 max; +#X text 225 273 max; +#X obj 38 53 loadbang; +#X obj 6 216 expr if ($f1 == $f2 , 0 , $f1) ; if ($f1 == $f2 , 1 , $f2); -#X obj 235 135 purepd/float_argument $2 1; -#X obj 69 77 trigger 0 bang; -#X text 183 76 [float_argument] doesn't output 0 on; -#X text 183 88 bang , so send the 0 here.; -#X obj 37 135 purepd/float_argument $1 0; -#X connect 0 0 14 0; -#X connect 1 0 10 0; -#X connect 8 0 11 0; +#X text 153 71 [float_argument] doesn't output 0 on; +#X text 156 81 bang , so send the 0 here.; +#X obj 26 125 purepd/float_argument $1 0; +#X obj 39 183 trigger bang float; +#X obj 38 76 trigger bang bang; +#X obj 204 125 purepd/float_argument $2 1; +#X connect 0 0 9 0; +#X connect 1 0 13 0; +#X connect 8 0 14 0; #X connect 9 0 2 0; #X connect 9 1 3 0; -#X connect 10 0 9 1; -#X connect 11 0 14 0; -#X connect 11 1 10 0; -#X connect 14 0 9 0; -#X restore 391 283 pd output range; +#X connect 12 0 9 0; +#X connect 13 0 9 0; +#X connect 13 1 9 1; +#X connect 14 0 12 0; +#X connect 14 1 15 0; +#X connect 15 0 9 1; +#X restore 418 263 pd output range; #N canvas 463 201 389 220 track 0; #X obj 168 22 inlet; #X obj 38 135 outlet; @@ -55,8 +57,7 @@ #X connect 4 0 6 0; #X connect 5 0 3 0; #X connect 6 0 1 0; -#X restore 191 290 pd track changes; -#X obj 370 153 trigger float bang bang; +#X restore 263 290 pd track changes; #N canvas 634 182 466 316 gate 0; #X obj 74 268 outlet; #X obj 316 266 outlet; @@ -84,51 +85,49 @@ #X connect 10 0 5 0; #X connect 10 0 6 0; #X connect 11 0 10 0; -#X restore 154 81 pd gate; -#X obj 522 39 route float bang; -#X obj 175 424 outlet; -#X obj 238 424 outlet; -#X obj 175 398 f; -#X obj 238 399 f; +#X restore 184 81 pd gate; +#X obj 552 39 route float bang; +#X obj 247 424 outlet; +#X obj 310 424 outlet; +#X obj 247 398 f; +#X obj 310 399 f; #X text 417 445 $Revision: 1.6 $$Date: 2006-12-24 06:06:41 $; -#X text 192 135 track mode; -#X text 396 136 run mode; -#X obj 16 224 unpack float float; -#X obj 16 198 trigger list bang; -#X obj 5 347 trigger bang bang; -#X obj 5 60 route save load reset; -#X connect 0 0 28 0; -#X connect 2 0 3 0; -#X connect 2 1 14 0; -#X connect 2 2 14 1; -#X connect 2 3 13 0; -#X connect 2 4 13 1; -#X connect 3 0 1 0; -#X connect 7 0 13 0; -#X connect 8 0 13 1; -#X connect 12 0 17 0; -#X connect 13 0 3 3; -#X connect 13 1 3 4; -#X connect 14 0 3 1; -#X connect 14 0 20 1; -#X connect 14 1 3 2; -#X connect 14 1 21 1; -#X connect 15 0 3 0; -#X connect 15 1 13 0; -#X connect 15 2 13 1; -#X connect 16 0 2 0; -#X connect 16 1 15 0; -#X connect 17 0 16 1; -#X connect 17 1 14 2; -#X connect 20 0 18 0; -#X connect 21 0 19 0; -#X connect 25 0 14 0; -#X connect 25 1 14 1; +#X text 264 135 track mode; +#X text 356 136 run mode; +#X obj 46 224 unpack float float; +#X obj 46 198 trigger list bang; +#X obj 35 347 trigger bang bang; +#X obj 35 60 route save load reset; +#X obj 362 153 float; +#X obj 184 153 trigger float float float; +#X connect 0 0 26 0; +#X connect 2 0 1 0; +#X connect 6 0 12 0; +#X connect 7 0 12 1; +#X connect 11 0 15 0; +#X connect 12 0 2 3; +#X connect 12 1 2 4; +#X connect 13 0 2 1; +#X connect 13 0 18 1; +#X connect 13 1 2 2; +#X connect 13 1 19 1; +#X connect 14 0 28 0; +#X connect 14 1 27 0; +#X connect 15 0 14 1; +#X connect 15 1 13 2; +#X connect 18 0 16 0; +#X connect 19 0 17 0; +#X connect 23 0 13 0; +#X connect 23 1 13 1; +#X connect 24 0 23 0; +#X connect 24 1 13 2; +#X connect 25 0 18 0; +#X connect 25 1 19 0; #X connect 26 0 25 0; -#X connect 26 1 14 2; -#X connect 27 0 20 0; -#X connect 27 1 21 0; -#X connect 28 0 27 0; -#X connect 28 1 26 0; -#X connect 28 2 14 2; -#X connect 28 3 16 0; +#X connect 26 1 24 0; +#X connect 26 2 13 2; +#X connect 26 3 14 0; +#X connect 27 0 2 0; +#X connect 28 0 2 0; +#X connect 28 1 13 0; +#X connect 28 2 13 1;
Modified: branches/pd-extended/v0-40/externals/mapping/help/autoscale-help.pd =================================================================== --- branches/pd-extended/v0-40/externals/mapping/help/autoscale-help.pd 2008-07-01 12:07:35 UTC (rev 10129) +++ branches/pd-extended/v0-40/externals/mapping/help/autoscale-help.pd 2008-07-01 14:35:47 UTC (rev 10130) @@ -1,5 +1,4 @@ -#N canvas 139 22 451 673 10; -#X declare -lib mapping; +#N canvas 320 22 451 673 10; #X floatatom 26 76 5 0 0 0 - - -; #X floatatom 26 140 0 0 0 0 - - -; #X obj 2 -10 cnv 15 450 20 empty empty [autoscale] 2 11 1 18 -233017 @@ -7,24 +6,21 @@ #X text 18 23 [autoscale] scales a stream of numbers based on an output range set as arguments , and an input range which is set dynamically. ; -#X floatatom 177 244 5 0 0 1 min - -; -#X obj 161 301 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 --1 -1 10391 1; +#X floatatom 173 253 5 0 0 1 min - -; #X floatatom 150 140 0 0 0 0 - - -; #X floatatom 297 140 0 0 0 0 - - -; #X obj 213 71 hsl 128 15 0 127 0 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 1; #X floatatom 136 363 5 0 0 0 - - -; #X obj 161 416 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 --1 -1 5443 1; +-1 -1 0 1; #X msg 186 361 reset; #X text 13 181 If you use [autoscale] with no arguments , then the output range defaults to 0-1.; #X msg 239 361 bang; #X text 14 211 You can also set the output min and max using the 2nd and 3rd inlets:; -#X floatatom 195 260 5 0 0 1 max - -; -#X floatatom 117 250 5 0 0 0 - - -; +#X floatatom 229 253 5 0 0 1 max - -; #X obj 295 361 tgl 15 1 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X text 14 322 The [reset( message or banging the 4th inlet resets @@ -32,7 +28,7 @@ it:; #X floatatom 81 505 5 0 0 0 - - -; #X obj 130 630 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144 --1 -1 5292 1; +-1 -1 0 1; #X text 16 453 The dump message allow "autoscale" to output the min and max of the input data. this allow user to save this data in order to load the same callibration with a loadbang :; @@ -42,35 +38,38 @@ #X msg 148 500 save; #X msg 215 600 set load $1 $2; #X msg 150 523 load 1 11; +#X msg 323 531 bang; +#X floatatom 158 306 7 0 0 0 - - -; +#X obj 135 234 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X obj 297 110 autoscale -4095 4095; #X obj 150 110 autoscale -0.01 0.01; +#X obj 158 284 autoscale; #X obj 158 393 autoscale; #X obj 26 110 autoscale; -#X obj 158 278 autoscale; -#X obj 297 110 autoscale -4095 4095; #X obj 127 556 autoscale 0 1 ______________; -#X msg 323 531 bang; -#X connect 0 0 29 0; +#X connect 0 0 32 0; #X connect 4 0 30 1; -#X connect 8 0 27 0; +#X connect 7 0 28 0; +#X connect 7 0 29 0; #X connect 8 0 31 0; -#X connect 9 0 28 0; -#X connect 11 0 28 0; -#X connect 13 0 28 3; -#X connect 15 0 30 2; -#X connect 16 0 30 0; -#X connect 17 0 28 3; -#X connect 19 0 32 0; -#X connect 22 0 32 3; -#X connect 23 0 25 0; -#X connect 24 0 32 0; -#X connect 25 0 26 0; -#X connect 26 0 32 0; -#X connect 27 0 6 0; -#X connect 28 0 10 0; -#X connect 29 0 1 0; -#X connect 30 0 5 0; -#X connect 31 0 7 0; -#X connect 32 0 20 0; -#X connect 32 1 23 0; -#X connect 32 2 23 1; -#X connect 33 0 32 3; +#X connect 10 0 31 0; +#X connect 12 0 31 3; +#X connect 14 0 30 2; +#X connect 15 0 31 3; +#X connect 17 0 33 0; +#X connect 20 0 33 3; +#X connect 21 0 23 0; +#X connect 22 0 33 0; +#X connect 23 0 24 0; +#X connect 24 0 33 0; +#X connect 25 0 33 3; +#X connect 27 0 30 0; +#X connect 28 0 6 0; +#X connect 29 0 5 0; +#X connect 30 0 26 0; +#X connect 31 0 9 0; +#X connect 32 0 1 0; +#X connect 33 0 18 0; +#X connect 33 1 21 0; +#X connect 33 2 21 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-
eighthaveï¼ users.sourceforge.net