Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

externals/iem/iemmatrix/abs mtx_tab.pd,1.3,1.4
by Franz Zotter 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25882 Modified Files: mtx_tab.pd Log Message: forgot to delete print command... Index: mtx_tab.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/abs/mtx_tab.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mtx_tab.pd 29 Aug 2006 09:18:12 -0000 1.3 --- mtx_tab.pd 29 Aug 2006 09:20:38 -0000 1.4 *************** *** 40,49 **** #X msg 181 223 1; #X obj 38 176 route bang; - #X obj 457 359 print; #X obj 142 244 t a a; #X connect 0 0 11 0; #X connect 1 0 8 0; #X connect 3 0 2 0; - #X connect 3 0 38 0; #X connect 4 0 20 0; #X connect 4 1 5 0; --- 40,47 ---- *************** *** 69,73 **** #X connect 21 0 7 0; #X connect 32 0 18 0; ! #X connect 32 1 39 0; #X connect 33 0 17 0; #X connect 33 1 35 0; --- 67,71 ---- #X connect 21 0 7 0; #X connect 32 0 18 0; ! #X connect 32 1 38 0; #X connect 33 0 17 0; #X connect 33 1 35 0; *************** *** 80,83 **** #X connect 37 0 12 0; #X connect 37 1 12 0; ! #X connect 39 0 34 0; ! #X connect 39 1 8 0; --- 78,81 ---- #X connect 37 0 12 0; #X connect 37 1 12 0; ! #X connect 38 0 34 0; ! #X connect 38 1 8 0;

1 0

externals/iem/iemmatrix/abs mtx_tab.pd,1.2,1.3
by Franz Zotter 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24704 Modified Files: mtx_tab.pd Log Message: corrected scheduling error of mtx_tab: write after read was not possible! Index: mtx_tab.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/abs/mtx_tab.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mtx_tab.pd 29 Aug 2006 08:07:23 -0000 1.2 --- mtx_tab.pd 29 Aug 2006 09:18:12 -0000 1.3 *************** *** 2,12 **** #X obj 33 14 inlet; #X obj 247 6 inlet; ! #X obj 286 339 s \$1; ! #X obj 286 316 list prepend 0; ! #X obj 247 276 t a a; ! #X obj 286 276 mtx_size; ! #X obj 347 276 *; ! #X msg 336 295 resize \$1; ! #X obj 247 257 relay matrix; #X obj 33 55 t a a; #X obj 33 348 outlet; --- 2,12 ---- #X obj 33 14 inlet; #X obj 247 6 inlet; ! #X obj 286 354 s \$1; ! #X obj 286 331 list prepend 0; ! #X obj 247 291 t a a; ! #X obj 286 291 mtx_size; ! #X obj 347 291 *; ! #X msg 336 310 resize \$1; ! #X obj 247 272 relay matrix; #X obj 33 55 t a a; #X obj 33 348 outlet; *************** *** 20,25 **** #X msg 162 176 0; #X msg 190 176 1; ! #X obj 247 295 list split 1; ! #X obj 372 276 + 2; #X text 356 13 \$1 ... table name; #X text 446 125 part of iemmatrix.; --- 20,25 ---- #X msg 162 176 0; #X msg 190 176 1; ! #X obj 247 310 list split 1; ! #X obj 372 291 + 2; #X text 356 13 \$1 ... table name; #X text 446 125 part of iemmatrix.; *************** *** 30,46 **** its internal matrix in a table. So this matrix can be seen as a local/global variable of the workspace.; ! #X text 328 340 send to table; #X text 226 79 get from table; #X text 138 158 if no output: send to table anyway; ! #X text 489 261 Franz Zotter 2006; #X obj 112 223 t b a; #X obj 112 137 t b b a b; ! #X obj 111 245 spigot; #X msg 152 223 0; #X msg 181 223 1; #X obj 38 176 route bang; #X connect 0 0 11 0; #X connect 1 0 8 0; #X connect 3 0 2 0; #X connect 4 0 20 0; #X connect 4 1 5 0; --- 30,49 ---- its internal matrix in a table. So this matrix can be seen as a local/global variable of the workspace.; ! #X text 328 355 send to table; #X text 226 79 get from table; #X text 138 158 if no output: send to table anyway; ! #X text 489 276 Franz Zotter 2006; #X obj 112 223 t b a; #X obj 112 137 t b b a b; ! #X obj 111 271 spigot; #X msg 152 223 0; #X msg 181 223 1; #X obj 38 176 route bang; + #X obj 457 359 print; + #X obj 142 244 t a a; #X connect 0 0 11 0; #X connect 1 0 8 0; #X connect 3 0 2 0; + #X connect 3 0 38 0; #X connect 4 0 20 0; #X connect 4 1 5 0; *************** *** 66,71 **** #X connect 21 0 7 0; #X connect 32 0 18 0; ! #X connect 32 1 34 0; ! #X connect 32 1 8 0; #X connect 33 0 17 0; #X connect 33 1 35 0; --- 69,73 ---- #X connect 21 0 7 0; #X connect 32 0 18 0; ! #X connect 32 1 39 0; #X connect 33 0 17 0; #X connect 33 1 35 0; *************** *** 78,79 **** --- 80,83 ---- #X connect 37 0 12 0; #X connect 37 1 12 0; + #X connect 39 0 34 0; + #X connect 39 1 8 0;

1 0

externals/iem/iemmatrix/abs mtx_tab-help.pd,1.1,1.2
by Franz Zotter 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2671 Modified Files: mtx_tab-help.pd Log Message: added three lines to mtx_tab-help to demonstrate data sharing between mtx_tab objects. Index: mtx_tab-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/abs/mtx_tab-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mtx_tab-help.pd 29 Aug 2006 07:37:08 -0000 1.1 --- mtx_tab-help.pd 29 Aug 2006 08:18:10 -0000 1.2 *************** *** 23,26 **** --- 23,32 ---- #X obj 558 158 mtx; #X text 433 81 local table; + #X obj 383 215 mtx_tab \$0-table; + #X obj 383 260 mtx_print other; + #X obj 383 237 mtx_+ 1; + #X obj 383 193 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 + -1; + #X msg 423 191 ones 1 3; #X connect 0 0 11 0; #X connect 2 0 3 0; *************** *** 35,36 **** --- 41,46 ---- #X connect 11 1 12 0; #X connect 13 0 0 0; + #X connect 20 0 22 0; + #X connect 22 0 21 0; + #X connect 23 0 20 0; + #X connect 24 0 20 0;

1 0

externals/iem/iemmatrix/abs mtx_tab.pd,1.1,1.2
by Franz Zotter 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31460 Modified Files: mtx_tab.pd Log Message: corrected relay and spigot error. Index: mtx_tab.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/abs/mtx_tab.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mtx_tab.pd 29 Aug 2006 07:37:08 -0000 1.1 --- mtx_tab.pd 29 Aug 2006 08:07:23 -0000 1.2 *************** *** 8,31 **** #X obj 347 276 *; #X msg 336 295 resize \$1; ! #X obj 247 247 relay matrix; #X obj 33 55 t a a; #X obj 33 348 outlet; #X obj 33 34 relay matrix; ! #X obj 112 219 mtx; #X obj 112 56 t a b; #X obj 142 76 tabdump \$1; #X obj 142 96 list prepend matrix; #X obj 142 116 list trim; ! #X msg 159 248 1; ! #X obj 112 248 spigot; ! #X obj 112 137 t b a b; ! #X obj 112 195 spigot; ! #X msg 158 195 0; ! #X obj 112 268 t a b; ! #X msg 188 248 0; ! #X msg 187 195 1; #X obj 247 295 list split 1; #X obj 372 276 + 2; - #X obj 38 195 relay bang; #X text 356 13 \$1 ... table name; #X text 446 125 part of iemmatrix.; --- 8,25 ---- #X obj 347 276 *; #X msg 336 295 resize \$1; ! #X obj 247 257 relay matrix; #X obj 33 55 t a a; #X obj 33 348 outlet; #X obj 33 34 relay matrix; ! #X obj 112 203 mtx; #X obj 112 56 t a b; #X obj 142 76 tabdump \$1; #X obj 142 96 list prepend matrix; #X obj 142 116 list trim; ! #X obj 112 176 spigot; ! #X msg 162 176 0; ! #X msg 190 176 1; #X obj 247 295 list split 1; #X obj 372 276 + 2; #X text 356 13 \$1 ... table name; #X text 446 125 part of iemmatrix.; *************** *** 38,52 **** #X text 328 340 send to table; #X text 226 79 get from table; ! #X text 30 174 exclude bang; ! #X text 138 177 if no output: send to table anyway; #X text 489 261 Franz Zotter 2006; #X connect 0 0 11 0; #X connect 1 0 8 0; #X connect 3 0 2 0; ! #X connect 4 0 25 0; #X connect 4 1 5 0; #X connect 5 0 6 0; #X connect 5 1 6 1; ! #X connect 6 0 26 0; #X connect 7 0 2 0; #X connect 8 0 4 0; --- 32,51 ---- #X text 328 340 send to table; #X text 226 79 get from table; ! #X text 138 158 if no output: send to table anyway; #X text 489 261 Franz Zotter 2006; + #X obj 112 223 t b a; + #X obj 112 137 t b b a b; + #X obj 111 245 spigot; + #X msg 152 223 0; + #X msg 181 223 1; + #X obj 38 176 route bang; #X connect 0 0 11 0; #X connect 1 0 8 0; #X connect 3 0 2 0; ! #X connect 4 0 20 0; #X connect 4 1 5 0; #X connect 5 0 6 0; #X connect 5 1 6 1; ! #X connect 6 0 21 0; #X connect 7 0 2 0; #X connect 8 0 4 0; *************** *** 55,79 **** #X connect 11 0 9 0; #X connect 11 1 13 0; ! #X connect 12 0 18 0; ! #X connect 12 0 8 0; ! #X connect 13 0 19 0; #X connect 13 1 14 0; #X connect 14 0 15 0; #X connect 15 0 16 0; #X connect 16 0 12 1; ! #X connect 17 0 18 1; ! #X connect 18 0 22 0; ! #X connect 19 0 20 0; ! #X connect 19 1 27 0; ! #X connect 19 2 17 0; ! #X connect 19 2 24 0; ! #X connect 20 0 12 0; ! #X connect 21 0 20 1; ! #X connect 22 0 10 0; ! #X connect 22 1 23 0; ! #X connect 22 1 21 0; ! #X connect 23 0 18 1; ! #X connect 24 0 20 1; ! #X connect 25 1 3 0; ! #X connect 26 0 7 0; ! #X connect 27 1 12 0; --- 54,79 ---- #X connect 11 0 9 0; #X connect 11 1 13 0; ! #X connect 12 0 32 0; ! #X connect 13 0 33 0; #X connect 13 1 14 0; #X connect 14 0 15 0; #X connect 15 0 16 0; #X connect 16 0 12 1; ! #X connect 17 0 12 0; ! #X connect 18 0 17 1; ! #X connect 19 0 17 1; ! #X connect 20 1 3 0; ! #X connect 21 0 7 0; ! #X connect 32 0 18 0; ! #X connect 32 1 34 0; ! #X connect 32 1 8 0; ! #X connect 33 0 17 0; ! #X connect 33 1 35 0; ! #X connect 33 2 37 0; ! #X connect 33 3 19 0; ! #X connect 33 3 36 0; ! #X connect 34 0 10 0; ! #X connect 35 0 34 1; ! #X connect 36 0 34 1; ! #X connect 37 0 12 0; ! #X connect 37 1 12 0;

1 0

externals/iem/iemmatrix/abs mtx_tab-help.pd, NONE, 1.1 mtx_tab.pd, NONE, 1.1
by Franz Zotter 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20122 Added Files: mtx_tab-help.pd mtx_tab.pd Log Message: mtx_tab: is the same as mtx, but storing its matrix in a local/global table. --- NEW FILE: mtx_tab-help.pd --- #N canvas 382 218 668 300 10; #X obj 133 198 mtx_tab \$0-table; #X obj 435 97 table \$0-table; #X obj 131 120 mtx_rand; #X obj 133 141 t a a; #X obj 173 141 mtx_print orig; #X obj 133 259 mtx_print outlet; #X obj 311 125 mtx_zeros; #X msg 311 105 3 4; #X obj 264 101 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 131 99 2 3; #X msg 86 122 row 1; #X obj 133 233 relay matrix; #X obj 258 257 print outlet; #X msg -1 122 row 1 1 2 3; #X text 478 4 part of iemmatrix; #X text 27 7 [mtx_tab]; #X text 92 28 is a matrix using a table for local/global storage of its data. for the full palette of matrix commands refer to the "mtx" help; #X text 487 158 see also:; #X obj 558 158 mtx; #X text 433 81 local table; #X connect 0 0 11 0; #X connect 2 0 3 0; #X connect 3 0 0 0; #X connect 3 1 4 0; #X connect 6 0 0 1; #X connect 7 0 6 0; #X connect 8 0 0 0; #X connect 9 0 2 0; #X connect 10 0 0 0; #X connect 11 0 5 0; #X connect 11 1 12 0; #X connect 13 0 0 0; --- NEW FILE: mtx_tab.pd --- #N canvas 98 259 645 400 10; #X obj 33 14 inlet; #X obj 247 6 inlet; #X obj 286 339 s \$1; #X obj 286 316 list prepend 0; #X obj 247 276 t a a; #X obj 286 276 mtx_size; #X obj 347 276 *; #X msg 336 295 resize \$1; #X obj 247 247 relay matrix; #X obj 33 55 t a a; #X obj 33 348 outlet; #X obj 33 34 relay matrix; #X obj 112 219 mtx; #X obj 112 56 t a b; #X obj 142 76 tabdump \$1; #X obj 142 96 list prepend matrix; #X obj 142 116 list trim; #X msg 159 248 1; #X obj 112 248 spigot; #X obj 112 137 t b a b; #X obj 112 195 spigot; #X msg 158 195 0; #X obj 112 268 t a b; #X msg 188 248 0; #X msg 187 195 1; #X obj 247 295 list split 1; #X obj 372 276 + 2; #X obj 38 195 relay bang; #X text 356 13 \$1 ... table name; #X text 446 125 part of iemmatrix.; #X text 434 151 requires zexy [relay]; #X text 495 187 see also:; #X obj 563 186 mtx; #X text 209 35 mtx_tab behaves just like a "mtx" object that stores its internal matrix in a table. So this matrix can be seen as a local/global variable of the workspace.; #X text 328 340 send to table; #X text 226 79 get from table; #X text 30 174 exclude bang; #X text 138 177 if no output: send to table anyway; #X text 489 261 Franz Zotter 2006; #X connect 0 0 11 0; #X connect 1 0 8 0; #X connect 3 0 2 0; #X connect 4 0 25 0; #X connect 4 1 5 0; #X connect 5 0 6 0; #X connect 5 1 6 1; #X connect 6 0 26 0; #X connect 7 0 2 0; #X connect 8 0 4 0; #X connect 9 0 10 0; #X connect 9 1 4 0; #X connect 11 0 9 0; #X connect 11 1 13 0; #X connect 12 0 18 0; #X connect 12 0 8 0; #X connect 13 0 19 0; #X connect 13 1 14 0; #X connect 14 0 15 0; #X connect 15 0 16 0; #X connect 16 0 12 1; #X connect 17 0 18 1; #X connect 18 0 22 0; #X connect 19 0 20 0; #X connect 19 1 27 0; #X connect 19 2 17 0; #X connect 19 2 24 0; #X connect 20 0 12 0; #X connect 21 0 20 1; #X connect 22 0 10 0; #X connect 22 1 23 0; #X connect 22 1 21 0; #X connect 23 0 18 1; #X connect 24 0 20 1; #X connect 25 1 3 0; #X connect 26 0 7 0; #X connect 27 1 12 0;

1 0

pd/src desire.tk, 1.1.2.417, 1.1.2.418 objective.tcl, 1.1.2.17, 1.1.2.18
by Mathieu Bouchard 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20165 Modified Files: Tag: devel_0_39 desire.tk objective.tcl Log Message: new: proc tracedef, which is the decoupling of def and def* also loads debug.tcl, which is where tracedef calls should go Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.417 retrieving revision 1.1.2.418 diff -C2 -d -r1.1.2.417 -r1.1.2.418 *** desire.tk 28 Aug 2006 23:44:21 -0000 1.1.2.417 --- desire.tk 29 Aug 2006 00:07:17 -0000 1.1.2.418 *************** *** 38,49 **** package require objective ! catch { ! set cmds [info commands] ! puts "Tclx version [package require Tclx]" ! set cmds [lsort [lwithout [info commands] $cmds]] ! puts "Tclx has got $cmds" ! } ! ! #catch {source profdd.tcl} proc which {file} { --- 38,43 ---- package require objective ! #if {[catch {source profdd.tcl}]} {error_dump} ! if {[catch {source debug.tcl}]} {error_dump} proc which {file} { *************** *** 172,188 **** class_new Manager {Thing} ! def* Manager init {} { ! set @q [list] $self call } - proc error_dump {} { - global errorCode errorInfo - regsub -all " invoked from within\n" $errorInfo "" errorInfo - regsub -all "\n \\(" $errorInfo " (" errorInfo - #regsub -all {\n[^\n]*procedure \"(::unknown|super)\"[^\n]*\n} $errorInfo "\n" errorInfo - puts "[VTred]Exception:[VTgrey] errorCode=$errorCode; errorInfo=$errorInfo" - } - def Manager call {} { global poolset --- 166,174 ---- class_new Manager {Thing} ! def Manager init {} { ! set @q {} $self call } def Manager call {} { global poolset *************** *** 753,759 **** set sock_lobby {} - proc VTred {} {return "\x1b\[0;1;31m"} - proc VTgrey {} {return "\x1b\[0m"} - proc poll_sock {} { global sock sock_lobby --- 739,742 ---- *************** *** 997,1001 **** } ! def* Menuable ctrlkey {key shift} { global accels set key [if {$shift} {string toupper $key} {string tolower $key}] --- 980,984 ---- } ! def Menuable ctrlkey {key shift} { global accels set key [if {$shift} {string toupper $key} {string tolower $key}] *************** *** 1072,1075 **** --- 1055,1059 ---- } } + puts "category = $category" set_fontstring *************** *** 1137,1145 **** def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def* View click {x y f target} {} ! def* View unclick {x y f target} {} ! def View motion {x y f target} {} ! def* View look {k} { global look if {[info exists look($@_class:$k)]} { --- 1121,1129 ---- def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def View click {x y f target} {} ! def View unclick {x y f target} {} ! def View motion {x y f target} {} ! def View look {k} { global look if {[info exists look($@_class:$k)]} { *************** *** 1202,1213 **** default {.$(a)canvas.c delete $self$suffix}}} ! def* View draw {} {} ! def* View delete {} {$self erase} ! def* View erase {} {$self item_delete} def View selected? {} {return $@selected?} def View selected?= {x} {set @selected? $x; $self changed} ;# only call this from selection= and such ! def* View select {state} { set ostate [$self selected?] set @selected? $state --- 1186,1197 ---- default {.$(a)canvas.c delete $self$suffix}}} ! def View draw {} {} ! def View delete {} {$self erase} ! def View erase {} {$self item_delete} def View selected? {} {return $@selected?} def View selected?= {x} {set @selected? $x; $self changed} ;# only call this from selection= and such ! def View select {state} { set ostate [$self selected?] set @selected? $state *************** *** 1225,1229 **** } ! #def* View popup_properties {} { # global fields # set class $@class --- 1209,1213 ---- } ! #def View popup_properties {} { # global fields # set class $@class *************** *** 1357,1361 **** $self changed ;#$self draw } ! def* Canvas editmodeswitch {args} { global crosshair set @editmode [expr !$@editmode] --- 1341,1345 ---- $self changed ;#$self draw } ! def Canvas editmodeswitch {args} { global crosshair set @editmode [expr !$@editmode] *************** *** 1482,1486 **** def Canvas history {} {return $@history} ! def* Canvas font_bomb {} {FontBombDialog new_as fontbomb} #-----------------------------------------------------------------------------------# --- 1466,1470 ---- def Canvas history {} {return $@history} ! def Canvas font_bomb {} {FontBombDialog new_as fontbomb} #-----------------------------------------------------------------------------------# *************** *** 1572,1576 **** def Canvas reload {} {pd ".$self map 0; .$self map 1"} ! def* Canvas redraw {} { $self changed foreach x $@children {$x changed} --- 1556,1560 ---- def Canvas reload {} {pd ".$self map 0; .$self map 1"} ! def Canvas redraw {} { $self changed foreach x $@children {$x changed} *************** *** 1687,1691 **** } ! def* Canvas draw {} { if {$@subpatch} {super} ;# is for the [pd] box if applicable if {$@editmode} {set bg [$self look bgedit]} else {set bg [$self look bgrun]} --- 1671,1675 ---- } ! def Canvas draw {} { if {$@subpatch} {super} ;# is for the [pd] box if applicable if {$@editmode} {set bg [$self look bgedit]} else {set bg [$self look bgrun]} *************** *** 1694,1698 **** } ! def* Canvas popup_properties {} {CanvasPropertiesDialog new $self} #-----------------------------------------------------------------------------------# --- 1678,1682 ---- } ! def Canvas popup_properties {} {CanvasPropertiesDialog new $self} #-----------------------------------------------------------------------------------# *************** *** 1710,1714 **** def TextBox text {} {return $text} ! def* TextBox draw {} { global font #$self update_size --- 1694,1698 ---- def TextBox text {} {return $text} ! def TextBox draw {} { global font #$self update_size *************** *** 1732,1736 **** def Canvas obj_in_edit= {v} {set @obj_in_edit $v} ! def* TextBox edit {} { global font if {$@edit} {return} --- 1716,1720 ---- def Canvas obj_in_edit= {v} {set @obj_in_edit $v} ! def TextBox edit {} { global font if {$@edit} {return} *************** *** 1764,1768 **** } ! def* TextBox key {widget x y key iso shift} { after 0 "$self after_key $widget" switch -- $key { --- 1748,1752 ---- } ! def TextBox key {widget x y key iso shift} { after 0 "$self after_key $widget" switch -- $key { *************** *** 1847,1851 **** } ! def* ObjectBox draw_box {} { global font super --- 1831,1835 ---- } ! def ObjectBox draw_box {} { global font super *************** *** 2015,2019 **** } ! def* View set_orig_xy {x y} { set @orig_x $x set @orig_y $y --- 1999,2003 ---- } ! def View set_orig_xy {x y} { set @orig_x $x set @orig_y $y *************** *** 2073,2077 **** } ! def* Canvas quadrant {du dv array} { switch $@keynav_current { 0 {set @keynav_current [lindex $@children 0]}} set foo {} --- 2057,2061 ---- } ! def Canvas quadrant {du dv array} { switch $@keynav_current { 0 {set @keynav_current [lindex $@children 0]}} set foo {} *************** *** 2332,2336 **** } ! def* Canvas disconnect {wire} { mset {from outlet to inlet} $wire; pd .$self disconnect $from $outlet $to $inlet $@history add [list $self connect $wire] --- 2316,2320 ---- } ! def Canvas disconnect {wire} { mset {from outlet to inlet} $wire; pd .$self disconnect $from $outlet $to $inlet $@history add [list $self connect $wire] *************** *** 2388,2392 **** $self motion $@x1 $@y1 $f $target } ! def* FutureWire motion {x y f target} { set @x2 $x set @y2 $y --- 2372,2376 ---- $self motion $@x1 $@y1 $f $target } ! def FutureWire motion {x y f target} { set @x2 $x set @y2 $y *************** *** 2400,2404 **** $self draw } ! def* FutureWire unclick {x y f target} { $self motion $x $y $f $target if {$@to != ""} { --- 2384,2388 ---- $self draw } ! def FutureWire unclick {x y f target} { $self motion $x $y $f $target if {$@to != ""} { *************** *** 2588,2592 **** } ! def* Canvas tab_jump {} { set @keynav 1 #puts " selection:::: [$self selection]" --- 2572,2576 ---- } ! def Canvas tab_jump {} { set @keynav 1 #puts " selection:::: [$self selection]" *************** *** 2658,2662 **** proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} ! def* Canvas key_nav {du dv shift} { #puts " keynav_tab_sel::: $@keynav_tab_sel" #puts " selection_wire::: $@selection_wire" --- 2642,2646 ---- proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} ! def Canvas key_nav {du dv shift} { #puts " keynav_tab_sel::: $@keynav_tab_sel" #puts " selection_wire::: $@selection_wire" *************** *** 2752,2756 **** } ! def* Canvas key_nav_ioselect {} { if {[llength $@selection] == 1} { set var [lindex $@keynav_iosel end end] --- 2736,2740 ---- } ! def Canvas key_nav_ioselect {} { if {[llength $@selection] == 1} { set var [lindex $@keynav_iosel end end] *************** *** 2961,2966 **** # will be so that @wires are updated correctly without breaking encapsulation ! def* Box connect_out {} {} ! def* Box connect_in {} {} def Box draw {} { --- 2945,2950 ---- # will be so that @wires are updated correctly without breaking encapsulation ! def Box connect_out {} {} ! def Box connect_in {} {} def Box draw {} { *************** *** 2970,2975 **** } def Box draw_box {} {} ! def* Box edit {} {} ! def* Box unedit {} {} def Box bbox {} { --- 2954,2959 ---- } def Box draw_box {} {} ! def Box edit {} {} ! def Box unedit {} {} def Box bbox {} { *************** *** 2981,2985 **** def Box draw_wires {} {foreach wire $@wires {$wire draw}} ! def* Box delete_wire {wire} { set find [lsearch $@wires $wire] if {$find != -1} {set @wires [lreplace $@wires $find $find]} --- 2965,2969 ---- def Box draw_wires {} {foreach wire $@wires {$wire draw}} ! def Box delete_wire {wire} { set find [lsearch $@wires $wire] if {$find != -1} {set @wires [lreplace $@wires $find $find]} *************** *** 3007,3011 **** } ! def* Box clickedit {x y butt key in_selection selection} { if {($key&1) && $selection>0} {puts "add $self to selection...."} #if clicked obj is part of the $@selection, than.... --- 2991,2995 ---- } ! def Box clickedit {x y butt key in_selection selection} { if {($key&1) && $selection>0} {puts "add $self to selection...."} #if clicked obj is part of the $@selection, than.... *************** *** 3114,3118 **** def Wire report {} {list $@obj1 $@port1 $@obj2 $@port2} ! def* Wire draw {} { set zoom [$@canvas zoom] set bbox1 [lmap / [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $zoom] --- 3098,3102 ---- def Wire report {} {list $@obj1 $@port1 $@obj2 $@port2} ! def Wire draw {} { set zoom [$@canvas zoom] set bbox1 [lmap / [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $zoom] *************** *** 3680,3684 **** } ! def* FloatAtom key {key shift} { global font if {[super $key $shift]} {return} --- 3664,3668 ---- } ! def FloatAtom key {key shift} { global font if {[super $key $shift]} {return} *************** *** 3696,3700 **** } ! def* SymbolAtom key {key shift} { global font if {[super $key $shift]} {return} --- 3680,3684 ---- } ! def SymbolAtom key {key shift} { global font if {[super $key $shift]} {return} *************** *** 3706,3710 **** } ! def* FloatAtom ftoa {} { set f $@val set is_exp 0 --- 3690,3694 ---- } ! def FloatAtom ftoa {} { set f $@val set is_exp 0 *************** *** 4248,4252 **** } ! def* Vu set {i j} { set @value $i set @peak $j --- 4232,4236 ---- } ! def Vu set {i j} { set @value $i set @peak $j *************** *** 4656,4663 **** def Completion init {name x y textbox} {super $name $x $y $textbox} ! def* ClassBrowser cancel {} {$self delete} ! def* ClassBrowser delete {} {set @exist 0; super} ! def* ClassBrowser init {name x y textbox} { #super set @name $name --- 4640,4647 ---- def Completion init {name x y textbox} {super $name $x $y $textbox} ! def ClassBrowser cancel {} {$self delete} ! def ClassBrowser delete {} {set @exist 0; super} ! def ClassBrowser init {name x y textbox} { #super set @name $name *************** *** 4672,4676 **** } ! def* ClassBrowser fill_box {s} { global class_list $@listbox delete 0 end --- 4656,4660 ---- } ! def ClassBrowser fill_box {s} { global class_list $@listbox delete 0 end *************** *** 4686,4695 **** } ! def* Completion fill_box {s} { super $s wm maxsize .$self [winfo reqwidth .$self.comp] [winfo reqheight .$self.comp] } ! def* Browser fill_box {s} { global class_list super $s --- 4670,4679 ---- } ! def Completion fill_box {s} { super $s wm maxsize .$self [winfo reqwidth .$self.comp] [winfo reqheight .$self.comp] } ! def Browser fill_box {s} { global class_list super $s *************** *** 4712,4716 **** } ! def* ClassBrowser info {listbox} { set i [$listbox curselection] set class [string range [lindex [$listbox get $i] 0] 1 end-1] --- 4696,4700 ---- } ! def ClassBrowser info {listbox} { set i [$listbox curselection] set class [string range [lindex [$listbox get $i] 0] 1 end-1] *************** *** 4718,4722 **** } ! def* Browser list_callback {} { global class_list font $self search_for_externs --- 4702,4706 ---- } ! def Browser list_callback {} { global class_list font $self search_for_externs *************** *** 4757,4761 **** } ! def* Completion list_callback {} { global class_list $self search_for_externs --- 4741,4745 ---- } ! def Completion list_callback {} { global class_list $self search_for_externs *************** *** 4831,4835 **** } ! def* ClassBrowser key {key focus1 {shift 0}} { #focus1 = whatever if {[regexp {x([0-9a-z]{6,8})text$} $@textbox textself]} { --- 4815,4819 ---- } ! def ClassBrowser key {key focus1 {shift 0}} { #focus1 = whatever if {[regexp {x([0-9a-z]{6,8})text$} $@textbox textself]} { *************** *** 5148,5152 **** } ! def* Dialog add_fontbomb {f args} { global look if {[winfo exists $f.font]} {return} --- 5132,5136 ---- } ! def Dialog add_fontbomb {f args} { global look if {[winfo exists $f.font]} {return} *************** *** 5327,5331 **** def Dialog delete {} {destroy .$self; super} ! def* Dialog init {args} { super set f .$self --- 5311,5315 ---- def Dialog delete {} {destroy .$self; super} ! def Dialog init {args} { super set f .$self *************** *** 5347,5351 **** } ! def* Dialog dropmenu_open {frame} { set x [winfo rootx $frame.butt] set y [expr [winfo height $frame.butt] + [winfo rooty $frame.butt]] --- 5331,5335 ---- } ! def Dialog dropmenu_open {frame} { set x [winfo rootx $frame.butt] set y [expr [winfo height $frame.butt] + [winfo rooty $frame.butt]] *************** *** 5353,5362 **** } ! def* Dialog dropmenu_set {frame var part val} { $frame.butt configure -text [say $part] set @$var $val } ! def* Dialog color_popup_select {frame var color} { set @$var $color set col [format #%6.6x $color] --- 5337,5346 ---- } ! def Dialog dropmenu_set {frame var part val} { $frame.butt configure -text [say $part] set @$var $val } ! def Dialog color_popup_select {frame var color} { set @$var $color set col [format #%6.6x $color] *************** *** 5364,5368 **** } ! def* Dialog color_popup {frame var i} { set w $frame.color.popup if [winfo exists $w] {destroy $w} --- 5348,5352 ---- } ! def Dialog color_popup {frame var i} { set w $frame.color.popup if [winfo exists $w] {destroy $w} *************** *** 5378,5382 **** } ! def* Dialog choose_col {frame var val} { set c 0xFFFFFF set color [tk_chooseColor -title $val -initialcolor $val] --- 5362,5366 ---- } ! def Dialog choose_col {frame var val} { set c 0xFFFFFF set color [tk_chooseColor -title $val -initialcolor $val] *************** *** 5555,5559 **** def ServerPrefsDialog apply {} {$self write} ! def* ServerPrefsDialog init_reverse_hash {} { global pdrc_options pdrc_options_h foreach {type names} $pdrc_options { --- 5539,5543 ---- def ServerPrefsDialog apply {} {$self write} ! def ServerPrefsDialog init_reverse_hash {} { global pdrc_options pdrc_options_h foreach {type names} $pdrc_options { *************** *** 5564,5568 **** } ! def* ServerPrefsDialog read {} { global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) "RDONLY CREAT"] --- 5548,5552 ---- } ! def ServerPrefsDialog read {} { global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) "RDONLY CREAT"] *************** *** 5614,5620 **** # puts "THE END" } ! def* ServerPrefsDialog reset {} { } ! def* ServerPrefsDialog init {} { puts " clsee:: $@_class" global pdrc_options --- 5598,5604 ---- # puts "THE END" } ! def ServerPrefsDialog reset {} { } ! def ServerPrefsDialog init {} { puts " clsee:: $@_class" global pdrc_options *************** *** 5723,5727 **** def ClientPrefsDialog apply {} {$self write} ! def* ClientPrefsDialog read {} { global ddrc_options cmdline look key set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] --- 5707,5711 ---- def ClientPrefsDialog apply {} {$self write} ! def ClientPrefsDialog read {} { global ddrc_options cmdline look key set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] *************** *** 5745,5749 **** } ! def* ClientPrefsDialog read2 {} { global ddrc_options ddrc_options_h cmdline look key crosshair bar set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] --- 5729,5733 ---- } ! def ClientPrefsDialog read2 {} { global ddrc_options ddrc_options_h cmdline look key crosshair bar set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] *************** *** 5785,5789 **** #this writes the ddrc ! def* ClientPrefsDialog write {} { global ddrc_options cmdline look accels key $self get_val --- 5769,5773 ---- #this writes the ddrc ! def ClientPrefsDialog write {} { global ddrc_options cmdline look accels key $self get_val *************** *** 5835,5839 **** #this retrives the values set in the editor ! def* ClientPrefsDialog get_val {} { global ddrc_options look key set check_key {} --- 5819,5823 ---- #this retrives the values set in the editor ! def ClientPrefsDialog get_val {} { global ddrc_options look key set check_key {} *************** *** 5891,5895 **** } ! def* ClientPrefsDialog write2 {} { global ddrc_options ddrc_options_h cmdline look accels key crosshair set fd [open $cmdline(ddrcfilename) w] --- 5875,5879 ---- } ! def ClientPrefsDialog write2 {} { global ddrc_options ddrc_options_h cmdline look accels key crosshair set fd [open $cmdline(ddrcfilename) w] *************** *** 5939,5945 **** } ! def* ClientPrefsDialog reset {} { } ! def* ClientPrefsDialog init {} { global ddrc_options look key crosshair bar $self read --- 5923,5929 ---- } ! def ClientPrefsDialog reset {} { } ! def ClientPrefsDialog init {} { global ddrc_options look key crosshair bar $self read *************** *** 6054,6058 **** class_new FontBombDialog {Dialog} ! def* FontBombDialog apply {} { global look $self font_get_xlfd .$self $@font $@style $@size --- 6038,6042 ---- class_new FontBombDialog {Dialog} ! def FontBombDialog apply {} { global look $self font_get_xlfd .$self $@font $@style $@size *************** *** 6070,6074 **** } ! def* FontBombDialog init {} { global font super cancel ok --- 6054,6058 ---- } ! def FontBombDialog init {} { global font super cancel ok *************** *** 6292,6296 **** } ! def* View deconstruct_to {stream args} { $stream << [eval [concat [list $self deconstruct] $args]] $stream << ";\n" --- 6276,6280 ---- } ! def View deconstruct_to {stream args} { $stream << [eval [concat [list $self deconstruct] $args]] $stream << ";\n" Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -C2 -d -r1.1.2.17 -r1.1.2.18 *** objective.tcl 20 Aug 2006 21:46:59 -0000 1.1.2.17 --- objective.tcl 29 Aug 2006 00:07:17 -0000 1.1.2.18 *************** *** 42,47 **** proc def {self selector args body} { ! global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} ! proc ${self}_$selector "self $args" "global _; [expand_macros $body]" } proc def* {self selector args body} { --- 42,53 ---- proc def {self selector args body} { ! global _ __trace ! if {![info exists _($self:_class)]} {error "unknown class '$self'"} ! if {[info exists __trace($self:$selector)]} { ! proc* ${self}_$selector "self $args" "global _; [expand_macros $body]" ! } { ! proc ${self}_$selector "self $args" "global _; [expand_macros $body]" ! } ! #trace add execution ${self}_$selector enter dedebug } proc def* {self selector args body} { *************** *** 150,153 **** --- 156,160 ---- def Class ancestors {} { + #if {[info exists @ancestors]} {} set r [list $self] foreach super $@_super {eval [concat [list lappend r] [$super ancestors]]} *************** *** 160,161 **** --- 167,183 ---- #-----------------------------------------------------------------------------------# + + proc VTred {} {return "\x1b\[0;1;31m"} + proc VTgrey {} {return "\x1b\[0m"} + proc error_dump {} { + global errorCode errorInfo + regsub -all " invoked from within\n" $errorInfo "" errorInfo + regsub -all "\n \\(" $errorInfo " (" errorInfo + #regsub -all {\n[^\n]*procedure \"(::unknown|super)\"[^\n]*\n} $errorInfo "\n" errorInfo + puts "[VTred]Exception:[VTgrey] errorCode=$errorCode; errorInfo=$errorInfo" + } + + proc tracedef {class method {when enter}} { + global __trace + set __trace($class:$method) $when + }

1 0

pd/src desire.tk,1.1.2.416,1.1.2.417
by chunlee 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11713 Modified Files: Tag: devel_0_39 desire.tk Log Message: change getkey to def Menuable Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.416 retrieving revision 1.1.2.417 diff -C2 -d -r1.1.2.416 -r1.1.2.417 *** desire.tk 28 Aug 2006 22:16:19 -0000 1.1.2.416 --- desire.tk 28 Aug 2006 23:44:21 -0000 1.1.2.417 *************** *** 989,992 **** --- 989,1000 ---- } + def Menuable getkey {k} { + global accels + if {[dict exists $accels $k]} { + mset {class key} [split [dict get $accels $k] ":"] + if {$class != $@_class} {return ""} else {return $key} + } + } + def* Menuable ctrlkey {key shift} { global accels *************** *** 1145,1156 **** } - def Thing getkey {k} { - global accels - if {[dict exists $accels $k]} { - mset {class key} [split [dict get $accels $k] ":"] - if {$class != $@_class} {return ""} else {return $key} - } - } - def View init {} { super --- 1153,1156 ----

1 0

pd/src desire.tk,1.1.2.415,1.1.2.416
by chunlee 29 Aug '06

29 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11851 Modified Files: Tag: devel_0_39 desire.tk Log Message: change def Thing look to def View look Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.415 retrieving revision 1.1.2.416 diff -C2 -d -r1.1.2.415 -r1.1.2.416 *** desire.tk 28 Aug 2006 15:48:27 -0000 1.1.2.415 --- desire.tk 28 Aug 2006 22:16:19 -0000 1.1.2.416 *************** *** 554,562 **** set look(FutureWire:dash) #ee0012 set look(Slider:bg) #ccebff ! set look(Completion:showcomp) 10 ! set look(Completion:fg) #000000 ! set look(Completion:bg) #ffffff ! set look(Completion:selectbg) #000000 ! set look(Completion:selectfg) #ffffff set zoom(canned) [list 25 33 50 75 100 125 150 200 250 300 400] --- 554,562 ---- set look(FutureWire:dash) #ee0012 set look(Slider:bg) #ccebff ! set look(Canvas:showcomp) 10 ! set look(Canvas:compfg) #000000 ! set look(Canvas:compbg) #ffffff ! set look(Canvas:compselectbg) #000000 ! set look(Canvas:compselectfg) #ffffff set zoom(canned) [list 25 33 50 75 100 125 150 200 250 300 400] *************** *** 1132,1141 **** def* View unclick {x y f target} {} def View motion {x y f target} {} ! #class that are not view but need to look are: completionbox, dialog ! def Thing look {k} { global look if {[info exists look($@_class:$k)]} { return $look($@_class:$k) } else { foreach super [$@_class ancestors] { if {[info exists look($super:$k)]} {return $look($super:$k)} --- 1132,1142 ---- def* View unclick {x y f target} {} def View motion {x y f target} {} ! ! def* View look {k} { global look if {[info exists look($@_class:$k)]} { return $look($@_class:$k) } else { + foreach super [$@_class ancestors] { if {[info exists look($super:$k)]} {return $look($super:$k)} *************** *** 4778,4786 **** set x1 [format %0.f $x1];set y1 [format %0.f $y1] set x2 [format %0.f $x2];set y2 [format %0.f $y2] ! if {[$self look showcomp] <= 20} { ! set @height [$self look showcomp]} else {set @height 20} listbox $f -width $@width -height $@height -relief flat \ ! -bg [$self look bg] -selectbackground [$self look selectbg] \ ! -activestyle dotbox -selectforeground [$self look selectfg] -fg [$self look fg] $self fill_box [$@textbox get 1.0 1.end] $f configure -width $@width --- 4779,4788 ---- set x1 [format %0.f $x1];set y1 [format %0.f $y1] set x2 [format %0.f $x2];set y2 [format %0.f $y2] ! puts " --> [$canvas look showcomp] <--" ! if {[$canvas look showcomp] <= 20} { ! set @height [$canvas look showcomp]} else {set @height 20} listbox $f -width $@width -height $@height -relief flat \ ! -bg [$canvas look compbg] -selectbackground [$canvas look compselectbg] \ ! -activestyle dotbox -selectforeground [$canvas look compselectfg] -fg [$canvas look compfg] $self fill_box [$@textbox get 1.0 1.end] $f configure -width $@width *************** *** 5151,5159 **** set no_max_label 0 bind all <KeyPress-F1> help ! set @size [$self look fontsize] ! set @font [$self look fontfamily] ! set @style [$self look fontstyle] ! set @italic [$self look fontitalic] ! set @fstr [$self look fontstring] puts "font:: $@font | size::: $@size | style::: $@style | italic::: $@italic" set bold 0 --- 5153,5161 ---- set no_max_label 0 bind all <KeyPress-F1> help ! set @size $look(Thing:fontsize) ! set @font $look(Thing:fontfamily) ! set @style $look(Thing:fontstyle) ! set @italic $look(Thing:fontitalic) ! set @fstr $look(Thing:fontstring) puts "font:: $@font | size::: $@size | style::: $@style | italic::: $@italic" set bold 0 *************** *** 5169,5173 **** set fontlist [$f.font.list.box get 0 end] ! set find [lsearch $fontlist [$self look fontfamily]] if {$find < 0} {set find 0} $f.font.list.box selection set $find $find --- 5171,5175 ---- set fontlist [$f.font.list.box get 0 end] ! set find [lsearch $fontlist $@font] if {$find < 0} {set find 0} $f.font.list.box selection set $find $find

1 0

externals/iem/iemmatrix/doc mtx_conv-help.pd,1.1,1.2
by Franz Zotter 28 Aug '06

28 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20289/doc Modified Files: mtx_conv-help.pd Log Message: added a few element wise operations Index: mtx_conv-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/doc/mtx_conv-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mtx_conv-help.pd 23 Aug 2006 15:14:53 -0000 1.1 --- mtx_conv-help.pd 28 Aug 2006 16:48:51 -0000 1.2 *************** *** 9,14 **** filter matrix kernel (2 dimensional FIR filtering). Of course \, it can also be used for 1-dimensional FIR convolutions.; - #X obj 63 196 matrix 1 10; - #X msg 64 176 element 1 1 1; #X msg 42 127 bang; #X obj 42 151 t b b b; --- 9,12 ---- *************** *** 19,33 **** #X obj 200 217 mtx_print filter_kernel; #X obj 64 304 mtx_print result; ! #X msg 173 174 matrix 2 2 1 1 1 1; ! #X connect 7 0 11 0; ! #X connect 8 0 7 0; ! #X connect 9 0 10 0; ! #X connect 10 0 7 0; ! #X connect 10 1 8 0; ! #X connect 10 2 17 0; ! #X connect 11 0 13 0; ! #X connect 11 1 12 0; ! #X connect 13 0 16 0; ! #X connect 14 0 13 1; ! #X connect 14 1 15 0; ! #X connect 17 0 14 0; --- 17,33 ---- #X obj 200 217 mtx_print filter_kernel; #X obj 64 304 mtx_print result; ! #X msg 173 174 matrix 2 3 1 1 1 1 1 1 1; ! #X msg 64 176 element 4 4 1; ! #X obj 63 196 matrix 5 5; ! #X connect 7 0 8 0; ! #X connect 8 0 17 0; ! #X connect 8 1 16 0; ! #X connect 8 2 15 0; ! #X connect 9 0 11 0; ! #X connect 9 1 10 0; ! #X connect 11 0 14 0; ! #X connect 12 0 11 1; ! #X connect 12 1 13 0; ! #X connect 15 0 12 0; ! #X connect 16 0 17 0; ! #X connect 17 0 9 0;

1 0

externals/iem/iemmatrix/src mtx_atan.c, NONE, 1.1 mtx_dbtopow.c, NONE, 1.1 mtx_powtodb.c, NONE, 1.1 iemmatrix_sources.c, 1.8, 1.9 iemmatrix_sources.h, 1.8, 1.9
by Franz Zotter 28 Aug '06

28 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20289/src Modified Files: iemmatrix_sources.c iemmatrix_sources.h Added Files: mtx_atan.c mtx_dbtopow.c mtx_powtodb.c Log Message: added a few element wise operations Index: iemmatrix_sources.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_sources.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** iemmatrix_sources.c 25 Jul 2006 14:14:38 -0000 1.8 --- iemmatrix_sources.c 28 Aug 2006 16:48:51 -0000 1.9 *************** *** 11,14 **** --- 11,15 ---- iemtx_add_setup(); /* mtx_add.c */ iemtx_and_setup(); /* mtx_and.c */ + iemtx_atan_setup(); /* mtx_atan.c */ iemtx_binops_setup(); /* mtx_binops.c */ iemtx_bitand_setup(); /* mtx_bitand.c */ *************** *** 25,28 **** --- 26,30 ---- iemtx_cos_setup(); /* mtx_cos.c */ iemtx_cumsum_setup(); /* mtx_cumsum.c */ + iemtx_dbtopow_setup(); /* mtx_dbtopow.c */ iemtx_dbtorms_setup(); /* mtx_dbtorms.c */ iemtx_decay_setup(); /* mtx_decay.c */ *************** *** 52,57 **** iemtx_min2_setup(); /* mtx_min2.c */ iemtx_minmax_setup(); /* mtx_minmax.c */ - iemtx_mul__setup(); /* mtx_mul~.c */ iemtx_mul_setup(); /* mtx_mul.c */ iemtx_neq_setup(); /* mtx_neq.c */ iemtx_not_setup(); /* mtx_not.c */ --- 54,59 ---- iemtx_min2_setup(); /* mtx_min2.c */ iemtx_minmax_setup(); /* mtx_minmax.c */ iemtx_mul_setup(); /* mtx_mul.c */ + iemtx_mul__setup(); /* mtx_mul~.c */ iemtx_neq_setup(); /* mtx_neq.c */ iemtx_not_setup(); /* mtx_not.c */ *************** *** 60,63 **** --- 62,66 ---- iemtx_pivot_setup(); /* mtx_pivot.c */ iemtx_pow_setup(); /* mtx_pow.c */ + iemtx_powtodb_setup(); /* mtx_powtodb.c */ iemtx_print_setup(); /* mtx_print.c */ iemtx_prod_setup(); /* mtx_prod.c */ Index: iemmatrix_sources.h =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix_sources.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** iemmatrix_sources.h 25 Jul 2006 14:14:38 -0000 1.8 --- iemmatrix_sources.h 28 Aug 2006 16:48:51 -0000 1.9 *************** *** 9,12 **** --- 9,13 ---- void iemtx_add_setup(void); /* mtx_add.c */ void iemtx_and_setup(void); /* mtx_and.c */ + void iemtx_atan_setup(void); /* mtx_atan.c */ void iemtx_binops_setup(void); /* mtx_binops.c */ void iemtx_bitand_setup(void); /* mtx_bitand.c */ *************** *** 23,26 **** --- 24,28 ---- void iemtx_cos_setup(void); /* mtx_cos.c */ void iemtx_cumsum_setup(void); /* mtx_cumsum.c */ + void iemtx_dbtopow_setup(void); /* mtx_dbtopow.c */ void iemtx_dbtorms_setup(void); /* mtx_dbtorms.c */ void iemtx_decay_setup(void); /* mtx_decay.c */ *************** *** 50,55 **** void iemtx_min2_setup(void); /* mtx_min2.c */ void iemtx_minmax_setup(void); /* mtx_minmax.c */ - void iemtx_mul__setup(void); /* mtx_mul~.c */ void iemtx_mul_setup(void); /* mtx_mul.c */ void iemtx_neq_setup(void); /* mtx_neq.c */ void iemtx_not_setup(void); /* mtx_not.c */ --- 52,57 ---- void iemtx_min2_setup(void); /* mtx_min2.c */ void iemtx_minmax_setup(void); /* mtx_minmax.c */ void iemtx_mul_setup(void); /* mtx_mul.c */ + void iemtx_mul__setup(void); /* mtx_mul~.c */ void iemtx_neq_setup(void); /* mtx_neq.c */ void iemtx_not_setup(void); /* mtx_not.c */ *************** *** 58,61 **** --- 60,64 ---- void iemtx_pivot_setup(void); /* mtx_pivot.c */ void iemtx_pow_setup(void); /* mtx_pow.c */ + void iemtx_powtodb_setup(void); /* mtx_powtodb.c */ void iemtx_print_setup(void); /* mtx_print.c */ void iemtx_prod_setup(void); /* mtx_prod.c */ --- NEW FILE: mtx_powtodb.c --- /* * iemmatrix * * objects for manipulating simple matrices * mostly refering to matlab/octave matrix functions * * Copyright (c) IOhannes m zmölnig, forum::für::umläute * IEM, Graz, Austria * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. * */ #include "iemmatrix.h" #define LOGTEN 2.302585092994 /* mtx_powtodb: B=log(A); B[n,m]=e^A[n,m] */ static t_class *mtx_powtodb_class; static void mtx_powtodb_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv) { int row=atom_getfloat(argv++); int col=atom_getfloat(argv++); t_atom *m; int n = argc-2; if (argc<2){ post("mtx_powtodb: crippled matrix"); return; } if ((col<1)||(row<1)) { post("mtx_powtodb: invalid dimensions"); return; } if (col*row>argc-2){ post("sparse matrix not yet supported : use \"mtx_check\""); return; } adjustsize(&x->m, row, col); m = x->m.atombuffer+2; while(n--){ t_float f=atom_getfloat(argv++); t_float v=(f<0)?0.:(100+10./LOGTEN * log(f)); SETFLOAT(m, (v<0)?0:v); m++; } outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_powtodb_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc; t_atom *m; adjustsize(&x->m, 1, argc); m = x->m.atombuffer; while(n--){ t_float f=atom_getfloat(argv++); t_float v=(f<0)?0.:(100+10./LOGTEN * log(f)); SETFLOAT(m, (v<0)?0:v); m++; } outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer); } static void *mtx_powtodb_new(t_symbol *s) { /* element log */ t_matrix *x = (t_matrix *)pd_new(mtx_powtodb_class); outlet_new(&x->x_obj, 0); x->col = x->row = 0; x->atombuffer = 0; return(x); } void mtx_powtodb_setup(void) { mtx_powtodb_class = class_new(gensym("mtx_powtodb"), (t_newmethod)mtx_powtodb_new, (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); class_addmethod(mtx_powtodb_class, (t_method)mtx_powtodb_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_powtodb_class, mtx_powtodb_list); class_addbang (mtx_powtodb_class, mtx_binmtx_bang); } void iemtx_powtodb_setup(void) { mtx_powtodb_setup(); } --- NEW FILE: mtx_dbtopow.c --- /* * iemmatrix * * objects for manipulating simple matrices * mostly refering to matlab/octave matrix functions * * Copyright (c) IOhannes m zmölnig, forum::für::umläute * IEM, Graz, Austria * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. * */ #include "iemmatrix.h" #define LOGTEN 2.302585092994 /* mtx_dbtopow: B=log(A); B[n,m]=e^A[n,m] */ static t_class *mtx_dbtopow_class; static void mtx_dbtopow_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv) { int row=atom_getfloat(argv++); int col=atom_getfloat(argv++); t_atom *m; int n = argc-2; if (argc<2){ post("mtx_dbtopow: crippled matrix"); return; } if ((col<1)||(row<1)) { post("mtx_dbtopow: invalid dimensions"); return; } if (col*row>argc-2){ post("sparse matrix not yet supported : use \"mtx_check\""); return; } adjustsize(&x->m, row, col); m = x->m.atombuffer+2; while(n--){ t_float f=atom_getfloat(argv++); t_float v=0; f=(f>485)?485:f; v=(f<=0)?0:exp((LOGTEN*0.1) * (f-100.)); SETFLOAT(m, (v<0)?0:v); m++; } outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_dbtopow_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc; t_atom *m; adjustsize(&x->m, 1, argc); m = x->m.atombuffer; while(n--){ t_float f=atom_getfloat(argv++); t_float v=0; f=(f>485)?485:f; v=(f<=0)?0:exp((LOGTEN*0.1) * (f-100.)); SETFLOAT(m, (v<0)?0:v); m++; } outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer); } static void *mtx_dbtopow_new(t_symbol *s) { /* element log */ t_matrix *x = (t_matrix *)pd_new(mtx_dbtopow_class); outlet_new(&x->x_obj, 0); x->col = x->row = 0; x->atombuffer = 0; return(x); } void mtx_dbtopow_setup(void) { mtx_dbtopow_class = class_new(gensym("mtx_dbtopow"), (t_newmethod)mtx_dbtopow_new, (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); class_addmethod(mtx_dbtopow_class, (t_method)mtx_dbtopow_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_dbtopow_class, mtx_dbtopow_list); class_addbang (mtx_dbtopow_class, mtx_binmtx_bang); } void iemtx_dbtopow_setup(void) { mtx_dbtopow_setup(); } --- NEW FILE: mtx_atan.c --- /* * iemmatrix * * objects for manipulating simple matrices * mostly refering to matlab/octave matrix functions * * Copyright (c) IOhannes m zmölnig, forum::für::umläute * IEM, Graz, Austria * * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. * */ #include "iemmatrix.h" /* mtx_atan: B=atan(A); */ static t_class *mtx_atan_class; static void mtx_atan_matrix(t_mtx_binmtx *x, t_symbol *s, int argc, t_atom *argv) { int row=atom_getint(argv++); int col=atom_getint(argv++); t_atom *m; int n = row*col; if (argc<2){ post("mtx_atan: crippled matrix"); return; } if ((col<1)||(row<1)) { post("mtx_atan: invalid dimensions"); return; } if (col*row>argc-2){ post("sparse matrix not yet supported : use \"mtx_check\""); return; } adjustsize(&x->m, row, col); m = x->m.atombuffer+2; while(n--){ t_float f = atom_getfloat(argv++); SETFLOAT(m, (t_float)atanf(f)); m++; } outlet_anything(x->x_obj.ob_outlet, gensym("matrix"), argc, x->m.atombuffer); } static void mtx_atan_list(t_mtx_binscalar *x, t_symbol *s, int argc, t_atom *argv) { int n=argc; t_atom *m; adjustsize(&x->m, 1, argc); m = x->m.atombuffer; while(n--){ m->a_type = A_FLOAT; (m++)->a_w.w_float = (t_float)atanf(atom_getfloat(argv++)); } outlet_list(x->x_obj.ob_outlet, gensym("list"), argc, x->m.atombuffer); } static void *mtx_atan_new(t_symbol *s) { /* element atan */ t_matrix *x = (t_matrix *)pd_new(mtx_atan_class); outlet_new(&x->x_obj, 0); x->col = x->row = 0; x->atombuffer = 0; return(x); } void mtx_atan_setup(void) { mtx_atan_class = class_new(gensym("mtx_atan"), (t_newmethod)mtx_atan_new, (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); class_addmethod(mtx_atan_class, (t_method)mtx_atan_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_atan_class, mtx_atan_list); class_addbang (mtx_atan_class, mtx_binmtx_bang); } void iemtx_atan_setup(void) { mtx_atan_setup(); }

1 0

← Newer
1
2
3
4
5
6
7
8
...
47
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 August 2006