Pd-cvs September 2006

pd-cvs@lists.iem.at

19 participants
346 discussions

externals/iem/iemmatrix/doc mtx_atan-help.pd, NONE, 1.1 mtx_dbtopow-help.pd, NONE, 1.1 mtx_powtodb-help.pd, NONE, 1.1
by Franz Zotter 11 Sep '06

11 Sep '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25719/doc Added Files: mtx_atan-help.pd mtx_dbtopow-help.pd mtx_powtodb-help.pd Log Message: mtx_window: please look into the help patch, its great! a few documentations i forgot. --- NEW FILE: mtx_dbtopow-help.pd --- #N canvas 50 103 687 471 10; #X text 458 17 updated for; #X obj 546 17 iemmatrix 0.2; #X obj 181 100 mtx_eye; #X obj 64 285 mtx_rand 4 2; #X msg 64 263 bang; #X obj 64 307 t a a; #X obj 105 307 mtx_print org; #X obj 64 357 t a a; #X msg 181 79 3 3; #X obj 181 121 mtx_* 100; #X obj 48 162 mtx_print dbtorms; #X obj 105 357 mtx_print db; #X obj 64 407 mtx_print db; #X obj 48 100 mtx 2 2; #X text 290 305 note: dB(pd):=dB(techn)+100; #X text 307 337 this means: 100dB(pd)==unity gain (==1); #X text 404 375 0dB(pd)==zero gain (==0); #X text 391 354 106dB(pd)~=double gain (==2); #X obj 595 43 matrix; #X text 465 42 see also help for; #X text 44 34 convert dB(pd) to a power value for each element of a matrix; #X obj 48 134 mtx_dbtopow; #X obj 64 330 mtx_powtodb; #X obj 64 380 mtx_dbtopow; #X obj 599 91 dbtopow; #X obj 599 71 mtx_powtodb; #X text 188 7 convert dB(pd) to power; #X msg 48 80 0 100 97 103; #X connect 2 0 9 0; #X connect 3 0 5 0; #X connect 4 0 3 0; #X connect 5 0 22 0; #X connect 5 1 6 0; #X connect 7 0 23 0; #X connect 7 1 11 0; #X connect 8 0 2 0; #X connect 9 0 21 0; #X connect 13 0 21 0; #X connect 21 0 10 0; #X connect 22 0 7 0; #X connect 23 0 12 0; #X connect 27 0 13 0; --- NEW FILE: mtx_atan-help.pd --- #N canvas 262 127 680 254 10; #X text 458 17 updated for; #X obj 546 17 iemmatrix 0.2; #X obj 595 43 matrix; #X text 465 42 see also help for; #X obj 48 100 mtx 3 3; #X obj 48 192 mtx_print abs; #X obj 48 131 t a a; #X obj 91 132 mtx_print org; #X msg 48 80 0 1 -2 -3 -4 5 -6 7 8; #X obj 48 164 mtx_atan; #X obj 595 63 atan; #X text 136 10 arc tangent value of matrix elements; #X text 45 42 compute the arc tangent of each element of a matrix; #X connect 4 0 6 0; #X connect 6 0 9 0; #X connect 6 1 7 0; #X connect 8 0 4 0; #X connect 9 0 5 0; --- NEW FILE: mtx_powtodb-help.pd --- #N canvas 580 295 687 471 10; #X text 458 17 updated for; #X obj 546 17 iemmatrix 0.2; #X obj 181 90 mtx_eye; #X obj 64 258 mtx_rand 4 2; #X msg 64 233 bang; #X obj 64 307 t a a; #X obj 105 307 mtx_print org; #X obj 64 357 t a a; #X msg 181 71 3 3; #X obj 181 110 mtx_* 100; #X obj 48 100 mtx 2 2; #X text 290 305 note: dB(pd):=dB(techn)+100; #X text 307 337 this means: 100dB(pd)==unity gain (==1); #X text 404 375 0dB(pd)==zero gain (==0); #X text 391 354 106dB(pd)~=double gain (==2); #X obj 105 357 mtx_print rms; #X obj 64 407 mtx_print db; #X msg 48 80 0 1 0.1 2; #X obj 64 277 mtx_* 100; #X obj 595 43 matrix; #X text 465 42 see also help for; #X text 188 7 convert power to dB(pd); #X text 44 34 convert a power value to dB(pd) to for each element of a matrix; #X obj 48 134 mtx_powtodb; #X obj 48 162 mtx_print powtodb; #X obj 64 330 mtx_dbtopow; #X obj 64 380 mtx_powtodb; #X obj 599 71 mtx_dbtopow; #X obj 599 91 powtodb; #X connect 2 0 9 0; #X connect 3 0 18 0; #X connect 4 0 3 0; #X connect 5 0 25 0; #X connect 5 1 6 0; #X connect 7 0 26 0; #X connect 7 1 15 0; #X connect 8 0 2 0; #X connect 9 0 23 0; #X connect 10 0 23 0; #X connect 17 0 10 0; #X connect 18 0 5 0; #X connect 23 0 24 0; #X connect 25 0 7 0; #X connect 26 0 16 0;

1 0

externals/iem/iemmatrix/abs mtx_window-help.pd, NONE, 1.1 mtx_window.pd, NONE, 1.1
by Franz Zotter 11 Sep '06

11 Sep '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25719/abs Added Files: mtx_window-help.pd mtx_window.pd Log Message: mtx_window: please look into the help patch, its great! a few documentations i forgot. --- NEW FILE: mtx_window-help.pd --- #N canvas 439 163 841 379 10; #X text 483 27 part of iemmatrix; #N canvas 0 0 450 300 convert2tablemsg 0; #X obj 130 35 inlet; #X obj 169 216 outlet; #X obj 130 60 t a a; #X obj 160 82 mtx_size; #X obj 130 107 list split 3; #X obj 220 107 change; #X msg 220 129 resize \$1; #X obj 169 154 list prepend 0; #X connect 0 0 2 0; #X connect 2 0 4 0; #X connect 2 1 3 0; #X connect 3 1 5 0; #X connect 4 1 7 0; #X connect 5 0 6 0; #X connect 6 0 1 0; #X connect 7 0 1 0; #X restore 33 284 pd convert2tablemsg; #N canvas 0 0 450 300 (subpatch) 0; #X array view_window 101 float 1; #A 0 6.04683e-05 0.00152308 0.00493353 0.0102785 0.0175371 0.0266809 0.0376743 0.0504743 0.0650308 0.081287 0.0991793 0.118638 0.139587 0.161944 0.185622 0.210528 0.236566 0.263633 0.291624 0.320429 0.349935 0.380029 0.41059 0.441502 0.472641 0.503888 0.535119 0.566214 0.597049 0.627506 0.657464 0.686807 0.715419 0.74319 0.770011 0.795777 0.820387 0.843745 0.865759 0.886345 0.905421 0.922912 0.938751 0.952876 0.965231 0.975768 0.984446 0.991231 0.996096 0.999023 1 0.999023 0.996096 0.991231 0.984446 0.975768 0.965231 0.952876 0.938751 0.922912 0.905421 0.886345 0.865759 0.843745 0.820387 0.795777 0.770011 0.74319 0.715419 0.686807 0.657464 0.627506 0.597049 0.566214 0.53512 0.503888 0.472641 0.441502 0.410591 0.380029 0.349935 0.320429 0.291624 0.263633 0.236566 0.210529 0.185622 0.161944 0.139587 0.118638 0.0991794 0.081287 0.0650308 0.0504743 0.0376743 0.026681 0.0175371 0.0102785 0.00493356 0.00152309 6.0472e-05 ; #X coords 0 1.1 100 0 101 80 1; #X restore 326 212 graph; #X text 43 34 [mtx_window]; #X text 166 69 creates a row vector with windows of different specifications. ; #X text 268 157 outletB: window vector; #X obj 33 242 mtx_window; #X obj 33 306 s view_window; #X text 268 138 inletA: <window type> <length>; #X msg 33 68 rectangular 101; #X msg 42 87 bartlett 101; #X msg 50 106 sine 101; #X msg 54 126 hamming 101; #X msg 60 147 hanning 101; #X msg 63 169 blackman 101; #X msg 71 189 gauss 101 -77; #X text 227 315 note: the third parameter for gaussian windows describes the attenuation at the borders; #N canvas 201 191 842 574 fft_analysis 0; #X msg 477 0 sine 64; #X msg 477 42 hanning 64; #X msg 475 -41 rectangular 64; #X obj 461 160 s array1; #N canvas 0 0 450 300 mtx2arraysend 0; #X obj 150 16 inlet; #X obj 148 254 outlet; #X obj 170 64 t a a; #X obj 204 85 mtx_size; #X msg 205 129 resize \$1; #X obj 205 108 change; #X obj 172 149 list split 3; #X obj 170 169 list prepend 0; #X connect 0 0 2 0; #X connect 2 0 6 0; #X connect 2 1 3 0; #X connect 3 1 5 0; #X connect 4 0 1 0; #X connect 5 0 4 0; #X connect 6 1 7 0; #X connect 7 0 1 0; #X restore 461 137 pd mtx2arraysend; #X obj 385 250 mtx_.*; #X obj 385 276 mtx_rowrfft; #X obj 385 298 mtx_.^ 2; #X obj 457 299 mtx_.^ 2; #X obj 385 320 mtx_+; #X obj 385 383 mtx_powtodb; #N canvas 0 0 450 300 mtx2arraysend 0; #X obj 150 16 inlet; #X obj 148 254 outlet; #X obj 170 64 t a a; #X obj 204 85 mtx_size; #X msg 205 129 resize \$1; #X obj 205 108 change; #X obj 172 149 list split 3; #X obj 170 169 list prepend 0; #X connect 0 0 2 0; #X connect 2 0 6 0; #X connect 2 1 3 0; #X connect 3 1 5 0; #X connect 4 0 1 0; #X connect 5 0 4 0; #X connect 6 1 7 0; #X connect 7 0 1 0; #X restore 385 404 pd mtx2arraysend; #N canvas 51 277 450 396 normalize 0; #X obj 107 27 inlet; #X obj 104 360 outlet; #X obj 227 117 mtx_sum; #X obj 227 96 mtx_transpose; #X obj 129 97 mtx_transpose; #X obj 129 118 mtx_.^ 2; #X obj 128 139 mtx_sum; #X obj 128 160 sqrt; #X obj 340 20 inlet; #X obj 238 227 f; #X obj 129 226 f; #X obj 129 295 mux 0 1; #X obj 107 66 t a a a; #X obj 104 295 mtx; #X obj 104 328 mtx_./ 1; #X obj 109 199 t b b b f; #X connect 0 0 12 0; #X connect 2 0 9 0; #X connect 3 0 2 0; #X connect 4 0 5 0; #X connect 5 0 6 0; #X connect 6 0 7 0; #X connect 7 0 10 0; #X connect 8 0 15 0; #X connect 9 0 11 1; #X connect 10 0 11 0; #X connect 11 0 14 1; #X connect 12 0 13 0; #X connect 12 1 4 0; #X connect 12 2 3 0; #X connect 13 0 14 0; #X connect 14 0 1 0; #X connect 15 0 13 0; #X connect 15 1 10 0; #X connect 15 2 9 0; #X connect 15 3 11 2; #X restore 394 230 pd normalize; #X msg 476 -20 bartlett 64; #X msg 477 21 hamming 64; #X msg 477 63 blackman 64; #X obj 385 362 mtx_+; #X obj 474 210 tgl 15 1 empty empty broad/narrow 0 -6 0 8 -262144 -1 -1 0 1; #X obj 37 353 dbtorms; #X obj 41 317 hsl 128 15 0 127 0 1 empty empty ampl -2 -6 0 12 -262144 -1 -1 2700 1; #X floatatom 38 336 5 0 0 0 - - -; #X obj 79 197 dbtorms; #X obj 83 161 hsl 128 15 0 127 0 1 empty empty ampl -2 -6 0 10 -262144 -1 -1 8500 1; #X floatatom 80 180 5 0 0 0 - - -; #N canvas 0 0 450 300 (subpatch) 0; #X array spectrum 33 float 1; #A 0 38.8997 40.9673 44.5099 103.061 42.2724 36.1278 32.8119 30.9618 29.4879 27.9126 28.5928 27.8325 29.063 27.9504 26.035 24.9683 26.7623 27.919 26.0393 25.3933 28.6392 28.0565 27.9295 28.0921 27.2243 26.9047 26.9266 26.7948 25.7899 26.8739 26.8707 27.2482 27.7987; #X array sineamp 33 float 1; #A 0 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85 85; #X array noiseamp 33 float 1; #A 0 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27 27; #X coords 0 100 32 0 200 140 1; #X restore 51 -51 graph; #X obj 133 198 s sineamp; #X msg 133 178 const \$1; #X msg 91 333 const \$1; #X obj 91 353 s noiseamp; #X obj 385 342 mtx_* 0.1; #X obj 462 341 mtx_* 0.9; #X obj 502 381 loadbang; #X msg 502 403 ylabel -2 0 20 40 60 80 100 \, yticks 0 10 2; #X msg 532 342 xlabel -10 narrowband_dB; #X msg 596 319 xlabel -10 broadband_dB; #X obj 532 319 sel 1 0; #X text -5 133 1 choose sine/frequency+amplitude; #N canvas 61 0 443 338 mtx_oscillator 0; #X obj 84 12 inlet; #X obj 68 308 outlet; #X obj 68 131 f; #X obj 14 29 bang~; #X obj 183 27 loadbang; #X obj 183 69 mtx_:; #X obj 298 6 loadbang; #X msg 298 26 1; #X obj 297 46 atan; #X obj 68 245 mtx_* 1; #X obj 68 266 mtx_cos; #X obj 297 67 * 8; #X msg 183 49 0 63; #X obj 120 69 /; #X obj 68 201 mtx_* 1; #X obj 68 179 mtx; #N canvas 576 37 450 300 accumulate_modulo 0; #X obj 148 33 inlet; #X obj 148 232 outlet; #X obj 148 107 mtx_mod 1; #X obj 148 129 t a a; #X obj 249 33 inlet df; #X obj 188 129 mtx_slice 1 end 1 end; #X msg 339 129 \$3; #X obj 192 65 +; #X obj 148 86 mtx_+ 0; #X connect 0 0 8 0; #X connect 2 0 3 0; #X connect 3 0 1 0; #X connect 3 1 5 0; #X connect 4 0 7 1; #X connect 5 0 6 0; #X connect 6 0 7 0; #X connect 7 0 8 1; #X connect 8 0 2 0; #X restore 68 223 pd accumulate_modulo; #X obj 68 155 t b f f; #X msg 121 50 1 64; #X obj 121 31 loadbang; #X obj 84 108 *; #X obj 68 288 mtx_* 2; #X connect 0 0 20 0; #X connect 2 0 17 0; #X connect 3 0 2 0; #X connect 4 0 12 0; #X connect 5 0 15 1; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 11 0; #X connect 9 0 10 0; #X connect 10 0 21 0; #X connect 11 0 9 1; #X connect 12 0 5 0; #X connect 13 0 20 1; #X connect 14 0 16 0; #X connect 15 0 14 0; #X connect 16 0 9 0; #X connect 17 0 15 0; #X connect 17 1 14 1; #X connect 17 2 16 1; #X connect 18 0 13 0; #X connect 19 0 18 0; #X connect 20 0 2 1; #X connect 21 0 1 0; #X restore -8 219 pd mtx_oscillator; #X obj -8 239 mtx_* 0; #X obj 385 203 mtx_+; #X text -7 268 2 choose sine/frequency+amplitude; #X obj -7 376 mtx_* 0; #N canvas 0 0 450 300 mtx_noise~ 0; #X obj 180 137 mtx_* 2; #X obj 180 158 mtx_- 1; #X obj 323 116 loadbang; #X msg 323 140 3; #X obj 323 162 sqrt; #X obj 180 204 mtx_* 1; #X obj 180 235 outlet; #X obj 180 85 bang~; #X obj 180 106 mtx_rand 1 64; #X connect 0 0 1 0; #X connect 1 0 5 0; #X connect 2 0 3 0; #X connect 3 0 4 0; #X connect 4 0 5 1; #X connect 5 0 6 0; #X connect 7 0 8 0; #X connect 8 0 0 0; #X restore -7 286 pd mtx_noise~; #X obj 339 63 dsp; #X obj 339 45 tgl 15 0 empty dsp_tgl empty 0 -6 0 8 -262144 -1 -1 1 1; #X text 343 -39 3 choose window; #X text 343 180 4 choose broadband/narrow band normalization; #X floatatom 347 93 5 0 0 0 - - -; #X floatatom 306 94 5 0 0 0 - - -; #N canvas 0 0 450 300 mtx2arraysend 0; #X obj 150 16 inlet; #X obj 148 254 outlet; #X obj 170 64 t a a; #X obj 204 85 mtx_size; #X msg 205 129 resize \$1; #X obj 205 108 change; #X obj 172 149 list split 3; #X obj 170 169 list prepend 0; #X connect 0 0 2 0; #X connect 2 0 6 0; #X connect 2 1 3 0; #X connect 3 1 5 0; #X connect 4 0 1 0; #X connect 5 0 4 0; #X connect 6 1 7 0; #X connect 7 0 1 0; #X restore 469 255 pd mtx2arraysend; #X floatatom 29 163 6 0 0 0 freq - -; #N canvas 0 0 450 300 (subpatch) 0; #X array signal 64 float 1; #A 0 0.350809 0.352529 0.323749 0.267889 0.188056 0.0924733 -0.0115446 -0.114268 -0.207012 -0.282098 -0.332474 -0.354627 -0.346684 -0.308276 -0.243687 -0.157757 -0.058738 0.0452786 0.146309 0.234006 0.301564 0.343327 0.355167 0.337243 0.289477 0.217643 0.126626 0.0241541 -0.0796336 -0.176431 -0.25886 -0.318325 -0.350513 -0.352816 -0.324453 -0.267944 -0.188785 -0.0933459 0.0104961 0.112465 0.206113 0.281239 0.332285 0.354519 0.346625 0.308685 0.244169 0.158802 0.0600548 -0.0446618 -0.144633 -0.233125 -0.300845 -0.343326 -0.355903 -0.337678 -0.290366 -0.218386 -0.127163 -0.0258419 0.0781731 0.176044 0.257996 0.31818; #X coords 0 2 63 -2 200 140 1; #X restore 589 -66 graph; #X obj 385 427 s spectrum; #X obj 469 278 s signal; #X msg 532 278 ylabel -2 0 -2 -1 0 1 2 \, yticks 0 0.5 2; #X obj 588 254 loadbang; #X obj 116 237 loadbang; #X obj 404 47 loadbang; #X msg 117 218 2.999; #X obj 461 113 mtx_window; #X msg 472 87 gauss 64 -85; #X connect 0 0 59 0; #X connect 1 0 59 0; #X connect 2 0 59 0; #X connect 4 0 3 0; #X connect 5 0 6 0; #X connect 6 0 7 0; #X connect 6 1 8 0; #X connect 7 0 9 0; #X connect 8 0 9 1; #X connect 9 0 29 0; #X connect 10 0 11 0; #X connect 11 0 52 0; #X connect 12 0 5 1; #X connect 13 0 59 0; #X connect 14 0 59 0; #X connect 15 0 59 0; #X connect 16 0 10 0; #X connect 16 0 30 0; #X connect 17 0 12 1; #X connect 17 0 35 0; #X connect 18 0 41 1; #X connect 19 0 20 0; #X connect 20 0 18 0; #X connect 20 0 27 0; #X connect 21 0 38 1; #X connect 22 0 23 0; #X connect 23 0 21 0; #X connect 23 0 26 0; #X connect 26 0 25 0; #X connect 27 0 28 0; #X connect 29 0 16 0; #X connect 30 0 16 1; #X connect 31 0 32 0; #X connect 32 0 52 0; #X connect 33 0 52 0; #X connect 34 0 52 0; #X connect 35 0 33 0; #X connect 35 1 34 0; #X connect 37 0 38 0; #X connect 38 0 39 0; #X connect 39 0 5 0; #X connect 39 0 49 0; #X connect 41 0 39 1; #X connect 42 0 41 0; #X connect 43 0 48 0; #X connect 43 1 47 0; #X connect 44 0 43 0; #X connect 49 0 53 0; #X connect 50 0 37 0; #X connect 54 0 53 0; #X connect 55 0 54 0; #X connect 56 0 58 0; #X connect 57 0 2 0; #X connect 58 0 50 0; #X connect 59 0 4 0; #X connect 59 0 12 0; #X connect 60 0 59 0; #X restore 616 242 pd fft_analysis; #X text 480 241 use this e.g. for:; #X connect 1 0 7 0; #X connect 6 0 1 0; #X connect 9 0 6 0; #X connect 10 0 6 0; #X connect 11 0 6 0; #X connect 12 0 6 0; #X connect 13 0 6 0; #X connect 14 0 6 0; #X connect 15 0 6 0; --- NEW FILE: mtx_window.pd --- #N canvas 0 0 839 500 10; #X obj 41 9 inlet; #N canvas 404 130 450 300 scale_-1...1 0; #X obj 126 -4 inlet; #X obj 129 274 outlet; #X obj 157 50 t f f; #X obj 157 228 mtx_linspace; #X msg 157 89 1 \$1; #X obj 157 108 /; #X msg 157 128 1 \$1; #X obj 157 148 -; #X obj 157 168 t f f; #X obj 157 187 * -1; #X obj 157 207 pack f f f; #X obj 157 70 << 1; #X msg 64 50 matrix 1 1 0; #X obj 126 21 moses 2; #X connect 0 0 13 0; #X connect 2 0 11 0; #X connect 2 1 10 2; #X connect 3 0 1 0; #X connect 4 0 5 0; #X connect 5 0 6 0; #X connect 6 0 7 0; #X connect 7 0 8 0; #X connect 8 0 9 0; #X connect 8 1 10 1; #X connect 9 0 10 0; #X connect 10 0 3 0; #X connect 11 0 4 0; #X connect 12 0 1 0; #X connect 13 0 12 0; #X connect 13 1 2 0; #X restore 48 88 pd scale_-1...1; #X obj 48 262 mtx_* 1; #N canvas 0 0 450 300 pi 0; #X obj 217 64 inlet; #X msg 217 84 1; #X obj 217 106 atan; #X obj 217 127 * 4; #X obj 217 148 outlet; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 4 0; #X restore 92 220 pd pi; #X obj 92 240 / 2; #X obj 92 200 loadbang; #X obj 48 286 mtx_cos; #X obj 48 309 mtx_.^ 2; #X obj 48 65 t f b; #X msg 90 110 0; #X obj 112 262 mtx_* 1; #N canvas 0 0 450 300 pi 0; #X obj 217 64 inlet; #X msg 217 84 1; #X obj 217 106 atan; #X obj 217 127 * 4; #X obj 217 148 outlet; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 4 0; #X restore 156 220 pd pi; #X obj 156 240 / 2; #X obj 156 200 loadbang; #X obj 112 286 mtx_cos; #X obj 87 65 t f b; #X msg 119 110 1; #X msg 151 110 2; #X obj 127 65 t f b a; #X obj 198 285 mtx_* 1; #X obj 259 265 *; #X obj 298 206 loadbang; #X msg 298 226 10; #X obj 298 246 log; #X obj 198 307 mtx_exp; #X msg 259 227 \$2; #X obj 259 246 / 20; #X obj 127 337 mtx_ones; #X msg 127 317 1 \$1; #X obj 198 261 mtx_.^ 2; #X obj 112 448 outlet; #X obj 181 65 t f b; #X msg 183 109 3; #X obj 356 265 mtx_abs; #X obj 356 285 mtx_* -1; #X obj 356 306 mtx_+ 1; #X obj 419 260 mtx_* 1; #N canvas 0 0 450 300 pi 0; #X obj 217 64 inlet; #X msg 217 84 1; #X obj 217 106 atan; #X obj 217 127 * 4; #X obj 217 148 outlet; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 4 0; #X restore 463 218 pd pi; #X obj 463 238 / 2; #X obj 463 198 loadbang; #X obj 419 284 mtx_cos; #X obj 419 307 mtx_.^ 2; #X obj 221 65 t f b; #X msg 223 109 4; #X obj 419 350 mtx_./ 1.08; #X obj 419 328 mtx_+ 0.08; #X obj 260 65 t f b; #X msg 264 109 5; #X obj 48 131 demux 0 1 2 3 4 5; #X text 24 147 hanning; #X text 62 162 sine; #X text 131 160 rect; #X text 173 161 hamming; #X obj 579 235 mtx_* 1; #N canvas 0 0 450 300 pi 0; #X obj 217 64 inlet; #X msg 217 84 1; #X obj 217 106 atan; #X obj 217 127 * 4; #X obj 217 148 outlet; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 3 0 4 0; #X restore 623 213 pd pi; #X obj 623 193 loadbang; #X obj 609 296 mtx_cos; #X text 188 150 blackman; #X obj 541 359 mtx_+ 0.42; #X obj 579 257 t a a; #X obj 609 277 mtx_* 2; #X obj 541 297 mtx_cos; #X obj 609 317 mtx_* 0.08; #X obj 541 317 mtx_* 0.5; #X obj 541 338 mtx_+; #X text 625 46 part of iemmatrix; #X text 549 412 Franz Zotter 2006; #X text 93 149 gauss; #X obj 48 32 route hanning sine gauss rectangular bartlett hamming blackman; #X connect 0 0 68 0; #X connect 1 0 48 0; #X connect 2 0 6 0; #X connect 3 0 4 0; #X connect 4 0 2 1; #X connect 5 0 3 0; #X connect 6 0 7 0; #X connect 7 0 30 0; #X connect 8 0 1 0; #X connect 8 1 9 0; #X connect 9 0 48 1; #X connect 10 0 14 0; #X connect 11 0 12 0; #X connect 12 0 10 1; #X connect 13 0 11 0; #X connect 14 0 30 0; #X connect 15 0 1 0; #X connect 15 1 16 0; #X connect 16 0 48 1; #X connect 17 0 48 1; #X connect 18 0 1 0; #X connect 18 1 17 0; #X connect 18 2 25 0; #X connect 19 0 24 0; #X connect 20 0 19 1; #X connect 21 0 22 0; #X connect 22 0 23 0; #X connect 23 0 20 1; #X connect 24 0 30 0; #X connect 25 0 26 0; #X connect 26 0 20 0; #X connect 27 0 30 0; #X connect 28 0 27 0; #X connect 29 0 19 0; #X connect 31 0 1 0; #X connect 31 1 32 0; #X connect 32 0 48 1; #X connect 33 0 34 0; #X connect 34 0 35 0; #X connect 35 0 30 0; #X connect 36 0 40 0; #X connect 37 0 38 0; #X connect 38 0 36 1; #X connect 39 0 37 0; #X connect 40 0 41 0; #X connect 41 0 45 0; #X connect 42 0 1 0; #X connect 42 1 43 0; #X connect 43 0 48 1; #X connect 44 0 30 0; #X connect 45 0 44 0; #X connect 46 0 1 0; #X connect 46 1 47 0; #X connect 47 0 48 1; #X connect 48 0 2 0; #X connect 48 1 10 0; #X connect 48 2 29 0; #X connect 48 3 33 0; #X connect 48 4 36 0; #X connect 48 5 53 0; #X connect 53 0 59 0; #X connect 54 0 53 1; #X connect 55 0 54 0; #X connect 56 0 62 0; #X connect 58 0 30 0; #X connect 59 0 61 0; #X connect 59 1 60 0; #X connect 60 0 56 0; #X connect 61 0 63 0; #X connect 62 0 64 1; #X connect 63 0 64 0; #X connect 64 0 58 0; #X connect 68 0 8 0; #X connect 68 1 15 0; #X connect 68 2 18 0; #X connect 68 3 28 0; #X connect 68 4 31 0; #X connect 68 5 42 0; #X connect 68 6 46 0;

1 0

pd/src desire.c,1.1.2.177,1.1.2.178
by Mathieu Bouchard 11 Sep '06

11 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24603 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.177 retrieving revision 1.1.2.178 diff -C2 -d -r1.1.2.177 -r1.1.2.178 *** desire.c 11 Sep 2006 06:49:42 -0000 1.1.2.177 --- desire.c 11 Sep 2006 08:18:36 -0000 1.1.2.178 *************** *** 471,475 **** if (hack) { /* only manage this canvas if it's not one of the 3 invisible builtin canvases */ gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed((t_gobj *)x,0); } } --- 471,475 ---- if (hack) { /* only manage this canvas if it's not one of the 3 invisible builtin canvases */ gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,0); } } *************** *** 2884,2888 **** canvas_readatoms(x, natoms, vec, p_nextmsg, templatesym, sc->sc_vec, nline, vec + message); if (wasvis) canvas_getcanvas(x)->mapped = 1; ! gobj_changed(&sc->sc_gobj,0); return 1; } --- 2884,2888 ---- canvas_readatoms(x, natoms, vec, p_nextmsg, templatesym, sc->sc_vec, nline, vec + message); if (wasvis) canvas_getcanvas(x)->mapped = 1; ! gobj_changed(sc,0); return 1; } *************** *** 3939,3944 **** t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (!wb) continue; ! hit = wb->w_parentclickfn(y, owner, ! data, template, sc, ap, basex + xloc, basey + yloc, xpix, ypix, shift, alt, dbl, doit); if (hit) return hit; --- 3939,3943 ---- t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (!wb) continue; ! hit = wb->w_parentclickfn(y, owner, data, template, sc, ap, basex+xloc, basey+yloc, xpix, ypix, shift, alt, dbl, doit); if (hit) return hit; *************** *** 4095,4100 **** n = x->n; for (i = 0; i < n; i++) if (x->vec[i].name == name) { ! *p_onset = i * sizeof(t_word); ! *p_type = x->vec[i].type; *p_arraytype = x->vec[i].arraytemplate; return 1; --- 4094,4099 ---- n = x->n; for (i = 0; i < n; i++) if (x->vec[i].name == name) { ! *p_onset = i*sizeof(t_word); ! *p_type = x->vec[i].type; *p_arraytype = x->vec[i].arraytemplate; return 1; *************** *** 4381,4390 **** } - static void template_setup(void) { - template_class = class_new(gensym("template"), 0, (t_method)template_free, - sizeof(t_template), CLASS_PD, 0); - class_addmethod3(pd_canvasmaker, template_usetemplate, "struct", "*"); - } - /* ---------------- gtemplates. One per canvas. ----------- */ --- 4380,4383 ---- *************** *** 4488,4498 **** } - static void gtemplate_setup(void) { - gtemplate_class = class_new(gensym("struct"), - (t_newmethod)gtemplate_new, (t_method)gtemplate_free, - sizeof(t_gtemplate), CLASS_NOINLET, A_GIMME, 0); - class_addcreator((t_newmethod)gtemplate_new_old, gensym("template"), A_GIMME, 0); - } - /* --------------- FIELD DESCRIPTORS (NOW CALLED SLOT) ---------------------- */ /* a field descriptor can hold a constant or a variable's name; in the latter case, --- 4481,4484 ---- *************** *** 4849,4863 **** } - static void curve_setup(void) { - curve_class = class_new(gensym("drawpolygon"), (t_newmethod)curve_new, - (t_method)curve_free, sizeof(t_curve), 0, A_GIMME, 0); - class_setdrawcommand(curve_class); - class_addcreator((t_newmethod)curve_new, gensym("drawcurve"), A_GIMME, 0); - class_addcreator((t_newmethod)curve_new, gensym("filledpolygon"), A_GIMME, 0); - class_addcreator((t_newmethod)curve_new, gensym("filledcurve"), A_GIMME, 0); - class_setparentwidget(curve_class, &curve_widgetbehavior); - class_addfloat(curve_class, curve_float); - } - t_class *plot_class; --- 4835,4838 ---- *************** *** 5017,5024 **** array_getcoordinate(canvas, &array->vec[i*elemsize], xonset, yonset, wonset, i, basex + xloc, basey + yloc, xinc, xslot, yslot, wslot, &xpix, &ypix, &wpix); ! if (xpix < x1) x1 = xpix; ! if (xpix > x2) x2 = xpix; ! if (ypix - wpix < y1) y1 = ypix - wpix; ! if (ypix + wpix > y2) y2 = ypix + wpix; if (scalarvis != 0) { /* check also the drawing instructions for the scalar */ --- 4992,4997 ---- array_getcoordinate(canvas, &array->vec[i*elemsize], xonset, yonset, wonset, i, basex + xloc, basey + yloc, xinc, xslot, yslot, wslot, &xpix, &ypix, &wpix); ! x1=MIN(x1,xpix); y1=MIN(y1,ypix-wpix); ! x2=MAX(x2,xpix); y2=MAX(y2,ypix+wpix); if (scalarvis != 0) { /* check also the drawing instructions for the scalar */ *************** *** 5042,5049 **** } end: ! *xp1 = x1; ! *yp1 = y1; ! *xp2 = x2; ! *yp2 = y2; } --- 5015,5020 ---- } end: ! *xp1 = x1; *yp1 = y1; ! *xp2 = x2; *yp2 = y2; } *************** *** 5231,5242 **** t_parentwidgetbehavior plot_widgetbehavior = {plot_getrect,0,0,0,plot_vis,plot_click}; - static void plot_setup(void) { - plot_class = class_new(gensym("plot"), (t_newmethod)plot_new, 0, - sizeof(t_plot), 0, A_GIMME, 0); - class_setdrawcommand(plot_class); - class_addfloat(plot_class, plot_float); - class_setparentwidget(plot_class, &plot_widgetbehavior); - } - /* ---------------- drawnumber: draw a number (or symbol) ---------------- */ /* drawnumbers draw numeric fields at controllable locations, with controllable color and label. --- 5202,5205 ---- *************** *** 5328,5336 **** } - static void drawnumber_displace(t_gobj *z, t_canvas *canvas, t_word *data, t_template *template, - float basex, float basey, int dx, int dy) { - /* refuse */ - } - static void drawnumber_vis(t_gobj *z, t_canvas *canvas, t_word *data, t_template *template, float basex, float basey, int vis) { --- 5291,5294 ---- *************** *** 5343,5349 **** char colorstring[20], buf[DRAWNUMBER_BUFSIZE]; numbertocolor(slot_getfloat(&x->color, template, data, 1), colorstring); ! if (x->flags & DRAW_SYMBOL) ! SETSYMBOL(&at, slot_getsymbol(&x->value, template, data, 0)); ! else SETFLOAT(&at, slot_getfloat( &x->value, template, data, 0)); drawnumber_sprintf(x, buf, &at); sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", --- 5301,5306 ---- char colorstring[20], buf[DRAWNUMBER_BUFSIZE]; numbertocolor(slot_getfloat(&x->color, template, data, 1), colorstring); ! if (x->flags & DRAW_SYMBOL) SETSYMBOL(&at, slot_getsymbol(&x->value, template, data, 0)); ! else SETFLOAT( &at, slot_getfloat( &x->value, template, data, 0)); drawnumber_sprintf(x, buf, &at); sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", *************** *** 5371,5378 **** t_slot *f = &x->value; dn.ycumulative -= dy; ! template_setfloat(dn.template, ! f->u.varsym, dn.wp, dn.ycumulative, 1); if (dn.scalar) scalar_redraw(dn.scalar, dn.canvas); ! if (dn.array) array_redraw(dn.array, dn.canvas); } #endif --- 5328,5334 ---- t_slot *f = &x->value; dn.ycumulative -= dy; ! template_setfloat(dn.template, f->u.varsym, dn.wp, dn.ycumulative, 1); if (dn.scalar) scalar_redraw(dn.scalar, dn.canvas); ! if (dn.array) array_redraw(dn.array, dn.canvas); } #endif *************** *** 5398,5409 **** t_parentwidgetbehavior drawnumber_widgetbehavior = { ! drawnumber_getrect,drawnumber_displace,0,0,drawnumber_vis,drawnumber_click}; static void drawnumber_free(t_drawnumber *x) {} ! static void drawnumber_setup(void) { drawnumber_class = class_new(gensym("drawnumber"), ! (t_newmethod)drawnumber_new, (t_method)drawnumber_free, ! sizeof(t_drawnumber), 0, A_GIMME, 0); class_setdrawcommand(drawnumber_class); class_addfloat(drawnumber_class, drawnumber_float); --- 5354,5386 ---- t_parentwidgetbehavior drawnumber_widgetbehavior = { ! drawnumber_getrect,0,0,0,drawnumber_vis,drawnumber_click}; static void drawnumber_free(t_drawnumber *x) {} ! static void g_template_setup(void) { ! template_class = class_new(gensym("template"), 0, (t_method)template_free, ! sizeof(t_template), CLASS_PD, 0); ! class_addmethod3(pd_canvasmaker, template_usetemplate, "struct", "*"); ! gtemplate_class = class_new(gensym("struct"), (t_newmethod)gtemplate_new, (t_method)gtemplate_free, ! sizeof(t_gtemplate), CLASS_NOINLET, A_GIMME, 0); ! class_addcreator((t_newmethod)gtemplate_new_old, gensym("template"), A_GIMME, 0); ! ! curve_class = class_new(gensym("drawpolygon"), (t_newmethod)curve_new, ! (t_method)curve_free, sizeof(t_curve), 0, A_GIMME, 0); ! class_setdrawcommand(curve_class); ! class_addcreator((t_newmethod)curve_new, gensym("drawcurve"), A_GIMME, 0); ! class_addcreator((t_newmethod)curve_new, gensym("filledpolygon"), A_GIMME, 0); ! class_addcreator((t_newmethod)curve_new, gensym("filledcurve"), A_GIMME, 0); ! class_setparentwidget(curve_class, &curve_widgetbehavior); ! class_addfloat(curve_class, curve_float); ! ! plot_class = class_new(gensym("plot"), (t_newmethod)plot_new, 0, ! sizeof(t_plot), 0, A_GIMME, 0); ! class_setdrawcommand(plot_class); ! class_addfloat(plot_class, plot_float); ! class_setparentwidget(plot_class, &plot_widgetbehavior); ! drawnumber_class = class_new(gensym("drawnumber"), ! (t_newmethod)drawnumber_new, (t_method)drawnumber_free, sizeof(t_drawnumber), 0, A_GIMME, 0); class_setdrawcommand(drawnumber_class); class_addfloat(drawnumber_class, drawnumber_float); *************** *** 5412,5423 **** } - static void g_template_setup(void) { - template_setup(); - gtemplate_setup(); - curve_setup(); - plot_setup(); - drawnumber_setup(); - } - /* ------------- gstubs and gpointers - safe pointing --------------- */ /* create a gstub which is "owned" by a canvas (gl) or an array ("a"). */ --- 5389,5392 ---- *************** *** 5555,5559 **** canvas = gs->gs_un.gs_glist; if (canvas->valid != gp->gp_valid) {pd_error(x, "next: stale pointer"); return;} ! if (wantselected && !canvas_isvisible(canvas)) {pd_error(x, "vnext: next-selected only works for a visible window"); return;} gobj = &gp->gp_un.gp_scalar->sc_gobj; if (!gobj) gobj = canvas->list; --- 5524,5528 ---- canvas = gs->gs_un.gs_glist; if (canvas->valid != gp->gp_valid) {pd_error(x, "next: stale pointer"); return;} ! if (wantselected && !canvas_isvisible(canvas)) {pd_error(x, "next: next-selected only works for a visible window"); return;} gobj = &gp->gp_un.gp_scalar->sc_gobj; if (!gobj) gobj = canvas->list; *************** *** 5599,5609 **** if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} templatesym = gpointer_gettemplatesym(&x->gp); ! for (n = x->ntypedout, to = x->typedout; n--; to++) { if (to->type == templatesym) {outlet_pointer(to->outlet, &x->gp); return;} - } outlet_pointer(x->otherout, &x->gp); } - static void ptrobj_pointer(t_ptrobj *x, t_gpointer *gp) { gpointer_unset(&x->gp); --- 5568,5576 ---- if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} templatesym = gpointer_gettemplatesym(&x->gp); ! for (n = x->ntypedout, to = x->typedout; n--; to++) if (to->type == templatesym) {outlet_pointer(to->outlet, &x->gp); return;} outlet_pointer(x->otherout, &x->gp); } static void ptrobj_pointer(t_ptrobj *x, t_gpointer *gp) { gpointer_unset(&x->gp); *************** *** 5612,5616 **** } - static void ptrobj_rewind(t_ptrobj *x) { t_canvas *canvas; --- 5579,5582 ---- *************** *** 5963,5972 **** } if (gs->gs_which == GP_GLIST) { ! if (canvas_isvisible(gs->gs_un.gs_glist)) gobj_changed((t_gobj *)(gp->gp_un.gp_scalar),0); } else { t_array *o = gs->gs_un.gs_array; while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) ! gobj_changed((t_gobj *)(o->gp.gp_un.gp_scalar),0); } } --- 5929,5937 ---- } if (gs->gs_which == GP_GLIST) { ! if (canvas_isvisible(gs->gs_un.gs_glist)) gobj_changed(gp->gp_un.gp_scalar,0); } else { t_array *o = gs->gs_un.gs_array; while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) gobj_changed(o->gp.gp_un.gp_scalar,0); } } *************** *** 6033,6037 **** if (oldsc) {sc->sc_gobj.g_next = oldsc->sc_gobj.g_next; oldsc->sc_gobj.g_next = &sc->sc_gobj;} else {sc->sc_gobj.g_next = canvas->list; canvas->list = &sc->sc_gobj;} ! gobj_changed(&sc->sc_gobj, 0); gp->gp_un.gp_scalar = sc; vec = sc->sc_vec; --- 5998,6002 ---- if (oldsc) {sc->sc_gobj.g_next = oldsc->sc_gobj.g_next; oldsc->sc_gobj.g_next = &sc->sc_gobj;} else {sc->sc_gobj.g_next = canvas->list; canvas->list = &sc->sc_gobj;} ! gobj_changed(sc,0); gp->gp_un.gp_scalar = sc; vec = sc->sc_vec; *************** *** 6100,6104 **** get_class = class_new(gensym("get"), (t_newmethod)get_new, (t_method)get_free, sizeof(t_get), 0, A_GIMME, 0); ! class_addpointer(get_class, get_pointer); set_class = class_new(gensym("set"), (t_newmethod)set_new, --- 6065,6069 ---- get_class = class_new(gensym("get"), (t_newmethod)get_new, (t_method)get_free, sizeof(t_get), 0, A_GIMME, 0); ! class_addpointer(get_class, get_pointer); set_class = class_new(gensym("set"), (t_newmethod)set_new, *************** *** 6345,6361 **** {binbuf_eval(x->m_text.te_binbuf, &x->mresp.mr_pd, argc, argv);} static void message_add2(t_message *x, t_symbol *s, int argc, t_atom *argv) ! {binbuf_add(x->m_text.te_binbuf, argc, argv); gobj_changed(x->canvas,0);} static void message_set(t_message *x, t_symbol *s, int argc, t_atom *argv) {binbuf_clear(x->m_text.te_binbuf); message_add2(x,s,argc,argv);} ! static void message_add(t_message *x, t_symbol *s, int argc, t_atom *argv) { ! binbuf_add(x->m_text.te_binbuf, argc, argv); ! binbuf_addsemi(x->m_text.te_binbuf); gobj_changed(x->canvas,0); ! } static void message_addcomma(t_message *x) ! {t_atom a; SETCOMMA(&a); binbuf_add(x->m_text.te_binbuf, 1, &a); gobj_changed(x->canvas,0);} static void message_adddollar(t_message *x, t_floatarg f) ! {t_atom a; SETDOLLAR(&a, f<0?0:f); binbuf_add(x->m_text.te_binbuf, 1, &a); gobj_changed(x->canvas,0);} static void message_adddollsym(t_message *x, t_symbol *s) ! {t_atom a; SETDOLLSYM(&a, s); binbuf_add(x->m_text.te_binbuf, 1, &a); gobj_changed(x->canvas,0);} static void message_addsemi(t_message *x) {message_add(x,0,0,0);} --- 6310,6324 ---- {binbuf_eval(x->m_text.te_binbuf, &x->mresp.mr_pd, argc, argv);} static void message_add2(t_message *x, t_symbol *s, int argc, t_atom *argv) ! {binbuf_add(x->m_text.te_binbuf, argc, argv); gobj_changed(x,0);} static void message_set(t_message *x, t_symbol *s, int argc, t_atom *argv) {binbuf_clear(x->m_text.te_binbuf); message_add2(x,s,argc,argv);} ! static void message_add(t_message *x, t_symbol *s, int argc, t_atom *argv) ! {binbuf_add(x->m_text.te_binbuf, argc, argv); binbuf_addsemi(x->m_text.te_binbuf); gobj_changed(x,0);} static void message_addcomma(t_message *x) ! {t_atom a; SETCOMMA(&a); binbuf_add(x->m_text.te_binbuf, 1, &a); gobj_changed(x,0);} static void message_adddollar(t_message *x, t_floatarg f) ! {t_atom a; SETDOLLAR(&a, f<0?0:f); binbuf_add(x->m_text.te_binbuf, 1, &a); gobj_changed(x,0);} static void message_adddollsym(t_message *x, t_symbol *s) ! {t_atom a; SETDOLLSYM(&a, s); binbuf_add(x->m_text.te_binbuf, 1, &a); gobj_changed(x,0);} static void message_addsemi(t_message *x) {message_add(x,0,0,0);}

1 0

pd/src desire.c,1.1.2.176,1.1.2.177
by Mathieu Bouchard 11 Sep '06

11 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23606 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.176 retrieving revision 1.1.2.177 diff -C2 -d -r1.1.2.176 -r1.1.2.177 *** desire.c 11 Sep 2006 05:00:42 -0000 1.1.2.176 --- desire.c 11 Sep 2006 06:49:42 -0000 1.1.2.177 *************** *** 24,27 **** --- 24,28 ---- #include "m_simd.h" #include <errno.h> + #include <math.h> #ifdef MSW *************** *** 63,66 **** --- 64,70 ---- static void postatom2(const char *s, int argc, t_atom *argv); + int imin(int a, int b) {return a<b?a:b;} + int imax(int a, int b) {return a>b?a:b;} + t_symbol *s_empty, *s_pd, *s_Pd; //-------------------------------------------------------------------------- *************** *** 371,381 **** t_symbol *ret; char *name = s->s_name; ! if (*name == '$' && name[1] >= '0' && name[1] <= '9') { t_canvasenvironment *env = canvas_getenv(x); pd_pushsym((t_pd *)x); ret = binbuf_realizedollsym(gensym(name+1), env->argc, env->argv, 1); pd_popsym((t_pd *)x); ! } ! else ret = s; return ret; } --- 375,384 ---- t_symbol *ret; char *name = s->s_name; ! if (*name == '$' && isdigit(name[1])) { t_canvasenvironment *env = canvas_getenv(x); pd_pushsym((t_pd *)x); ret = binbuf_realizedollsym(gensym(name+1), env->argc, env->argv, 1); pd_popsym((t_pd *)x); ! } else ret = s; return ret; } *************** *** 404,410 **** t_symbol *bs = canvas_makebindsym(x->name); t_symbol *Pd = gensym("Pd"); ! if (x->name==Pd) pd_unbind((t_pd *)x, bs); x->name = s; ! if (x->name==Pd) pd_bind((t_pd *)x, bs); if (dir && dir != &s_) canvas_getenv(x)->dir = dir; gobj_changed(x,0); --- 407,413 ---- t_symbol *bs = canvas_makebindsym(x->name); t_symbol *Pd = gensym("Pd"); ! if (x->name!=Pd) pd_unbind((t_pd *)x, bs); x->name = s; ! if (x->name!=Pd) pd_bind((t_pd *)x, bs); if (dir && dir != &s_) canvas_getenv(x)->dir = dir; gobj_changed(x,0); *************** *** 480,486 **** t_canvas *owner = canvas_getcurrent(); t_symbol *s = &s_; ! int vis = 0, width = CANVAS_DEFCANVASWIDTH, height = CANVAS_DEFCANVASHEIGHT; ! int xloc = 0, yloc = CANVAS_DEFCANVASYLOC; ! int font = (owner ? owner->font : sys_defaultfont); char buf[40]; canvas_init(x); --- 483,489 ---- t_canvas *owner = canvas_getcurrent(); t_symbol *s = &s_; ! int width = CANVAS_DEFCANVASWIDTH, xloc = 0; ! int height = CANVAS_DEFCANVASHEIGHT, yloc = CANVAS_DEFCANVASYLOC; ! int vis=0, font = owner?owner->font:sys_defaultfont; char buf[40]; canvas_init(x); *************** *** 512,517 **** canvas_setbounds(x, xloc, yloc, xloc + width, yloc + height); x->owner = owner; ! x->name = *s->s_name ? s : canvas_newfilename ? canvas_newfilename : gensym("Pd"); ! if (strcmp(x->name->s_name, "Pd")) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); x->loading = 1; x->goprect = 0; /* no GOP rectangle unless it's turned on later */ --- 515,520 ---- canvas_setbounds(x, xloc, yloc, xloc + width, yloc + height); x->owner = owner; ! x->name = *s->s_name ? s : canvas_newfilename ? canvas_newfilename : s_Pd; ! if (x->name != s_Pd) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); x->loading = 1; x->goprect = 0; /* no GOP rectangle unless it's turned on later */ *************** *** 575,579 **** if (x1 == x2 || y1 == y2) {x1=0; x2=100; y1=1; y2=-1;} if (px1 >= px2 || py1 >= py2) { ! px1=100; py1=20; px2=100+CANVAS_DEFGRAPHWIDTH; py2=20+CANVAS_DEFGRAPHHEIGHT; } x->name = sym; --- 578,583 ---- if (x1 == x2 || y1 == y2) {x1=0; x2=100; y1=1; y2=-1;} if (px1 >= px2 || py1 >= py2) { ! px1=100; px2=px1+CANVAS_DEFGRAPHWIDTH; ! py1=20; py2=py1+CANVAS_DEFGRAPHHEIGHT; } x->name = sym; *************** *** 582,586 **** x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; ! if (strcmp(x->name->s_name, "Pd")) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); x->owner = g; x->isgraph = 1; --- 586,590 ---- x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; ! if (x->name != s_Pd) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); x->owner = g; x->isgraph = 1; *************** *** 702,706 **** canvas_vis(x, 0); sys_mgui(x,"delete",""); ! if (strcmp(x->name->s_name, "Pd")) pd_unbind((t_pd *)x, canvas_makebindsym(x->name)); if (x->env) { freebytes(x->env->argv, x->env->argc * sizeof(t_atom)); --- 706,710 ---- canvas_vis(x, 0); sys_mgui(x,"delete",""); ! if (x->name != s_Pd) pd_unbind((t_pd *)x, canvas_makebindsym(x->name)); if (x->env) { freebytes(x->env->argv, x->env->argc * sizeof(t_atom)); *************** *** 759,764 **** if (ap->a_type == A_SYMBOL) { char *buf=ap->a_w.w_symbol->s_name, *bufp; ! if (*buf == '$' && buf[1] >= '0' && buf[1] <= '9') { ! for (bufp = buf+2; *bufp; bufp++) if (*bufp < '0' || *bufp > '9') { SETDOLLSYM(ap, gensym(buf+1)); goto didit; --- 763,768 ---- if (ap->a_type == A_SYMBOL) { char *buf=ap->a_w.w_symbol->s_name, *bufp; ! if (*buf == '$' && isdigit(buf[1])) { ! for (bufp = buf+2; *bufp; bufp++) if (!isdigit(*bufp)) { SETDOLLSYM(ap, gensym(buf+1)); goto didit; *************** *** 770,775 **** if (ap->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(canvas_getcurrent()); ! canvas_rename(x, binbuf_realizedollsym(ap->a_w.w_symbol, ! e->argc, e->argv, 1), 0); } else if (ap->a_type == A_SYMBOL) canvas_rename(x, argv[3].a_w.w_symbol, 0); --- 774,778 ---- if (ap->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(canvas_getcurrent()); ! canvas_rename(x, binbuf_realizedollsym(ap->a_w.w_symbol, e->argc, e->argv, 1), 0); } else if (ap->a_type == A_SYMBOL) canvas_rename(x, argv[3].a_w.w_symbol, 0); *************** *** 1297,1301 **** for (i = 0; i < ac; i++) { if (av[i].a_type == A_SYMBOL) { ! if (!strcmp(av[i].a_w.w_symbol->s_name, "_semi_")) SETSEMI(&av[i]); else if (!strcmp(av[i].a_w.w_symbol->s_name, "_comma_")) SETCOMMA(&av[i]); } --- 1300,1304 ---- for (i = 0; i < ac; i++) { if (av[i].a_type == A_SYMBOL) { ! if (!strcmp(av[i].a_w.w_symbol->s_name, "_semi_")) SETSEMI(&av[i]); else if (!strcmp(av[i].a_w.w_symbol->s_name, "_comma_")) SETCOMMA(&av[i]); } *************** *** 1742,1747 **** for (i = page * ARRAYPAGESIZE; (i < (page+1)*ARRAYPAGESIZE && i < a->n); i++) { yval = *(float *)(a->vec + elemsize*i + yonset); ! sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", ! x->realname->s_name, i % ARRAYPAGESIZE, i, yval); } } --- 1745,1749 ---- for (i = page * ARRAYPAGESIZE; (i < (page+1)*ARRAYPAGESIZE && i < a->n); i++) { yval = *(float *)(a->vec + elemsize*i + yonset); ! sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->realname->s_name, i%ARRAYPAGESIZE, i, yval); } } *************** *** 1752,1758 **** gfxstub_deleteforkey(x); pd_unbind(&x->x_gobj.g_pd, x->realname); ! /* LATER find a way to get #A unbound earlier (at end of load?) */ ! while ((x2 = pd_findbyclass(gensym("#A"), garray_class))) ! pd_unbind(x2, gensym("#A")); pd_free(&x->scalar->sc_gobj.g_pd); } --- 1754,1759 ---- gfxstub_deleteforkey(x); pd_unbind(&x->x_gobj.g_pd, x->realname); ! /* LATER find a way to get #A unbound earlier (at end of load?) */ ! while ((x2 = pd_findbyclass(gensym("#A"), garray_class))) pd_unbind(x2, gensym("#A")); pd_free(&x->scalar->sc_gobj.g_pd); } *************** *** 1779,1784 **** /* found "w" field which controls linewidth. */ float wval = *(float *)(elem + wonset); ! wpix = canvas_ytopixels(canvas, basey + slot_cvttocoord(yslot, yval) + ! slot_cvttocoord(wslot, wval)) - ypix; if (wpix < 0) wpix = -wpix; } else wpix = 1; --- 1780,1785 ---- /* found "w" field which controls linewidth. */ float wval = *(float *)(elem + wonset); ! wpix = canvas_ytopixels(canvas, ! basey + slot_cvttocoord(yslot,yval) + slot_cvttocoord(wslot,wval)) - ypix; if (wpix < 0) wpix = -wpix; } else wpix = 1; *************** *** 1796,1805 **** t_word *wp; t_template *template; ! int npoints; ! int elemsize; ! float initx; ! float xperpix, yperpix; ! int lastx; ! int fatten; } ammo; --- 1797,1803 ---- t_word *wp; t_template *template; ! int npoints, elemsize; ! float initx, xperpix, yperpix; ! int lastx, fatten; } ammo; *************** *** 1820,1830 **** if (ammo.fatten) { if (i == 0) { ! float newy = ywas + dy * ammo.yperpix; ! if (newy < 0) newy = 0; slot_setcoord(ammo.yfield, ammo.template, thisword, newy, 1); } ! } else { ! slot_setcoord(ammo.yfield, ammo.template, thisword, ywas + dy*ammo.yperpix, 1); ! } } } --- 1818,1825 ---- if (ammo.fatten) { if (i == 0) { ! float newy = MAX(0,ywas+dy*ammo.yperpix); slot_setcoord(ammo.yfield, ammo.template, thisword, newy, 1); } ! } else slot_setcoord(ammo.yfield, ammo.template, thisword, ywas + dy*ammo.yperpix, 1); } } *************** *** 1832,1848 **** int thisx = ammo.initx + ammo.xcumulative + 0.5, x2; int increment, i, nchange; ! float newy = ammo.ycumulative, ! oldy = slot_getcoord(ammo.yfield, ammo.template, (t_word *)(((char *)ammo.wp) + ammo.elemsize * ammo.lastx), 1); ! float ydiff = newy - oldy; ! if (thisx < 0) thisx = 0; ! else if (thisx >= ammo.npoints) thisx = ammo.npoints - 1; ! increment = (thisx > ammo.lastx ? -1 : 1); nchange = 1 + increment * (ammo.lastx - thisx); - for (i = 0, x2 = thisx; i < nchange; i++, x2 += increment) { slot_setcoord(ammo.yfield, ammo.template, (t_word *)(((char *)ammo.wp) + ammo.elemsize * x2), newy, 1); ! if (nchange > 1) newy -= ydiff * (1./(nchange - 1)); } ammo.lastx = thisx; --- 1827,1841 ---- int thisx = ammo.initx + ammo.xcumulative + 0.5, x2; int increment, i, nchange; ! float newy = ammo.ycumulative; ! float oldy = slot_getcoord(ammo.yfield, ammo.template, (t_word *)(((char *)ammo.wp) + ammo.elemsize * ammo.lastx), 1); ! float ydiff = newy-oldy; ! CLAMP(thisx,0,1); ! increment = thisx > ammo.lastx ? -1 : 1; nchange = 1 + increment * (ammo.lastx - thisx); for (i = 0, x2 = thisx; i < nchange; i++, x2 += increment) { slot_setcoord(ammo.yfield, ammo.template, (t_word *)(((char *)ammo.wp) + ammo.elemsize * x2), newy, 1); ! if (nchange > 1) newy -= ydiff/(nchange-1); } ammo.lastx = thisx; *************** *** 1890,1899 **** } - /* cursor definitions; used as return value for t_parentclickfn */ - #define CURSOR_RUNMODE_CLICKME 1 - #define CURSOR_RUNMODE_THICKEN 2 - #define CURSOR_RUNMODE_ADDPOINT 3 - #define CURSOR_EDITMODE_DISCONNECT 6 - static float canvas_pixelstox(t_canvas *x, float xpix); static float canvas_pixelstoy(t_canvas *x, float xpix); --- 1883,1886 ---- *************** *** 1918,1933 **** for (i = 0; i < array->n; i += incr) { float pxpix, pypix, pwpix, dx, dy; ! array_getcoordinate(canvas, array->vec + elemsize*i, xonset, yonset, wonset, i, xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; ! dx = pxpix-xpix; if (dx<0) dx=-dx; else if (dx>8) continue; ! dy = pypix-ypix; if (dy<0) dy=-dy; else if (dx+dy<best) best=dx+dy; if (wonset >= 0) { ! dy = pypix+pwpix-ypix; ! if (dy < 0) dy=-dy; ! if (dx+dy < best) best = dx+dy; ! dy = pypix-pwpix-ypix; ! if (dy < 0) dy=-dy; ! if (dx+dy < best) best = dx+dy; } } if (best > 8) { --- 1905,1916 ---- for (i = 0; i < array->n; i += incr) { float pxpix, pypix, pwpix, dx, dy; ! array_getcoordinate(canvas, &array->vec[elemsize*i], xonset, yonset, wonset, i, xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; ! dx = fabs(pxpix-xpix); if (dx>8) continue; ! dy = fabs(pypix-ypix); if (dx+dy<best) best=dx+dy; if (wonset >= 0) { ! dy = fabs(pypix+pwpix-ypix); if (dx+dy < best) best = dx+dy; ! dy = fabs(pypix-pwpix-ypix); if (dx+dy < best) best = dx+dy; } } if (best > 8) { *************** *** 1942,1950 **** xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; ! dx = pxpix-xpix; if (dx<0) dx=-dx; ! dy = pypix-ypix; if (dy<0) dy=-dy; if (wonset >= 0) { ! dy2 = pypix+pwpix-ypix; if (dy2<0) dy2=-dy2; ! dy3 = pypix-pwpix-ypix; if (dy3<0) dy3=-dy3; if (yonset < 0) dy = 100; } else dy2 = dy3 = 100; --- 1925,1933 ---- xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; ! dx = fabs(pxpix-xpix); ! dy = fabs(pypix-ypix); if (wonset >= 0) { ! dy2 = fabs(pypix+pwpix-ypix); ! dy3 = fabs(pypix-pwpix-ypix); if (yonset < 0) dy = 100; } else dy2 = dy3 = 100; *************** *** 1954,1958 **** else ammo.fatten = 1; if (doit) { ! char *elem = (char *)array->vec; ammo.elemsize = elemsize; ammo.canvas = canvas; --- 1937,1941 ---- else ammo.fatten = 1; if (doit) { ! char *elem = array->vec; ammo.elemsize = elemsize; ammo.canvas = canvas; *************** *** 1971,1975 **** /* add a point (after the clicked-on one) */ array_resize_and_redraw(array, array->n + 1); ! elem = (char *)array->vec; memmove(elem + elemsize * (i+1), elem + elemsize*i, (array->n-i-1) * elemsize); i++; --- 1954,1958 ---- /* add a point (after the clicked-on one) */ array_resize_and_redraw(array, array->n + 1); ! elem = array->vec; memmove(elem + elemsize * (i+1), elem + elemsize*i, (array->n-i-1) * elemsize); i++; *************** *** 2003,2010 **** /* canvas_grab(canvas, 0, array_motion, 0, xpix, ypix); */ } ! if (alt) { ! if (xpix < pxpix) return CURSOR_EDITMODE_DISCONNECT; ! else return CURSOR_RUNMODE_ADDPOINT; ! } else return ammo.fatten ? CURSOR_RUNMODE_THICKEN : CURSOR_RUNMODE_CLICKME; } } --- 1986,1990 ---- /* canvas_grab(canvas, 0, array_motion, 0, xpix, ypix); */ } ! return 0; } } *************** *** 2013,2018 **** } - #define ARRAYWRITECHUNKSIZE 1000 - static void garray_save(t_gobj *z, t_binbuf *b) { int style, filestyle; --- 1993,1996 ---- *************** *** 2036,2042 **** int n = array->n, n2 = 0; while (n2 < n) { ! int chunk = n - n2, i; ! if (chunk > ARRAYWRITECHUNKSIZE) ! chunk = ARRAYWRITECHUNKSIZE; binbuf_addv(b, "si", gensym("#A"), n2); for (i = 0; i < chunk; i++) binbuf_addv(b, "f", ((float *)array->vec)[n2+i]); --- 2014,2018 ---- int n = array->n, n2 = 0; while (n2 < n) { ! int chunk = imin(n-n2,1000), i; binbuf_addv(b, "si", gensym("#A"), n2); for (i = 0; i < chunk; i++) binbuf_addv(b, "f", ((float *)array->vec)[n2+i]); *************** *** 2079,2084 **** t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize); TEMPLATE_FLOATY(x,array,) ! for (i = 0; i < array->n; i++) ! *((float *)((char *)array->vec + elemsize*i) + yonset) = g; garray_redraw(x); } --- 2055,2059 ---- t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize); TEMPLATE_FLOATY(x,array,) ! for (i = 0; i < array->n; i++) *((float *)(array->vec + elemsize*i) + yonset) = g; garray_redraw(x); } *************** *** 2099,2103 **** if (sineflag) for (j=0, fj=phase; j<nsin; j++, fj+=phase) sum += vsin[j] * sin(fj); else for (j=0, fj= 0; j<nsin; j++, fj+=phase) sum += vsin[j] * cos(fj); ! *((float *)((array->vec + elemsize*i)) + yonset) = sum; } garray_redraw(x); --- 2074,2078 ---- if (sineflag) for (j=0, fj=phase; j<nsin; j++, fj+=phase) sum += vsin[j] * sin(fj); else for (j=0, fj= 0; j<nsin; j++, fj+=phase) sum += vsin[j] * cos(fj); ! *((float *)(array->vec + elemsize*i) + yonset) = sum; } garray_redraw(x); *************** *** 2203,2207 **** } for (i = 0; i < nelem; i++) { ! if (!fscanf(fd, "%f", ((float *)(array->vec + elemsize*i) + yonset))) { post("%s: read %d elements into table of size %d", filename->s_name, i, nelem); break; --- 2178,2182 ---- } for (i = 0; i < nelem; i++) { ! if (!fscanf(fd, "%f", (float *)(array->vec + elemsize*i) + yonset)) { post("%s: read %d elements into table of size %d", filename->s_name, i, nelem); break; *************** *** 2920,2926 **** /* check for file type */ nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); ! if (nline != 1 && vec[message].a_type != A_SYMBOL && ! strcmp(vec[message].a_w.w_symbol->s_name, "data")) ! { pd_error(x, "%s: file apparently of wrong type", filename); binbuf_free(b); --- 2895,2899 ---- /* check for file type */ nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); ! if (nline!=1 && vec[message].a_type != A_SYMBOL && strcmp(vec[message].a_w.w_symbol->s_name, "data")) { pd_error(x, "%s: file apparently of wrong type", filename); binbuf_free(b); *************** *** 4308,4314 **** /* globally conform all scalars from one template to another */ void template_conform(t_template *tfrom, t_template *tto) { ! int nto = tto->n, nfrom = tfrom->n, i, j, ! *conformaction = (int *)getbytes(sizeof(int) * nto), ! *conformedfrom = (int *)getbytes(sizeof(int) * nfrom), doit = 0; for (i=0; i< nto; i++) conformaction[i] = -1; for (i=0; i<nfrom; i++) conformedfrom[i] = 0; --- 4281,4287 ---- /* globally conform all scalars from one template to another */ void template_conform(t_template *tfrom, t_template *tto) { ! int nto = tto->n, nfrom = tfrom->n, i, j, doit = 0; ! int *conformaction = (int *)getbytes(sizeof(int) * nto); ! int *conformedfrom = (int *)getbytes(sizeof(int) * nfrom); for (i=0; i< nto; i++) conformaction[i] = -1; for (i=0; i<nfrom; i++) conformedfrom[i] = 0; *************** *** 4469,4473 **** static void *gtemplate_new(t_symbol *s, int argc, t_atom *argv) { t_symbol *sym = atom_getsymbolarg(0, argc, argv); ! if (argc >= 1) argc--; argv++; return (gtemplate_donew(canvas_makebindsym(sym), argc, argv)); } --- 4442,4446 ---- static void *gtemplate_new(t_symbol *s, int argc, t_atom *argv) { t_symbol *sym = atom_getsymbolarg(0, argc, argv); ! if (argc >= 1) {argc--; argv++;} return (gtemplate_donew(canvas_makebindsym(sym), argc, argv)); } *************** *** 4481,4485 **** warned = 1; } ! return (gtemplate_donew(sym, argc, argv)); } --- 4454,4458 ---- warned = 1; } ! return gtemplate_donew(sym, argc, argv); } *************** *** 4552,4555 **** --- 4525,4531 ---- } + float MIN(float a, float b) {return a<b?a:b;} + float MAX(float a, float b) {return a>b?a:b;} + static void slot_setfloat_var(t_slot *fd, t_symbol *s) { char *s1, *s2, *s3, strbuf[MAXPDSTRING]; *************** *** 4560,4566 **** fd->min = fd->max = fd->scrmin = fd->scrmax = fd->quantum = 0; } else { ! int cpy = s1 - s->s_name, got; ! if (cpy > MAXPDSTRING-5) ! cpy = MAXPDSTRING-5; strncpy(strbuf, s->s_name, cpy); strbuf[cpy] = 0; --- 4536,4540 ---- fd->min = fd->max = fd->scrmin = fd->scrmax = fd->quantum = 0; } else { ! int cpy = MIN(s1-s->s_name,MAXPDSTRING-5), got; strncpy(strbuf, s->s_name, cpy); strbuf[cpy] = 0; *************** *** 4736,4742 **** /* -------------------- widget behavior for curve ------------ */ ! static void curve_getrect(t_gobj *z, t_canvas *canvas, ! t_word *data, t_template *template, float basex, float basey, ! int *xp1, int *yp1, int *xp2, int *yp2) { t_curve *x = (t_curve *)z; int i, n = x->npoints; --- 4710,4715 ---- /* -------------------- widget behavior for curve ------------ */ ! static void curve_getrect(t_gobj *z, t_canvas *canvas, t_word *data, t_template *template, ! float basex, float basey, int *xp1, int *yp1, int *xp2, int *yp2) { t_curve *x = (t_curve *)z; int i, n = x->npoints; *************** *** 4751,4780 **** int xloc = canvas_xtopixels(canvas, basex + slot_getcoord(f , template, data, 0)); int yloc = canvas_ytopixels(canvas, basey + slot_getcoord(f+1, template, data, 0)); ! if (xloc < x1) x1 = xloc; ! if (xloc > x2) x2 = xloc; ! if (yloc < y1) y1 = yloc; ! if (yloc > y2) y2 = yloc; } ! *xp1 = x1; ! *yp1 = y1; ! *xp2 = x2; ! *yp2 = y2; } ! /* 0 to 9 in 5 steps */ ! static int rangecolor(int n) { ! int n2 = n/2; /* 0 to 4 */ ! int ret = (n2 << 6); /* 0 to 256 in 5 steps */ ! if (ret > 255) ret = 255; ! return ret; ! } static void numbertocolor(int n, char *s) { ! int red, blue, green; ! if (n < 0) n = 0; ! red = n / 100; ! blue = ((n / 10) % 10); ! green = n % 10; ! sprintf(s, "#%2.2x%2.2x%2.2x", rangecolor(red), rangecolor(blue), rangecolor(green)); } --- 4724,4741 ---- int xloc = canvas_xtopixels(canvas, basex + slot_getcoord(f , template, data, 0)); int yloc = canvas_ytopixels(canvas, basey + slot_getcoord(f+1, template, data, 0)); ! x1=imin(x1,xloc); y1=imin(y1,yloc); ! x2=imax(x2,xloc); y2=imax(y2,yloc); } ! *xp1 = x1; *yp1 = y1; ! *xp2 = x2; *yp2 = y2; } ! /* this seems dumb */ ! //static int rangecolor(int n) {return min((n/2)<<6,255);} ! static int rangecolor(int n) {return n*9/255;} static void numbertocolor(int n, char *s) { ! n = MAX(n,0); ! sprintf(s, "#%2.2x%2.2x%2.2x", rangecolor(n/100), rangecolor((n/10)%10), rangecolor(n%10)); } *************** *** 4788,4798 **** if (n > 1) { int flags = x->flags; - float width = slot_getfloat(&x->width, template, data, 1); char outline[20], fill[20]; int pix[200]; if (n > 100) n = 100; ! /* calculate the pixel values before we start printing ! out the TK message so that "error" printout won't be ! interspersed with it. Only show up to 100 points so we don't have to allocate memory here. */ for (i = 0, f = x->vec; i < n; i++, f += 2) { --- 4749,4757 ---- if (n > 1) { int flags = x->flags; char outline[20], fill[20]; int pix[200]; if (n > 100) n = 100; ! /* calculate the pixel values before we start printing out the TK message so that ! "error" printout won't be interspersed with it. Only show up to 100 points so we don't have to allocate memory here. */ for (i = 0, f = x->vec; i < n; i++, f += 2) { *************** *** 4800,4804 **** pix[2*i+1] = canvas_ytopixels(canvas, basey + slot_getcoord(f+1, template, data, 1)); } - if (width < 1) width = 1; numbertocolor(slot_getfloat(&x->outlinecolor, template, data, 1), outline); if (flags & CLOSED) { --- 4759,4762 ---- *************** *** 4807,4811 **** } else sys_vgui(".x%lx.c create line\\\n", (long)canvas_getcanvas(canvas)); for (i = 0; i < n; i++) sys_vgui("%d %d\\\n", pix[2*i], pix[2*i+1]); ! sys_vgui("-width %f\\\n", width); if (flags & CLOSED) sys_vgui("-fill %s -outline %s\\\n", fill, outline); else sys_vgui("-fill %s\\\n", outline); --- 4765,4769 ---- } else sys_vgui(".x%lx.c create line\\\n", (long)canvas_getcanvas(canvas)); for (i = 0; i < n; i++) sys_vgui("%d %d\\\n", pix[2*i], pix[2*i+1]); ! sys_vgui("-width %f\\\n", MAX(slot_getfloat(&x->width, template, data, 1),1)); if (flags & CLOSED) sys_vgui("-fill %s -outline %s\\\n", fill, outline); else sys_vgui("-fill %s\\\n", outline); *************** *** 6248,6253 **** } t_nbx; - t_symbol *s_empty; - typedef struct t_foo { int argc; t_atom *argv; t_binbuf *b; } t_foo; static int pd_pickle(t_foo *foo, char *fmt, ...); --- 6206,6209 ---- *************** *** 6591,6597 **** /* special case: if pd args change just pass the message on. */ if (natom1 >= 1 && natom2 >= 1 && ! vec1[0].a_type == A_SYMBOL && !strcmp(vec1[0].a_w.w_symbol->s_name, "pd") && ! vec2[0].a_type == A_SYMBOL && !strcmp(vec2[0].a_w.w_symbol->s_name, "pd")) { ! typedmess(&x->te_pd, gensym("rename"), natom2-1, vec2+1); binbuf_free(x->te_binbuf); x->te_binbuf = b; --- 6547,6553 ---- /* special case: if pd args change just pass the message on. */ if (natom1 >= 1 && natom2 >= 1 && ! vec1[0].a_type == A_SYMBOL && vec1[0].a_w.w_symbol == s_pd && ! vec2[0].a_type == A_SYMBOL && vec2[0].a_w.w_symbol == s_pd) { ! typedmess((t_pd *)x, gensym("rename"), natom2-1, vec2+1); binbuf_free(x->te_binbuf); x->te_binbuf = b; *************** *** 6987,6991 **** static void iemgui_subclass (t_class *c) { - s_empty = gensym("empty"); class_addmethod3(c, iemgui_delta, "delta","*"); class_addmethod3(c, iemgui_pos, "pos","*"); --- 6943,6946 ---- *************** *** 7962,7965 **** --- 7917,7923 ---- void desire_setup(void) { + s_empty = gensym("empty"); + s_Pd = gensym("Pd"); + s_pd = gensym("pd"); manager_class = class_new(gensym("__manager"), (t_newmethod)manager_new, (t_method)manager_free, sizeof(t_manager), CLASS_GOBJ, A_GIMME, 0);

1 0

pd/src desire.c,1.1.2.175,1.1.2.176
by Mathieu Bouchard 11 Sep '06

11 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16336 Modified Files: Tag: devel_0_39 desire.c Log Message: clean clean. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.175 retrieving revision 1.1.2.176 diff -C2 -d -r1.1.2.175 -r1.1.2.176 *** desire.c 9 Sep 2006 02:36:45 -0000 1.1.2.175 --- desire.c 11 Sep 2006 05:00:42 -0000 1.1.2.176 *************** *** 402,408 **** static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { ! if (strcmp(x->name->s_name, "Pd")) pd_unbind((t_pd *)x, canvas_makebindsym(x->name)); x->name = s; ! if (strcmp(x->name->s_name, "Pd")) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); if (dir && dir != &s_) canvas_getenv(x)->dir = dir; gobj_changed(x,0); --- 402,410 ---- static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { ! t_symbol *bs = canvas_makebindsym(x->name); ! t_symbol *Pd = gensym("Pd"); ! if (x->name==Pd) pd_unbind((t_pd *)x, bs); x->name = s; ! if (x->name==Pd) pd_bind((t_pd *)x, bs); if (dir && dir != &s_) canvas_getenv(x)->dir = dir; gobj_changed(x,0); *************** *** 939,943 **** t_dspcontext *ugen_start_graph(int toplevel, t_signal **sp, int ninlets, int noutlets); void ugen_add(t_dspcontext *dc, t_object *x); ! void ugen_connect(t_dspcontext *dc, t_object *x1, int outno, t_object *x2, int inno); void ugen_done_graph(t_dspcontext *dc); --- 941,945 ---- t_dspcontext *ugen_start_graph(int toplevel, t_signal **sp, int ninlets, int noutlets); void ugen_add(t_dspcontext *dc, t_object *x); ! void ugen_connect(t_dspcontext *dc, t_object *from, int outlet, t_object *to, int inlet); void ugen_done_graph(t_dspcontext *dc); *************** *** 1379,1385 **** } - static int paste_onset; - static t_canvas *paste_canvas; - extern t_class *text_class; --- 1381,1384 ---- *************** *** 1387,1413 **** return pd_class((t_pd *)x)==text_class && x->te_type==T_OBJECT;} ! void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutno, t_floatarg fwhoin, t_floatarg finno) { ! int whoout = fwhoout, outno = foutno, whoin = fwhoin, inno = finno; ! t_gobj *src = 0, *sink = 0; t_object *from, *to; t_outconnect *oc; ! int nin = whoin, nout = whoout; ! if (paste_canvas == x) whoout += paste_onset, whoin += paste_onset; ! for (src = x->list; whoout; src = src->g_next, whoout--) if (! src->g_next) goto bad; ! for (sink = x->list; whoin; sink = sink->g_next, whoin--) if (!sink->g_next) goto bad; ! from = pd_checkobject(&src->g_pd); ! to = pd_checkobject(&sink->g_pd); if (!from || !to) goto bad; /* if object creation failed, make dummy inlets or outlets as needed */ ! if (is_dummy(from)) while (outno >= obj_noutlets(from)) outlet_new(from, &s_); ! if (is_dummy(to)) while ( inno >= obj_ninlets(to)) inlet_new(to, &to->ob_pd, &s_, &s_); gobj_changed(x,0); ! if (!(oc = obj_connect(from, outno, to, inno))) goto bad; newest = (t_pd *)oc; return; bad: ! post("%s %d %d %d %d (%s->%s) connection failed", x->name->s_name, nout, outno, nin, inno, ! (src ? class_getname(pd_class(&src->g_pd)) : "???"), ! (sink? class_getname(pd_class(&sink->g_pd)) : "???")); } --- 1386,1410 ---- return pd_class((t_pd *)x)==text_class && x->te_type==T_OBJECT;} ! void canvas_connect(t_canvas *x, t_floatarg fwhoout, t_floatarg foutlet, t_floatarg fwhoin,t_floatarg finlet) { ! int i, ifrom=fwhoout, outlet=foutlet, ito=fwhoin, inlet=finlet; ! t_gobj *gfrom=0, *gto=0; t_object *from, *to; t_outconnect *oc; ! for (i=ifrom, gfrom=x->list; i; gfrom=gfrom->g_next, i--) if (!gfrom->g_next) goto bad; ! for (i=ito, gto =x->list; i; gto =gto ->g_next, i--) if (!gto ->g_next) goto bad; ! from = pd_checkobject((t_pd *)gfrom); ! to = pd_checkobject( (t_pd *)gto); if (!from || !to) goto bad; /* if object creation failed, make dummy inlets or outlets as needed */ ! if (is_dummy(from)) while (outlet >= obj_noutlets(from)) outlet_new(from, &s_); ! if (is_dummy(to)) while ( inlet >= obj_ninlets(to)) inlet_new(to, &to->ob_pd, &s_, &s_); gobj_changed(x,0); ! if (!(oc = obj_connect(from,outlet,to,inlet))) goto bad; newest = (t_pd *)oc; return; bad: ! post("%s %d %d %d %d (%s->%s) connection failed", x->name->s_name, from,outlet,to,inlet, ! from ? class_getname(pd_class((t_pd *)from)) : "???", ! to ? class_getname(pd_class((t_pd *)to )) : "???"); } *************** *** 1444,1448 **** x->gp = *parent; x->stub = gstub_new(0, x); ! word_init((t_word *)(x->vec), template, parent); return x; } --- 1441,1445 ---- x->gp = *parent; x->stub = gstub_new(0, x); ! word_init((t_word *)x->vec, template, parent); return x; } *************** *** 1883,1893 **** for (i = 0, xsum = 0; i < array->n; i += incr) { float usexloc, useyloc; ! if (xonset >= 0) ! usexloc = xloc + slot_cvttocoord(xfield, ! *(float *)(((char *)(array->vec) + elemsize*i) + xonset)); else usexloc = xloc + xsum, xsum += xinc; ! useyloc = yloc + (yonset >= 0 ? slot_cvttocoord(yfield, ! *(float *)(((char *)(array->vec) + elemsize*i) + yonset)) : 0); ! hit = scalar_doclick((t_word *)((char *)(array->vec) + elemsize*i), elemtemplate, 0, array, canvas, usexloc, useyloc, xpix, ypix, shift, alt, dbl, doit); if (hit) return hit; --- 1880,1887 ---- for (i = 0, xsum = 0; i < array->n; i += incr) { float usexloc, useyloc; ! if (xonset>=0) usexloc = xloc + slot_cvttocoord(xfield, *(float *)&array->vec[elemsize*i+xonset]); else usexloc = xloc + xsum, xsum += xinc; ! useyloc = yloc + (yonset>=0 ? slot_cvttocoord(yfield, *(float *)&array->vec[elemsize*i+yonset]):0); ! hit = scalar_doclick((t_word *)&array->vec[elemsize*i], elemtemplate, 0, array, canvas, usexloc, useyloc, xpix, ypix, shift, alt, dbl, doit); if (hit) return hit; *************** *** 1924,1930 **** for (i = 0; i < array->n; i += incr) { float pxpix, pypix, pwpix, dx, dy; ! array_getcoordinate(canvas, (char *)(array->vec) + elemsize*i, ! xonset, yonset, wonset, i, xloc, yloc, xinc, ! xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; dx = pxpix-xpix; if (dx<0) dx=-dx; else if (dx>8) continue; --- 1918,1923 ---- for (i = 0; i < array->n; i += incr) { float pxpix, pypix, pwpix, dx, dy; ! array_getcoordinate(canvas, array->vec + elemsize*i, xonset, yonset, wonset, i, ! xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; dx = pxpix-xpix; if (dx<0) dx=-dx; else if (dx>8) continue; *************** *** 1946,1951 **** for (i = 0; i < array->n; i += incr) { float pxpix, pypix, pwpix, dx, dy, dy2, dy3; ! array_getcoordinate(canvas, (char *)(array->vec) + elemsize*i, ! xonset, yonset, wonset, i, xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; dx = pxpix-xpix; if (dx<0) dx=-dx; --- 1939,1944 ---- for (i = 0; i < array->n; i += incr) { float pxpix, pypix, pwpix, dx, dy, dy2, dy3; ! array_getcoordinate(canvas, &array->vec[elemsize*i], xonset, yonset, wonset, i, ! xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); if (pwpix < 4) pwpix = 4; dx = pxpix-xpix; if (dx<0) dx=-dx; *************** *** 1971,1976 **** if (alt && xpix < pxpix) { /* delete a point */ if (array->n <= 1) return 0; ! memmove((char *)(array->vec) + elemsize*i, ! (char *)(array->vec) + elemsize*(i+1), (array->n-1-i) * elemsize); array_resize_and_redraw(array, array->n - 1); return 0; --- 1964,1969 ---- if (alt && xpix < pxpix) { /* delete a point */ if (array->n <= 1) return 0; ! memmove(&array->vec[elemsize*i], ! &array->vec[elemsize*(i+1)], (array->n-1-i) * elemsize); array_resize_and_redraw(array, array->n - 1); return 0; *************** *** 2047,2051 **** chunk = ARRAYWRITECHUNKSIZE; binbuf_addv(b, "si", gensym("#A"), n2); ! for (i = 0; i < chunk; i++) binbuf_addv(b, "f", ((float *)(array->vec))[n2+i]); binbuf_addv(b, ";"); n2 += chunk; --- 2040,2044 ---- chunk = ARRAYWRITECHUNKSIZE; binbuf_addv(b, "si", gensym("#A"), n2); ! for (i = 0; i < chunk; i++) binbuf_addv(b, "f", ((float *)array->vec)[n2+i]); binbuf_addv(b, ";"); n2 += chunk; *************** *** 2059,2064 **** /* those three required by d_array.c */ void garray_usedindsp(t_garray *x) {x->usedindsp = 1;} ! int garray_npoints(t_garray *x) {return garray_getarray(x)->n;} /* get the length */ ! char *garray_vec(t_garray *x) {return (char *)(garray_getarray(x)->vec);} /* get the contents */ /* routine that checks if we're just an array of floats and if so returns the goods */ --- 2052,2057 ---- /* those three required by d_array.c */ void garray_usedindsp(t_garray *x) {x->usedindsp = 1;} ! int garray_npoints(t_garray *x) {return garray_getarray(x)->n;} /* get the length */ ! char *garray_vec(t_garray *x) {return (char *)garray_getarray(x)->vec;} /* get the contents */ /* routine that checks if we're just an array of floats and if so returns the goods */ *************** *** 2871,2875 **** if (!nline) break; array_resize(a, nitems + 1); ! element = (t_word *)(((char *)a->vec) + nitems * elemsize); canvas_readatoms(x, natoms, vec, p_nextmsg, arraytemplatesym, element, nline, vec + message); --- 2864,2868 ---- if (!nline) break; array_resize(a, nitems + 1); ! element = (t_word *)&a->vec[nitems*elemsize]; canvas_readatoms(x, natoms, vec, p_nextmsg, arraytemplatesym, element, nline, vec + message); *************** *** 3097,3101 **** t_symbol *arraytemplatesym = template->vec[i].arraytemplate; for (j = 0; j < nitems; j++) ! canvas_writescalar(arraytemplatesym, (t_word *)(((char *)a->vec) + elemsize*j), b, 1); binbuf_addsemi(b); } else if (template->vec[i].type == DT_LIST) { --- 3090,3094 ---- t_symbol *arraytemplatesym = template->vec[i].arraytemplate; for (j = 0; j < nitems; j++) ! canvas_writescalar(arraytemplatesym, (t_word *)&a->vec[elemsize*j], b, 1); binbuf_addsemi(b); } else if (template->vec[i].type == DT_LIST) { *************** *** 3130,3134 **** for (j = 0; j < nitems; j++) canvas_addtemplatesforscalar(arraytemplatesym, ! (t_word *)(((char *)a->vec) + elemsize * j), p_ntemplates, p_templatevec); } else if (ds->type == DT_LIST) canvas_addtemplatesforlist(w->w_list->list, p_ntemplates, p_templatevec); --- 3123,3127 ---- for (j = 0; j < nitems; j++) canvas_addtemplatesforscalar(arraytemplatesym, ! (t_word *)&a->vec[elemsize*j], p_ntemplates, p_templatevec); } else if (ds->type == DT_LIST) canvas_addtemplatesforlist(w->w_list->list, p_ntemplates, p_templatevec); *************** *** 5064,5068 **** t_gobj *y; /* get the coords of the point proper */ ! array_getcoordinate(canvas, (char *)(array->vec) + i*elemsize, xonset, yonset, wonset, i, basex + xloc, basey + yloc, xinc, xslot, yslot, wslot, &xpix, &ypix, &wpix); if (xpix < x1) x1 = xpix; --- 5057,5061 ---- t_gobj *y; /* get the coords of the point proper */ ! array_getcoordinate(canvas, &array->vec[i*elemsize], xonset, yonset, wonset, i, basex + xloc, basey + yloc, xinc, xslot, yslot, wslot, &xpix, &ypix, &wpix); if (xpix < x1) x1 = xpix; *************** *** 5073,5080 **** /* check also the drawing instructions for the scalar */ if (xonset >= 0) ! usexloc = basex + xloc + slot_cvttocoord(xslot, ! *(float *)(((char *)(array->vec) + elemsize*i) + xonset)); else usexloc = basex + xsum, xsum += xinc; ! yval = yonset>=0 ? *(float *)(((char *)(array->vec) + elemsize*i) + yonset) : 0; useyloc = basey + yloc + slot_cvttocoord(yslot, yval); canvas_each(y,elemtemplatecanvas) { --- 5066,5072 ---- /* check also the drawing instructions for the scalar */ if (xonset >= 0) ! usexloc = basex + xloc + slot_cvttocoord(xslot, *(float *)&array->vec[elemsize*i+xonset]); else usexloc = basex + xsum, xsum += xinc; ! yval = yonset>=0 ? *(float *)&array->vec[elemsize*i+yonset] : 0; useyloc = basey + yloc + slot_cvttocoord(yslot, yval); canvas_each(y,elemtemplatecanvas) { *************** *** 5884,5888 **** if (indx < 0) indx = 0; if (indx >= nitems) indx = nitems-1; ! gpointer_setarray(&x->gp, array, (t_word *)((char *)(array->vec) + indx * elemsize)); outlet_pointer(x->o.ob_outlet, &x->gp); } --- 5876,5880 ---- if (indx < 0) indx = 0; if (indx >= nitems) indx = nitems-1; ! gpointer_setarray(&x->gp, array, (t_word *)&array->vec[indx*elemsize]); outlet_pointer(x->o.ob_outlet, &x->gp); } *************** *** 6005,6009 **** array->n = newsize; if (newsize > nitems) { ! char *newelem = ((char *)array->vec) + nitems * elemsize; int nnew = newsize - nitems; while (nnew--) { --- 5997,6001 ---- array->n = newsize; if (newsize > nitems) { ! char *newelem = &array->vec[nitems*elemsize]; int nnew = newsize - nitems; while (nnew--) {

1 0

pd/src desire.h,1.1.2.37,1.1.2.38
by Mathieu Bouchard 10 Sep '06

10 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20027 Modified Files: Tag: devel_0_39 desire.h Log Message: missing from previous commits... sorry! Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.37 retrieving revision 1.1.2.38 diff -C2 -d -r1.1.2.37 -r1.1.2.38 *** desire.h 9 Sep 2006 00:50:49 -0000 1.1.2.37 --- desire.h 10 Sep 2006 14:28:38 -0000 1.1.2.38 *************** *** 63,68 **** EXTERN_STRUCT _canvasenvironment; #define t_canvasenvironment struct _canvasenvironment ! EXTERN_STRUCT _fielddesc; ! #define t_fielddesc struct _fielddesc /* the t_tick structure describes where to draw x and y "ticks" for a canvas */ --- 63,68 ---- EXTERN_STRUCT _canvasenvironment; #define t_canvasenvironment struct _canvasenvironment ! EXTERN_STRUCT _slot; ! #define t_slot struct _slot /* the t_tick structure describes where to draw x and y "ticks" for a canvas */

1 0

pd/src desire.c,1.1.2.174,1.1.2.175
by Mathieu Bouchard 09 Sep '06

09 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16828 Modified Files: Tag: devel_0_39 desire.c Log Message: renamed t_fielddesc to t_slot Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.174 retrieving revision 1.1.2.175 diff -C2 -d -r1.1.2.174 -r1.1.2.175 *** desire.c 9 Sep 2006 01:56:31 -0000 1.1.2.174 --- desire.c 9 Sep 2006 02:36:45 -0000 1.1.2.175 *************** *** 1035,1041 **** /******************* redrawing data *********************/ ! static t_float fielddesc_getcoord(t_fielddesc *f, t_template *, t_word *wp, int loud); ! static void fielddesc_setcoord(t_fielddesc *f, t_template *, t_word *wp, float pix, int loud); ! static t_float fielddesc_cvttocoord(t_fielddesc *f, float val); static t_template *template_new(t_symbol *sym, int argc, t_atom *argv); static void template_free(t_template *x); --- 1035,1041 ---- /******************* redrawing data *********************/ [...1454 lines suppressed...] dn.canvas = canvas; --- 5433,5437 ---- drawnumber_getrect(z, canvas, data, template, basex, basey, &x1, &y1, &x2, &y2); if (xpix >= x1 && xpix <= x2 && ypix >= y1 && ypix <= y2 ! && x->value.var && slot_getfloat(&x->vis, template, data, 0)) { if (doit) { dn.canvas = canvas; *************** *** 5470,5474 **** dn.scalar = sc; dn.array = ap; ! dn.ycumulative = fielddesc_getfloat(&x->value, template, data, 0); /* canvas_grab(canvas, z, drawnumber_motion, 0, xpix, ypix); */ } --- 5440,5444 ---- dn.scalar = sc; dn.array = ap; ! dn.ycumulative = slot_getfloat(&x->value, template, data, 0); /* canvas_grab(canvas, z, drawnumber_motion, 0, xpix, ypix); */ }

1 0

pd/src desire.c,1.1.2.173,1.1.2.174
by Mathieu Bouchard 09 Sep '06

09 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2376 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.173 retrieving revision 1.1.2.174 diff -C2 -d -r1.1.2.173 -r1.1.2.174 *** desire.c 9 Sep 2006 00:49:33 -0000 1.1.2.173 --- desire.c 9 Sep 2006 01:56:31 -0000 1.1.2.174 *************** *** 1864,1870 **** static int array_getfields(t_symbol *elemtemplatesym, t_canvas **elemtemplatecanvasp, ! t_template **elemtemplatep, int *elemsizep, ! t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, ! int *xonsetp, int *yonsetp, int *wonsetp); /* try clicking on an element of the array as a scalar (if clicking --- 1864,1870 ---- static int array_getfields(t_symbol *elemtemplatesym, t_canvas **elemtemplatecanvasp, ! t_template **elemtemplatep, int *elemsizep, ! t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, ! int *xonsetp, int *yonsetp, int *wonsetp); /* try clicking on an element of the array as a scalar (if clicking *************** *** 2622,2625 **** --- 2622,2627 ---- t_symbol *garray_getname(t_garray *x); + #define FONT "-*-courier-bold--normal--%d-*" + /* don't remove this code yet: has to be rewritten in tcl */ static void graph_vis(t_gobj *gr, int vis) { *************** *** 2657,2662 **** int ymin = y1<y2 ? y1 : y2; t_symbol *s = garray_getname((t_garray *)g); ! sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw\ ! -font -*-courier-bold--normal--%d-* -tags %s\n", (long)c, x1, ymin, s->s_name, sys_hostfontsize(canvas_getfont(x)), tag); } --- 2659,2663 ---- int ymin = y1<y2 ? y1 : y2; t_symbol *s = garray_getname((t_garray *)g); ! sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw -font "FONT" -tags %s\n", (long)c, x1, ymin, s->s_name, sys_hostfontsize(canvas_getfont(x)), tag); } *************** *** 2702,2711 **** /* draw x labels */ for (i = 0; i < x->nxlabels; i++) ! sys_vgui(".x%lx.c create text %d %d -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n", (long)c, (int)canvas_xtopixels(x, atof(x->xlabel[i]->s_name)), (int)canvas_ytopixels(x, x->xlabely), x->xlabel[i]->s_name, canvas_getfont(x), tag); /* draw y labels */ for (i = 0; i < x->nylabels; i++) ! sys_vgui(".x%lx.c create text %d %d -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n", (long)c, (int)canvas_xtopixels(x, x->ylabelx), (int)canvas_ytopixels(x, atof(x->ylabel[i]->s_name)), x->ylabel[i]->s_name, --- 2703,2712 ---- /* draw x labels */ for (i = 0; i < x->nxlabels; i++) ! sys_vgui(".x%lx.c create text %d %d -text {%s} -font "FONT" -tags %s\n", (long)c, (int)canvas_xtopixels(x, atof(x->xlabel[i]->s_name)), (int)canvas_ytopixels(x, x->xlabely), x->xlabel[i]->s_name, canvas_getfont(x), tag); /* draw y labels */ for (i = 0; i < x->nylabels; i++) ! sys_vgui(".x%lx.c create text %d %d -text {%s} -font "FONT" -tags %s\n", (long)c, (int)canvas_xtopixels(x, x->ylabelx), (int)canvas_ytopixels(x, atof(x->ylabel[i]->s_name)), x->ylabel[i]->s_name, *************** *** 4145,4178 **** } static t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; t_symbol *arraytype; float val = 0; ! if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { ! if (type == DT_FLOAT) val = *(t_float *)(((char *)wp) + onset); ! else if (loud) pd_error(x,"%s.%s: not a number", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); ! return val; } static t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; t_symbol *arraytype; t_symbol *val = &s_; ! if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { ! if (type == DT_SYMBOL) val = *(t_symbol **)(((char *)wp) + onset); ! else if (loud) pd_error(x,"%s.%s: not a symbol", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); ! return val; } static void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud) { int onset, type; t_symbol *arraytype; ! if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { ! if (type == DT_FLOAT) *(t_float *)(((char *)wp) + onset) = f; ! else if (loud) pd_error(x,"%s.%s: not a number", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); } static void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud) { int onset, type; t_symbol *arraytype; ! if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { ! if (type == DT_SYMBOL) *(t_symbol **)(((char *)wp) + onset) = s; ! else if (loud) pd_error(x,"%s.%s: not a symbol", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); } /* stringent check to see if a "saved" template, x2, matches the current --- 4146,4177 ---- } + #define ERR(msg,ret) do {\ + if (loud) pd_error(x,"%s.%s: "msg, x->sym->s_name, fieldname->s_name);\ + return ret;} while(0); static t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; t_symbol *arraytype; ! if (!template_find_field(x, fieldname, &onset, &type, &arraytype)) ERR("no such field",0); ! if (type != DT_FLOAT) ERR("not a number",0); ! return *(t_float *)(((char *)wp) + onset); } static t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; t_symbol *arraytype; ! if (!template_find_field(x, fieldname, &onset, &type, &arraytype)) ERR("no such field",&s_); ! if (type != DT_SYMBOL) ERR("not a symbol",&s_); ! return *(t_symbol **)(((char *)wp) + onset); } static void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud) { int onset, type; t_symbol *arraytype; ! if (!template_find_field(x, fieldname, &onset, &type, &arraytype)) ERR("no such field",); ! if (type != DT_FLOAT) ERR("not a number",); ! *(t_float *)(((char *)wp) + onset) = f; } static void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud) { int onset, type; t_symbol *arraytype; ! if (!template_find_field(x, fieldname, &onset, &type, &arraytype)) ERR("no such field",); ! if (type != DT_SYMBOL) ERR("not a symbol",); ! *(t_symbol **)(((char *)wp) + onset) = s; } + #undef ERR /* stringent check to see if a "saved" template, x2, matches the current *************** *** 4182,4194 **** int i; if (x1->n < x2->n) return 0; ! for (i = x2->n; i < x1->n; i++) { if (x1->vec[i].type == DT_ARRAY || x1->vec[i].type == DT_LIST) return 0; - } if (x2->n > x1->n) post("add elements..."); ! for (i = 0; i < x2->n; i++) ! if (!dataslot_matches(&x1->vec[i], &x2->vec[i], 1)) ! return 0; return 1; } --- 4181,4190 ---- int i; if (x1->n < x2->n) return 0; ! for (i = x2->n; i < x1->n; i++) if (x1->vec[i].type == DT_ARRAY || x1->vec[i].type == DT_LIST) return 0; if (x2->n > x1->n) post("add elements..."); ! for (i = 0; i < x2->n; i++) if (!dataslot_matches(&x1->vec[i], &x2->vec[i], 1)) return 0; return 1; } *************** *** 4225,4229 **** t_gpointer gp; t_template *scalartemplate; - /* post("conform scalar"); */ /* possibly replace the scalar */ if (scfrom->sc_template == tfrom->sym) { --- 4221,4224 ---- *************** *** 4252,4256 **** nobug: ; } - /* burn the old one */ pd_free(&scfrom->sc_gobj.g_pd); scalartemplate = tto; --- 4247,4250 ---- *************** *** 4279,4283 **** /* the array elements must all be conformed */ int oldelemsize = sizeof(t_word) * tfrom->n, ! newelemsize = sizeof(t_word) * tto->n; char *newarray = (char *)getbytes(newelemsize * a->n); char *oldarray = a->vec; --- 4273,4277 ---- /* the array elements must all be conformed */ int oldelemsize = sizeof(t_word) * tfrom->n, ! newelemsize = sizeof(t_word) * tto->n; char *newarray = (char *)getbytes(newelemsize * a->n); char *oldarray = a->vec; *************** *** 4286,4291 **** t_word *wp = (t_word *)(newarray + newelemsize * i); word_init(wp, tto, &a->gp); ! template_conformwords(tfrom, tto, conformaction, ! (t_word *)(oldarray + oldelemsize * i), wp); word_free((t_word *)(oldarray + oldelemsize * i), tfrom); } --- 4280,4284 ---- t_word *wp = (t_word *)(newarray + newelemsize * i); word_init(wp, tto, &a->gp); ! template_conformwords(tfrom, tto, conformaction, (t_word *)(oldarray + oldelemsize * i), wp); word_free((t_word *)(oldarray + oldelemsize * i), tfrom); } *************** *** 5003,5017 **** t_array *array; ! /* find the data and verify it's an array */ if (x->data.type != A_ARRAY || !x->data.var) { ! error("plot: needs an array field"); return -1; } if (!template_find_field(ownertemplate, x->data.u.varsym, &arrayonset, &type, &elemtemplatesym)) { ! error("plot: %s: no such field", x->data.u.varsym->s_name); return -1; } if (type != DT_ARRAY) { ! error("plot: %s: not an array", x->data.u.varsym->s_name); return -1; } --- 4996,5010 ---- t_array *array; ! /* find the data and verify it's an array */ if (x->data.type != A_ARRAY || !x->data.var) { ! pd_error(x,"needs an array field"); return -1; } if (!template_find_field(ownertemplate, x->data.u.varsym, &arrayonset, &type, &elemtemplatesym)) { ! pd_error(x,"%s: no such field", x->data.u.varsym->s_name); return -1; } if (type != DT_ARRAY) { ! pd_error(x,"%s: not an array", x->data.u.varsym->s_name); return -1; } *************** *** 5038,5042 **** t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, int *xonsetp, int *yonsetp, int *wonsetp) { ! int elemsize, yonset, wonset, xonset, type; t_template *elemtemplate; t_symbol *dummy, *varname; --- 5031,5035 ---- t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, int *xonsetp, int *yonsetp, int *wonsetp) { ! int type; t_template *elemtemplate; t_symbol *dummy, *varname; *************** *** 5046,5071 **** template_findbyname is hardwired to return a predefined template. */ if (!(elemtemplate = template_findbyname(elemtemplatesym))) { ! error("plot: %s: no such template", elemtemplatesym->s_name); return -1; } if (!(elemtemplatesym==&s_float || (elemtemplatecanvas = template_findcanvas(elemtemplate)))) { ! error("plot: %s: no canvas for this template", elemtemplatesym->s_name); return -1; } - elemsize = elemtemplate->n * sizeof(t_word); - varname = yfielddesc && yfielddesc->var ? yfielddesc->u.varsym : gensym("y"); - varname = xfielddesc && xfielddesc->var ? xfielddesc->u.varsym : gensym("x"); - varname = wfielddesc && wfielddesc->var ? wfielddesc->u.varsym : gensym("w"); - if (!template_find_field(elemtemplate,varname,&yonset,&type,&dummy) || type!=DT_FLOAT) yonset=-1; - if (!template_find_field(elemtemplate,varname,&xonset,&type,&dummy) || type!=DT_FLOAT) xonset=-1; - if (!template_find_field(elemtemplate,varname,&wonset,&type,&dummy) || type!=DT_FLOAT) wonset=-1; - - /* fill in slots for return values */ *elemtemplatecanvasp = elemtemplatecanvas; *elemtemplatep = elemtemplate; ! *elemsizep = elemsize; ! *xonsetp = xonset; ! *yonsetp = yonset; ! *wonsetp = wonset; return 0; } --- 5039,5060 ---- template_findbyname is hardwired to return a predefined template. */ if (!(elemtemplate = template_findbyname(elemtemplatesym))) { ! error("%s: no such template", elemtemplatesym->s_name); return -1; } if (!(elemtemplatesym==&s_float || (elemtemplatecanvas = template_findcanvas(elemtemplate)))) { ! error("%s: no canvas for this template", elemtemplatesym->s_name); return -1; } *elemtemplatecanvasp = elemtemplatecanvas; *elemtemplatep = elemtemplate; ! *elemsizep = elemtemplate->n * sizeof(t_word); ! ! #define FOO(f,name,onset) \ ! varname = f && f->var ? f->u.varsym : gensym(name); \ ! if (!template_find_field(elemtemplate,varname,&onset,&type,&dummy) || type!=DT_FLOAT) onset=-1; ! FOO(yfielddesc,"y",*yonsetp) ! FOO(xfielddesc,"x",*xonsetp) ! FOO(wfielddesc,"w",*wonsetp) ! #undef FOO return 0; } *************** *** 5190,5198 **** numbertocolor(fielddesc_getfloat(&x->outlinecolor, template, data, 1), outline); if (wonset >= 0) { ! /* found "w" field which controls linewidth. The trace is ! a filled polygon with 2n points. */ sys_vgui(".x%lx.c create polygon \\\n", (long)canvas_getcanvas(canvas)); for (i = 0, xsum = xloc; i < nelem; i++) { ! if (xonset >= 0) usexloc = xloc + *(float *)((elem + elemsize * i) + xonset); else usexloc = xsum, xsum += xinc; if (yonset >= 0) yval = *(float *)((elem + elemsize * i) + yonset); else yval = 0; wval = *(float *)((elem + elemsize * i) + wonset); --- 5179,5187 ---- numbertocolor(fielddesc_getfloat(&x->outlinecolor, template, data, 1), outline); if (wonset >= 0) { ! /* found "w" field which controls linewidth. The trace is a filled polygon with 2n points. */ sys_vgui(".x%lx.c create polygon \\\n", (long)canvas_getcanvas(canvas)); for (i = 0, xsum = xloc; i < nelem; i++) { ! if (xonset >= 0) usexloc = xloc + *(float *)((elem + elemsize * i) + xonset); ! else usexloc = xsum, xsum += xinc; if (yonset >= 0) yval = *(float *)((elem + elemsize * i) + yonset); else yval = 0; wval = *(float *)((elem + elemsize * i) + wonset); *************** *** 5211,5215 **** for (i = nelem-1; i >= 0; i--) { float usexloc; ! if (xonset >= 0) usexloc = xloc + *(float *)((elem + elemsize * i) + xonset); else xsum -= xinc, usexloc = xsum; if (yonset >= 0) yval = *(float *)((elem + elemsize * i) + yonset); else yval = 0; wval = *(float *)((elem + elemsize * i) + wonset); --- 5200,5205 ---- for (i = nelem-1; i >= 0; i--) { float usexloc; ! if (xonset >= 0) usexloc = xloc + *(float *)((elem + elemsize * i) + xonset); ! else xsum -= xinc, usexloc = xsum; if (yonset >= 0) yval = *(float *)((elem + elemsize * i) + yonset); else yval = 0; wval = *(float *)((elem + elemsize * i) + wonset); *************** *** 5238,5244 **** sys_vgui("-tags plot%lx\n", (long)data); } else if (linewidth > 0) { ! /* no "w" field. If the linewidth is positive, draw a ! segmented line with the requested width; otherwise don't ! draw the trace at all. */ sys_vgui(".x%lx.c create line \\\n", (long)canvas_getcanvas(canvas)); for (xsum = xloc, i = 0; i < nelem; i++) { --- 5228,5233 ---- sys_vgui("-tags plot%lx\n", (long)data); } else if (linewidth > 0) { ! /* no "w" field. If the linewidth is positive, draw a segmented line with the ! requested width; otherwise don't draw the trace at all. */ sys_vgui(".x%lx.c create line \\\n", (long)canvas_getcanvas(canvas)); for (xsum = xloc, i = 0; i < nelem; i++) { *************** *** 5265,5271 **** } } ! /* We're done with the outline; now draw all the points. ! This code is inefficient since the template has to be ! searched for drawing instructions for every last point. */ if (scalarvis != 0) { int xsum = xloc; --- 5254,5259 ---- } } ! /* We're done with the outline; now draw all the points. This code is inefficient since ! the template has to be searched for drawing instructions for every last point. */ if (scalarvis != 0) { int xsum = xloc; *************** *** 5365,5371 **** if (argc) fielddesc_setsymbolarg( &x->value,argc--,argv++); else fielddesc_setsymbol_const(&x->value,&s_); ! } else { ! FIELDSET(float,value, 0); ! } FIELDSET(float,xloc,0); FIELDSET(float,yloc,0); --- 5353,5357 ---- if (argc) fielddesc_setsymbolarg( &x->value,argc--,argv++); else fielddesc_setsymbol_const(&x->value,&s_); ! } else FIELDSET(float,value, 0); FIELDSET(float,xloc,0); FIELDSET(float,yloc,0); *************** *** 5443,5448 **** sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", (long)canvas_getcanvas(canvas), xloc, yloc, colorstring, buf); ! sys_vgui(" -font -*-courier-bold--normal--%d-*", ! sys_hostfontsize(canvas_getfont(canvas))); sys_vgui(" -tags drawnumber%lx\n", (long)data); } else sys_vgui(".x%lx.c delete drawnumber%lx\n", (long)canvas_getcanvas(canvas), (long)data); --- 5429,5433 ---- sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", (long)canvas_getcanvas(canvas), xloc, yloc, colorstring, buf); ! sys_vgui(" -font "FONT, sys_hostfontsize(canvas_getfont(canvas))); sys_vgui(" -tags drawnumber%lx\n", (long)data); } else sys_vgui(".x%lx.c delete drawnumber%lx\n", (long)canvas_getcanvas(canvas), (long)data); *************** *** 5584,5601 **** static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x) { ! t_gstub *gs = gp->gp_stub; ! if (gs) gstub_dis(gs); ! gp->gp_stub = gs = canvas->stub; ! gp->gp_valid = canvas->valid; ! gp->gp_un.gp_scalar = x; ! gs->gs_refcount++; } static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w) { ! t_gstub *gs = gp->gp_stub; ! if (gs) gstub_dis(gs); ! gp->gp_stub = gs = array->stub; ! gp->gp_valid = array->valid; ! gp->gp_un.gp_w = w; ! gs->gs_refcount++; } --- 5569,5578 ---- static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x) { ! t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=canvas->stub; gp->gp_valid = canvas->valid; gp->gp_un.gp_scalar = x; gs->gs_refcount++; } static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w) { ! t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=array->stub; gp->gp_valid = array->valid; gp->gp_un.gp_w = w; gs->gs_refcount++; } *************** *** 5644,5648 **** t_canvas *canvas = (t_canvas *)pd_findbyclass(s, canvas_class); if (canvas) gpointer_setcanvas(&x->gp, canvas, 0); ! else pd_error(x, "pointer: list '%s' not found", s->s_name); } --- 5621,5625 ---- t_canvas *canvas = (t_canvas *)pd_findbyclass(s, canvas_class); if (canvas) gpointer_setcanvas(&x->gp, canvas, 0); ! else pd_error(x, "list '%s' not found", s->s_name); } *************** *** 5652,5656 **** t_gstub *gs = gp->gp_stub; t_canvas *canvas; ! int wantselected = (f != 0); if (!gs) {pd_error(x, "next: no current pointer"); return;} --- 5629,5633 ---- t_gstub *gs = gp->gp_stub; t_canvas *canvas; ! int wantselected = f!=0; if (!gs) {pd_error(x, "next: no current pointer"); return;}

1 0

pd/src desire.h,1.1.2.36,1.1.2.37
by Mathieu Bouchard 09 Sep '06

09 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10260 Modified Files: Tag: devel_0_39 desire.h Log Message: template stuff is now a private interface until I figure out what to do with it. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.36 retrieving revision 1.1.2.37 diff -C2 -d -r1.1.2.36 -r1.1.2.37 *** desire.h 8 Sep 2006 20:59:04 -0000 1.1.2.36 --- desire.h 9 Sep 2006 00:50:49 -0000 1.1.2.37 *************** *** 236,260 **** EXTERN void word_free(t_word *wp, t_template *tmpl); EXTERN void scalar_redraw(t_scalar *x, t_canvas *canvas); - EXTERN t_template *template_new(t_symbol *sym, int argc, t_atom *argv); - EXTERN void template_free(t_template *x); - EXTERN int template_match(t_template *x1, t_template *x2); - EXTERN int template_find_field(t_template *x, t_symbol *name, int *p_onset, - int *p_type, t_symbol **p_arraytype); - EXTERN t_float template_getfloat( t_template *x, t_symbol *fieldname, t_word *wp, int loud); - EXTERN void template_setfloat( t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); - EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); - EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); - EXTERN t_template *gtemplate_get(t_gtemplate *x); - EXTERN t_template *template_findbyname(t_symbol *s); - EXTERN t_canvas *template_findcanvas(t_template *tmpl); - EXTERN void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv); - EXTERN t_float template_getfloat( t_template *x, t_symbol *fieldname, t_word *wp, int loud); - EXTERN void template_setfloat( t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); - EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); - EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); - EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *, t_word *wp, int loud); - EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *, t_word *wp, float pix, int loud); - EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); - EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord); //EXTERN int pd_pickle(t_foo *foo, char *fmt, ...); --- 236,239 ----

1 0

pd/src desire.c,1.1.2.171,1.1.2.172
by Mathieu Bouchard 09 Sep '06

09 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1507 Modified Files: Tag: devel_0_39 desire.c Log Message: improved error messages and stuff Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.171 retrieving revision 1.1.2.172 diff -C2 -d -r1.1.2.171 -r1.1.2.172 *** desire.c 8 Sep 2006 20:59:03 -0000 1.1.2.171 --- desire.c 9 Sep 2006 00:26:38 -0000 1.1.2.172 *************** *** 775,780 **** canvas_pop(x, x->willvis); z = gensym("#X")->s_thing; ! if (!z) error("canvas_restore: out of context"); ! else if (*z != canvas_class) error("canvas_restore: wasn't a canvas"); else { t_canvas *x2 = (t_canvas *)z; --- 775,780 ---- canvas_pop(x, x->willvis); z = gensym("#X")->s_thing; ! if (!z) pd_error(x,"canvas_restore: out of context"); ! else if (*z != canvas_class) pd_error(x,"canvas_restore: wasn't a canvas"); else { t_canvas *x2 = (t_canvas *)z; *************** *** 1035,1038 **** --- 1035,1054 ---- /******************* redrawing data *********************/ + static t_float fielddesc_getcoord(t_fielddesc *f, t_template *, t_word *wp, int loud); + static void fielddesc_setcoord(t_fielddesc *f, t_template *, t_word *wp, float pix, int loud); + static t_float fielddesc_cvttocoord(t_fielddesc *f, float val); + static t_template *template_new(t_symbol *sym, int argc, t_atom *argv); + static void template_free(t_template *x); + static int template_match(t_template *x1, t_template *x2); + static int template_find_field(t_template *x, t_symbol*name, int*p_onset, int*p_type, t_symbol **p_arraytype); + static t_float template_getfloat( t_template *x, t_symbol *fieldname, t_word *wp, int loud); + static void template_setfloat( t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud); + static t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); + static void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); + static t_template *gtemplate_get(t_gtemplate *x); + static t_template *template_findbyname(t_symbol *s); + static t_canvas *template_findcanvas(t_template *tmpl); + static void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv); + static void canvas_redraw(t_canvas *x); *************** *** 1548,1556 **** TEMPLATE_CHECK(x,sc->sc_template,0) if (!template_find_field(template, gensym("z"), &zonset, &ztype, &zarraytype)) { ! error("array: template %s has no 'z' field", sc->sc_template->s_name); return 0; } if (ztype != DT_ARRAY) { ! error("array: template %s, 'z' field is not an array", sc->sc_template->s_name); return 0; } --- 1564,1572 ---- TEMPLATE_CHECK(x,sc->sc_template,0) if (!template_find_field(template, gensym("z"), &zonset, &ztype, &zarraytype)) { ! pd_error(x,"template %s has no 'z' field", sc->sc_template->s_name); return 0; } if (ztype != DT_ARRAY) { ! pd_error(x,"template %s, 'z' field is not an array", sc->sc_template->s_name); return 0; } *************** *** 1604,1608 **** int style = filestyle == 0 ? PLOTSTYLE_POLY : filestyle == 1 ? PLOTSTYLE_POINTS : filestyle; if (templateargsym != &s_float) { ! error("array %s: only 'float' type understood", templateargsym->s_name); return 0; } --- 1620,1624 ---- int style = filestyle == 0 ? PLOTSTYLE_POLY : filestyle == 1 ? PLOTSTYLE_POINTS : filestyle; if (templateargsym != &s_float) { ! pd_error(x,"%s: only 'float' type understood", templateargsym->s_name); return 0; } *************** *** 1610,1622 **** TEMPLATE_CHECK(gl,templatesym,0) if (!template_find_field(template, gensym("z"), &zonset, &ztype, &zarraytype)) { ! error("array: template %s has no 'z' field", templatesym->s_name); return 0; } if (ztype != DT_ARRAY) { ! error("array: template %s, 'z' field is not an array", templatesym->s_name); return 0; } if (!(ztemplate = template_findbyname(zarraytype))) { ! error("array: no template of type %s", zarraytype->s_name); return 0; } --- 1626,1638 ---- TEMPLATE_CHECK(gl,templatesym,0) if (!template_find_field(template, gensym("z"), &zonset, &ztype, &zarraytype)) { ! pd_error(x,"template %s has no 'z' field", templatesym->s_name); return 0; } if (ztype != DT_ARRAY) { ! pd_error(x,"template %s, 'z' field is not an array", templatesym->s_name); return 0; } if (!(ztemplate = template_findbyname(zarraytype))) { ! pd_error(x,"no template of type %s", zarraytype->s_name); return 0; } *************** *** 1676,1680 **** if (!a) {pd_error(x, "can't find array"); return;} if (!(scalartemplate = template_findbyname(x->scalar->sc_template))) { ! error("array: no template of type %s", x->scalar->sc_template->s_name); return; } --- 1692,1696 ---- if (!a) {pd_error(x, "can't find array"); return;} if (!(scalartemplate = template_findbyname(x->scalar->sc_template))) { ! pd_error(x,"no template of type %s", x->scalar->sc_template->s_name); return; } *************** *** 1704,1708 **** char cmdbuf[200]; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); ! if (!a) { /* FIXME */ error("error in garray_arrayviewlist_new()");} x->listviewing = 1; sprintf(cmdbuf, "pdtk_array_listview_new %%s %s %d\n", x->realname->s_name, 0); --- 1720,1724 ---- char cmdbuf[200]; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); ! if (!a) { /* FIXME */ pd_error(x,"error in garray_arrayviewlist_new()");} x->listviewing = 1; sprintf(cmdbuf, "pdtk_array_listview_new %%s %s %d\n", x->realname->s_name, 0); *************** *** 1718,1722 **** float yval; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); ! if (!a) error("error in garray_arrayviewlist_new()"); if (page < 0) { page = 0; --- 1734,1738 ---- float yval; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); ! if (!a) pd_error(x,"error in garray_arrayviewlist_new()"); if (page < 0) { page = 0; *************** *** 2022,2030 **** if (x->scalar->sc_template != gensym("pd-_float_array")) { /* LATER "save" the scalar as such */ ! pd_error(x, "can't save arrays of type %s yet", x->scalar->sc_template->s_name); return; } if (!(scalartemplate = template_findbyname(x->scalar->sc_template))) { ! error("array: no template of type %s", x->scalar->sc_template->s_name); return; } --- 2038,2046 ---- if (x->scalar->sc_template != gensym("pd-_float_array")) { /* LATER "save" the scalar as such */ ! pd_error(x,"can't save arrays of type %s yet", x->scalar->sc_template->s_name); return; } if (!(scalartemplate = template_findbyname(x->scalar->sc_template))) { ! pd_error(x,"no template of type %s", x->scalar->sc_template->s_name); return; } *************** *** 2061,2065 **** TEMPLATE_FLOATY(x,a,0) if (elemsize != sizeof(t_word)) { ! error("%s: has more than one field", x->realname); return 0; } --- 2077,2081 ---- TEMPLATE_FLOATY(x,a,0) if (elemsize != sizeof(t_word)) { ! pd_error(x,"%s: has more than one field", x->realname); return 0; } *************** *** 2199,2203 **** if ((filedesc = open_via_path(canvas_getdir(canvas_getcanvas(x->canvas))->s_name, filename->s_name, "", buf, &bufptr, MAXPDSTRING, 0)) < 0 || !(fd = fdopen(filedesc, "r"))) { ! error("%s: can't open", filename->s_name); return; } --- 2215,2219 ---- if ((filedesc = open_via_path(canvas_getdir(canvas_getcanvas(x->canvas))->s_name, filename->s_name, "", buf, &bufptr, MAXPDSTRING, 0)) < 0 || !(fd = fdopen(filedesc, "r"))) { ! pd_error(x,"%s: can't open", filename->s_name); return; } *************** *** 2842,2846 **** t_template *template = template_findbyname(templatesym); if (!template) { ! error("%s: no such template", templatesym->s_name); *p_nextmsg = natoms; return; --- 2858,2862 ---- t_template *template = template_findbyname(templatesym); if (!template) { ! pd_error(x,"%s: no such template", templatesym->s_name); *p_nextmsg = natoms; return; *************** *** 2855,2859 **** t_template *arraytemplate = template_findbyname(arraytemplatesym); if (!arraytemplate) { ! error("%s: no such template", arraytemplatesym->s_name); } else while (1) { --- 2871,2875 ---- t_template *arraytemplate = template_findbyname(arraytemplatesym); if (!arraytemplate) { ! pd_error(x,"%s: no such template", arraytemplatesym->s_name); } else while (1) { *************** *** 2893,2897 **** *p_nextmsg = nextmsg + 1; if (!(template = template_findbyname(templatesym))) { ! error("canvas_read: %s: no such template", templatesym->s_name); *p_nextmsg = natoms; return 0; --- 2909,2913 ---- *p_nextmsg = nextmsg + 1; if (!(template = template_findbyname(templatesym))) { ! pd_error(x,"canvas_read: %s: no such template", templatesym->s_name); *p_nextmsg = natoms; return 0; *************** *** 2899,2903 **** sc = scalar_new(x, templatesym); if (!sc) { ! error("couldn't create scalar \"%s\"", templatesym->s_name); *p_nextmsg = natoms; return 0; --- 2915,2919 ---- sc = scalar_new(x, templatesym); if (!sc) { ! pd_error(x,"couldn't create scalar \"%s\"", templatesym->s_name); *p_nextmsg = natoms; return 0; *************** *** 2956,2965 **** t_freebytes(templateargs, sizeof (*templateargs) * ntemplateargs); if (!(existtemplate = template_findbyname(templatesym))) { ! error("%s: template not found in current patch", templatesym->s_name); template_free(newtemplate); return; } if (!template_match(existtemplate, newtemplate)) { ! error("%s: template doesn't match current one", templatesym->s_name); template_free(newtemplate); return; --- 2972,2981 ---- t_freebytes(templateargs, sizeof (*templateargs) * ntemplateargs); if (!(existtemplate = template_findbyname(templatesym))) { ! pd_error(x,"%s: template not found in current patch", templatesym->s_name); template_free(newtemplate); return; } if (!template_match(existtemplate, newtemplate)) { ! pd_error(x,"%s: template doesn't match current one", templatesym->s_name); template_free(newtemplate); return; *************** *** 2976,2980 **** int cr = 0; if (!strcmp(format->s_name, "cr")) cr = 1; ! else if (*format->s_name) error("canvas_read: unknown flag: %s", format->s_name); if (binbuf_read_via_path(b, filename->s_name, canvas_getdir(canvas)->s_name, cr)) { --- 2992,2996 ---- int cr = 0; if (!strcmp(format->s_name, "cr")) cr = 1; ! else if (*format->s_name) pd_error(x,"canvas_read: unknown flag: %s", format->s_name); if (binbuf_read_via_path(b, filename->s_name, canvas_getdir(canvas)->s_name, cr)) { *************** *** 3019,3023 **** } } ! if (!newone) error("couldn't update properties (perhaps a format problem?)"); else if (!oldone) bug("data_properties: couldn't find old element"); else { --- 3035,3039 ---- } } ! if (!newone) pd_error(x,"couldn't update properties (perhaps a format problem?)"); else if (!oldone) bug("data_properties: couldn't find old element"); else { *************** *** 3182,3189 **** canvas_makefilename(canvas, filename->s_name, buf, MAXPDSTRING); if (!strcmp(format->s_name, "cr")) cr = 1; ! else if (*format->s_name) error("qlist_read: unknown flag: %s", format->s_name); b = canvas_writetobinbuf(x, 1); if (b) { ! if (binbuf_write(b, buf, "", cr)) error("%s: write failed", filename->s_name); binbuf_free(b); } --- 3198,3205 ---- canvas_makefilename(canvas, filename->s_name, buf, MAXPDSTRING); if (!strcmp(format->s_name, "cr")) cr = 1; ! else if (*format->s_name) pd_error(x,"canvas_write: unknown flag: %s", format->s_name); b = canvas_writetobinbuf(x, 1); if (b) { ! if (binbuf_write(b, buf, "", cr)) pd_error(x,"%s: write failed", filename->s_name); binbuf_free(b); } *************** *** 4071,4075 **** /* -- templates, the active ingredient in gtemplates defined below. ------- */ ! t_template *template_new(t_symbol *templatesym, int argc, t_atom *argv) { t_template *x = (t_template *)pd_new(template_class); x->n = 0; --- 4087,4091 ---- /* -- templates, the active ingredient in gtemplates defined below. ------- */ ! static t_template *template_new(t_symbol *templatesym, int argc, t_atom *argv) { t_template *x = (t_template *)pd_new(template_class); x->n = 0; *************** *** 4129,4173 **** } ! t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; ! t_symbol *arraytype; ! float val = 0; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_FLOAT) val = *(t_float *)(((char *)wp) + onset); ! else if (loud) error("%s.%s: not a number", x->sym->s_name, fieldname->s_name); ! } ! else if (loud) error("%s.%s: no such field", x->sym->s_name, fieldname->s_name); return val; } ! ! t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; ! t_symbol *arraytype; ! t_symbol *val = &s_; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_SYMBOL) val = *(t_symbol **)(((char *)wp) + onset); ! else if (loud) error("%s.%s: not a symbol", x->sym->s_name, fieldname->s_name); ! } ! else if (loud) error("%s.%s: no such field", x->sym->s_name, fieldname->s_name); return val; } ! void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud) { ! int onset, type; ! t_symbol *arraytype; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_FLOAT) *(t_float *)(((char *)wp) + onset) = f; ! else if (loud) error("%s.%s: not a number", x->sym->s_name, fieldname->s_name); ! } ! else if (loud) error("%s.%s: no such field", x->sym->s_name, fieldname->s_name); } ! ! void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud) { ! int onset, type; ! t_symbol *arraytype; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_SYMBOL) *(t_symbol **)(((char *)wp) + onset) = s; ! else if (loud) error("%s.%s: not a symbol", x->sym->s_name, fieldname->s_name); ! } ! else if (loud) error("%s.%s: no such field", x->sym->s_name, fieldname->s_name); } --- 4145,4177 ---- } ! static t_float template_getfloat(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; t_symbol *arraytype; float val = 0; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_FLOAT) val = *(t_float *)(((char *)wp) + onset); ! else if (loud) pd_error(x,"%s.%s: not a number", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); return val; } ! static t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud) { ! int onset, type; t_symbol *arraytype; t_symbol *val = &s_; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_SYMBOL) val = *(t_symbol **)(((char *)wp) + onset); ! else if (loud) pd_error(x,"%s.%s: not a symbol", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); return val; } ! static void template_setfloat(t_template *x, t_symbol *fieldname, t_word *wp, t_float f, int loud) { ! int onset, type; t_symbol *arraytype; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_FLOAT) *(t_float *)(((char *)wp) + onset) = f; ! else if (loud) pd_error(x,"%s.%s: not a number", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); } ! static void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud) { ! int onset, type; t_symbol *arraytype; if (template_find_field(x, fieldname, &onset, &type, &arraytype)) { if (type == DT_SYMBOL) *(t_symbol **)(((char *)wp) + onset) = s; ! else if (loud) pd_error(x,"%s.%s: not a symbol", x->sym->s_name, fieldname->s_name); ! } else if (loud) pd_error(x,"%s.%s: no such field", x->sym->s_name, fieldname->s_name); } *************** *** 4175,4179 **** one (x1). It's OK if x1 has additional scalar elements but not (yet) arrays or lists. This is used for reading in "data files". */ ! int template_match(t_template *x1, t_template *x2) { int i; if (x1->n < x2->n) return 0; --- 4179,4183 ---- one (x1). It's OK if x1 has additional scalar elements but not (yet) arrays or lists. This is used for reading in "data files". */ ! static int template_match(t_template *x1, t_template *x2) { int i; if (x1->n < x2->n) return 0; *************** *** 4199,4203 **** LATER deal with graphics updates too... */ ! /* conform the word vector of a scalar to the new template */ static void template_conformwords(t_template *tfrom, t_template *tto, int *conformaction, t_word *wfrom, t_word *wto) { --- 4203,4207 ---- LATER deal with graphics updates too... */ ! /* conform the word vector of a scalar to the new template */ static void template_conformwords(t_template *tfrom, t_template *tto, int *conformaction, t_word *wfrom, t_word *wto) { *************** *** 4214,4218 **** } ! /* conform a scalar, recursively conforming sublists and arrays */ static t_scalar *template_conformscalar(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas, t_scalar *scfrom) { --- 4218,4222 ---- } ! /* conform a scalar, recursively conforming sublists and arrays */ static t_scalar *template_conformscalar(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas, t_scalar *scfrom) { *************** *** 4409,4413 **** if (!template_match(x, y)) { /* Are there "struct" objects upholding this template? */ if (x->t_list) { ! error("%s: template mismatch", templatesym->s_name); } else { template_conform(x, y); --- 4413,4417 ---- if (!template_match(x, y)) { /* Are there "struct" objects upholding this template? */ if (x->t_list) { ! pd_error(x,"%s: template mismatch", templatesym->s_name); } else { template_conform(x, y); *************** *** 4612,4616 **** else fielddesc_setfloat_const(fd, argv->a_w.w_float); } - static void fielddesc_setsymbolarg(t_fielddesc *fd, int argc, t_atom *argv) { if (argc <= 0) fielddesc_setsymbol_const(fd, &s_); --- 4616,4619 ---- *************** *** 4620,4627 **** fd->u.varsym = argv->a_w.w_symbol; fd->min = fd->max = fd->scrmin = fd->scrmax = fd->quantum = 0; ! } ! else fielddesc_setsymbol_const(fd, &s_); } - static void fielddesc_setarrayarg(t_fielddesc *fd, int argc, t_atom *argv) { if (argc <= 0) fielddesc_setfloat_const(fd, 0); --- 4623,4628 ---- fd->u.varsym = argv->a_w.w_symbol; fd->min = fd->max = fd->scrmin = fd->scrmax = fd->quantum = 0; ! } else fielddesc_setsymbol_const(fd, &s_); } static void fielddesc_setarrayarg(t_fielddesc *fd, int argc, t_atom *argv) { if (argc <= 0) fielddesc_setfloat_const(fd, 0); *************** *** 4635,4646 **** /* getting and setting values via fielddescs -- note confusing names; the above are setting up the fielddesc itself. */ - static t_float fielddesc_getfloat(t_fielddesc *f, t_template *template, t_word *wp, int loud) { - if (f->type!=A_FLOAT) {if (loud) error("symbolic data field used as number"); return 0;} - if (f->var) return template_getfloat(template, f->u.varsym, wp, loud); - return f->u.f; - } ! /* convert a variable's value to a screen coordinate via its fielddesc */ ! t_float fielddesc_cvttocoord(t_fielddesc *f, float val) { float coord, extreme, div; if (f->max == f->min) return val; --- 4636,4642 ---- /* getting and setting values via fielddescs -- note confusing names; the above are setting up the fielddesc itself. */ ! /* convert a variable's value to a screen coordinate via its fielddesc */ ! static t_float fielddesc_cvttocoord(t_fielddesc *f, float val) { float coord, extreme, div; if (f->max == f->min) return val; *************** *** 4652,4662 **** } ! /* read a variable via fielddesc and convert to screen coordinate */ ! t_float fielddesc_getcoord(t_fielddesc *f, t_template *template, t_word *wp, int loud) { if (f->type!=A_FLOAT) {if (loud) error("symbolic data field used as number"); return 0;} if (f->var) return fielddesc_cvttocoord(f, template_getfloat(template, f->u.varsym, wp, loud)); return f->u.f; } ! static t_symbol *fielddesc_getsymbol(t_fielddesc *f, t_template *template, t_word *wp, int loud) { if (f->type!=A_SYMBOL) {if (loud) error("numeric data field used as symbol"); return &s_;} --- 4648,4662 ---- } ! /* read a variable via fielddesc and convert to screen coordinate */ ! static t_float fielddesc_getcoord(t_fielddesc *f, t_template *template, t_word *wp, int loud) { if (f->type!=A_FLOAT) {if (loud) error("symbolic data field used as number"); return 0;} if (f->var) return fielddesc_cvttocoord(f, template_getfloat(template, f->u.varsym, wp, loud)); return f->u.f; } ! static t_float fielddesc_getfloat(t_fielddesc *f, t_template *template, t_word *wp, int loud) { ! if (f->type!=A_FLOAT) {if (loud) error("symbolic data field used as number"); return 0;} ! if (f->var) return template_getfloat(template, f->u.varsym, wp, loud); ! return f->u.f; ! } static t_symbol *fielddesc_getsymbol(t_fielddesc *f, t_template *template, t_word *wp, int loud) { if (f->type!=A_SYMBOL) {if (loud) error("numeric data field used as symbol"); return &s_;} *************** *** 4665,4684 **** } ! /* convert from a screen coordinate to a variable value */ ! float fielddesc_cvtfromcoord(t_fielddesc *f, float coord) { ! float val; ! if (f->scrmax == f->scrmin) val = coord; else { float div = (f->max - f->min)/(f->scrmax - f->scrmin); float extreme; ! val = f->min + (coord - f->scrmin) * div; if (f->quantum != 0) val = ((int)((val/f->quantum) + 0.5)) * f->quantum; ! extreme = (f->min < f->max ? f->min : f->max); if (val<extreme) val=extreme; ! extreme = (f->min > f->max ? f->min : f->max); if (val>extreme) val=extreme; } - return val; } ! void fielddesc_setcoord(t_fielddesc *f, t_template *template, t_word *wp, float coord, int loud) { if (f->type == A_FLOAT && f->var) { float val = fielddesc_cvtfromcoord(f, coord); --- 4665,4683 ---- } ! /* convert from a screen coordinate to a variable value */ ! static float fielddesc_cvtfromcoord(t_fielddesc *f, float coord) { ! if (f->scrmax == f->scrmin) return coord; else { float div = (f->max - f->min)/(f->scrmax - f->scrmin); float extreme; ! float val = f->min + (coord - f->scrmin) * div; if (f->quantum != 0) val = ((int)((val/f->quantum) + 0.5)) * f->quantum; ! extreme = f->min<f->max ? f->min : f->max; if (val<extreme) val=extreme; ! extreme = f->min>f->max ? f->min : f->max; if (val>extreme) val=extreme; ! return val; } } ! static void fielddesc_setcoord(t_fielddesc *f, t_template *template, t_word *wp, float coord, int loud) { if (f->type == A_FLOAT && f->var) { float val = fielddesc_cvtfromcoord(f, coord); *************** *** 5868,5874 **** t_word *vec; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gpointer_check(gp, 0)) {pd_error(x, "set: empty pointer"); return;} if (gpointer_gettemplatesym(gp) != x->templatesym) { ! pd_error(x, "set %s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(gp)->s_name); return; --- 5867,5873 ---- t_word *vec; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gpointer_check(gp, 0)) {pd_error(x, "empty pointer"); return;} if (gpointer_gettemplatesym(gp) != x->templatesym) { ! pd_error(x, "%s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(gp)->s_name); return; *************** *** 5936,5942 **** int elemsize, type; ! if (!gpointer_check(gparent, 0)) {pd_error(x, "element: empty pointer"); return;} if (gpointer_gettemplatesym(gparent) != x->templatesym) { ! pd_error(x, "element %s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(gparent)->s_name); return; --- 5935,5941 ---- int elemsize, type; ! if (!gpointer_check(gparent, 0)) {pd_error(x, "empty pointer"); return;} if (gpointer_gettemplatesym(gparent) != x->templatesym) { ! pd_error(x, "%s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(gparent)->s_name); return; *************** *** 5946,5955 **** TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(template, fieldsym, &onset, &type, &elemtemplatesym)) { ! pd_error(x, "element: couldn't find array field %s", fieldsym->s_name); return; } if (type != DT_ARRAY) {pd_error(x, "element: field %s not of type array", fieldsym->s_name); return;} if (!(elemtemplate = template_findbyname(elemtemplatesym))) { ! pd_error(x, "element: couldn't find field template %s", elemtemplatesym->s_name); return; } --- 5945,5954 ---- TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(template, fieldsym, &onset, &type, &elemtemplatesym)) { ! pd_error(x, "couldn't find array field %s", fieldsym->s_name); return; } if (type != DT_ARRAY) {pd_error(x, "element: field %s not of type array", fieldsym->s_name); return;} if (!(elemtemplate = template_findbyname(elemtemplatesym))) { ! pd_error(x, "couldn't find field template %s", elemtemplatesym->s_name); return; } *************** *** 5995,6005 **** TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(template, fieldsym, &onset, &type, &elemtemplatesym)) { ! pd_error(x, "getsize: couldn't find array field %s", fieldsym->s_name); return; } ! if (type != DT_ARRAY) {pd_error(x, "getsize: field %s not of type array", fieldsym->s_name); return;} ! if (!gpointer_check(gp, 0)) {pd_error(x, "get: stale or empty pointer"); return;} if (gpointer_gettemplatesym(gp) != x->templatesym) { ! pd_error(x, "getsize %s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(gp)->s_name); return; --- 5994,6004 ---- TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(template, fieldsym, &onset, &type, &elemtemplatesym)) { ! pd_error(x, "couldn't find array field %s", fieldsym->s_name); return; } ! if (type != DT_ARRAY) {pd_error(x, "field %s not of type array", fieldsym->s_name); return;} ! if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} if (gpointer_gettemplatesym(gp) != x->templatesym) { ! pd_error(x, "%s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(gp)->s_name); return; *************** *** 6041,6047 **** t_gpointer *gp = &x->gp; t_gstub *gs = gp->gp_stub; ! if (!gpointer_check(&x->gp, 0)) {pd_error(x, "setsize: empty pointer"); return;} if (gpointer_gettemplatesym(&x->gp) != x->templatesym) { ! pd_error(x, "setsize %s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(&x->gp)->s_name); return; } --- 6040,6046 ---- t_gpointer *gp = &x->gp; t_gstub *gs = gp->gp_stub; ! if (!gpointer_check(&x->gp, 0)) {pd_error(x, "empty pointer"); return;} if (gpointer_gettemplatesym(&x->gp) != x->templatesym) { ! pd_error(x, "%s: got wrong template (%s)", x->templatesym->s_name, gpointer_gettemplatesym(&x->gp)->s_name); return; } *************** *** 6049,6058 **** TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(template, fieldsym, &onset, &type, &elemtemplatesym)) { ! pd_error(x,"setsize: couldn't find array field %s", fieldsym->s_name); return; } ! if (type != DT_ARRAY) {pd_error(x,"setsize: field %s not of type array", fieldsym->s_name); return;} if (!(elemtemplate = template_findbyname(elemtemplatesym))) { ! pd_error(x,"element: couldn't find field template %s", elemtemplatesym->s_name); return; } --- 6048,6057 ---- TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(template, fieldsym, &onset, &type, &elemtemplatesym)) { ! pd_error(x,"couldn't find array field %s", fieldsym->s_name); return; } ! if (type != DT_ARRAY) {pd_error(x,"field %s not of type array", fieldsym->s_name); return;} if (!(elemtemplate = template_findbyname(elemtemplatesym))) { ! pd_error(x,"couldn't find field template %s", elemtemplatesym->s_name); return; } *************** *** 6063,6071 **** if (newsize < 1) newsize = 1; if (newsize == nitems) return; - - /* erase the array before resizing it. If we belong to a scalar it's easy, but if we belong to an element of another - array we have to search back until we get to a scalar to erase. - When graphics updates become queueable this may fall apart... */ if (gs->gs_which == GP_GLIST) { if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui((t_gobj *)(gp->gp_un.gp_scalar),"delete",""); --- 6062,6069 ---- if (newsize < 1) newsize = 1; if (newsize == nitems) return; + /* erase the array before resizing it. If we belong to a scalar it's easy, + but if we belong to an element of another array we have to search back until we get to a + scalar to erase. When graphics updates become queueable this may fall apart... */ if (gs->gs_which == GP_GLIST) { if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui((t_gobj *)(gp->gp_un.gp_scalar),"delete",""); *************** *** 6076,6081 **** sys_mgui((t_gobj *)(o->gp.gp_un.gp_scalar), "delete",""); } /* now do the resizing and, if growing, initialize new scalars */ - /* aligned resizing */ array->vec = (char *)resizealignedbytes(array->vec, elemsize * nitems, elemsize * newsize); array->n = newsize; --- 6074,6079 ---- sys_mgui((t_gobj *)(o->gp.gp_un.gp_scalar), "delete",""); } + /* now do the resizing and, if growing, initialize new scalars */ array->vec = (char *)resizealignedbytes(array->vec, elemsize * nitems, elemsize * newsize); array->n = newsize; *************** *** 6086,6093 **** word_init((t_word *)newelem, elemtemplate, gp); newelem += elemsize; - /* post("new %lx %lx, ntypes %d", newelem, *(int *)newelem, ntypes); */ } } - /* redraw again. */ if (gs->gs_which == GP_GLIST) { if (canvas_isvisible(gs->gs_un.gs_glist)) gobj_changed((t_gobj *)(gp->gp_un.gp_scalar),0); --- 6084,6089 ---- *************** *** 6150,6157 **** t_canvas *canvas; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gs) {pd_error(x, "append: no current pointer"); return;} ! if (gs->gs_which != GP_GLIST) {pd_error(x, "append: lists only, not arrays"); return;} canvas = gs->gs_un.gs_glist; ! if (canvas->valid != gp->gp_valid) {pd_error(x, "append: stale pointer"); return;} if (!nitems) return; x->variables[0].f = f; --- 6146,6153 ---- t_canvas *canvas; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gs) {pd_error(x, "no current pointer"); return;} ! if (gs->gs_which != GP_GLIST) {pd_error(x, "lists only, not arrays"); return;} canvas = gs->gs_un.gs_glist; ! if (canvas->valid != gp->gp_valid) {pd_error(x, "stale pointer"); return;} if (!nitems) return; x->variables[0].f = f; *************** *** 6206,6215 **** t_word *w; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gpointer_check(gp, 0)) {pd_error(x, "get: stale or empty pointer"); return;} if (!template_find_field(template, x->fieldsym, &onset, &type, &dummy)) { ! pd_error(x, "sublist: couldn't find field %s", x->fieldsym->s_name); return; } ! if (type != DT_LIST) {pd_error(x, "sublist: field %s not of type list", x->fieldsym->s_name); return;} if (gs->gs_which == GP_ARRAY) w = gp->gp_un.gp_w; else w = gp->gp_un.gp_scalar->sc_vec; --- 6202,6211 ---- t_word *w; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} if (!template_find_field(template, x->fieldsym, &onset, &type, &dummy)) { ! pd_error(x, "couldn't find field %s", x->fieldsym->s_name); return; } ! if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} if (gs->gs_which == GP_ARRAY) w = gp->gp_un.gp_w; else w = gp->gp_un.gp_scalar->sc_vec; *************** *** 6726,6730 **** int i; t_symbol *name = atom_getsymbol(argv); ! if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {error("gargamel was here"); return;} for (i=0; i<argc-1; i++) str[i] = atom_getfloat(argv+i+1); str[argc-1]=0; --- 6722,6726 ---- int i; t_symbol *name = atom_getsymbol(argv); ! if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {pd_error(x,"gargamel was here"); return;} for (i=0; i<argc-1; i++) str[i] = atom_getfloat(argv+i+1); str[argc-1]=0; *************** *** 6735,6739 **** static void canvas_object_moveto(t_canvas *x, t_symbol *name, t_floatarg px, t_floatarg py) { t_text *o; ! if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {error("gargamel was here"); return;} o->te_xpix = (int)px; o->te_ypix = (int)py; --- 6731,6735 ---- static void canvas_object_moveto(t_canvas *x, t_symbol *name, t_floatarg px, t_floatarg py) { t_text *o; ! if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {pd_error(x,"gargamel was here"); return;} o->te_xpix = (int)px; o->te_ypix = (int)py; *************** *** 6742,6746 **** static void canvas_object_delete(t_canvas *x, t_symbol *name) { t_text *o; ! if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {error("gargamel was here"); return;} canvas_delete(x,(t_gobj *)o); gobj_changed(x,0); --- 6738,6742 ---- static void canvas_object_delete(t_canvas *x, t_symbol *name) { t_text *o; ! if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {pd_error(x,"gargamel was here"); return;} canvas_delete(x,(t_gobj *)o); gobj_changed(x,0); *************** *** 6768,6773 **** //t_binbuf *b; int i; ! if (argc<1) {error("not enough args"); return;} ! if (argv[0].a_type != A_FLOAT) {error("$1 must be float"); return;} i = atom_getfloat(argv); /* --- 6764,6769 ---- //t_binbuf *b; int i; ! if (argc<1) {pd_error(x,"not enough args"); return;} ! if (argv[0].a_type != A_FLOAT) {pd_error(x,"$1 must be float"); return;} i = atom_getfloat(argv); /*

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs September 2006