Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src/tests bof.pd,NONE,1.1.2.1
by Mathieu Bouchard 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24180 Added Files: Tag: devel_0_39 bof.pd Log Message: some test patch i've used lately --- NEW FILE: bof.pd --- #N canvas 0 0 675 450 10; #X obj 23 28 +; #X obj 35 206 adc~; #X obj 99 124 -; #X obj 142 214 * 42; #X msg 130 47 foo; #X msg 280 91 0; #X msg 280 70 set \$1; #X obj 280 46 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 0 0; #X obj 228 54 vsl 15 128 0 127 0 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 0 0; #X obj 254 64 vradio 15 1 0 8 empty empty empty 0 -6 0 8 -262144 -1 -1 0; #X connect 0 0 1 0; #X connect 0 0 2 1; #X connect 2 0 3 0; #X connect 4 0 2 0; #X connect 6 0 5 0; #X connect 7 0 6 0;

1 0

externals/aalex matches-help.pd, 1.1.1.1, NONE matches.c, 1.1.1.1, NONE
by Alexandre Quessy 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/externals/aalex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20309 Removed Files: matches-help.pd matches.c Log Message: removed matches because its name changed for pcre --- matches.c DELETED --- --- matches-help.pd DELETED ---

1 0

externals/aalex markov-machine-help.pd, NONE, 1.1 markov-machine.pd, NONE, 1.1
by Alexandre Quessy 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/externals/aalex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19502 Added Files: markov-machine-help.pd markov-machine.pd Log Message: Adding the markov machine abstraction. --- NEW FILE: markov-machine-help.pd --- #N canvas 290 25 528 547 10; #X text 132 380 current state; #X msg 221 149 size 4; #X obj 138 111 t b b b b b; #X msg 221 170 row 1 1 2 3 4; #X obj 88 331 markov-machine 4; #X text 60 9 States are numbered from 1 to n.; #X text 283 147 Already implied by argument.; #X msg 215 192 row 2 4 3 2 1; #X msg 220 215 row 3 200 300 4000 0; #X msg 220 238 row 4 1 1 1 1; #X text 337 240 Equal chances; #X obj 4 153 cnv 15 50 50 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 86 60 cnv 15 50 50 empty empty empty 20 12 0 14 -258699 -66577 0; #X msg 18 165 next; #X msg 91 66 bang; #X obj -34 245 cnv 15 50 50 empty empty empty 20 12 0 14 -258699 -66577 0; #X msg -30 257 set 1; #X text 92 43 1 Setup; #X text 4 133 2 Get state; #X text -34 225 3 Set state; #X msg 276 294 content; #X obj -40 -118 cnv 15 450 125 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 277 -17 iemmatrix; #X obj 370 -17 zexy; #X text -26 -117 )c( Copyleft 2006 Alexandre Quessy http://alexandre.quessy.net/ ; #X text 71 -16 Using -lib iemmatrix \, zexy; #X text 374 -134 ABOUT; #X obj 138 87 loadbang; #X text 210 331 A four states weighted FSM; #X obj 88 364 nbx 1 28 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 24 -258699 -1 -1 0 256; #X text -26 -86 [markov-machine] is a weighted finite states machine using an adjacency matrix for storing probabilities to obtain every other state next \, It can be illustrated as an oriented graph. Probabilities are calculated on the sum of each numbers or every row.; #X connect 1 0 4 0; #X connect 2 0 9 0; #X connect 2 1 8 0; #X connect 2 2 7 0; #X connect 2 3 3 0; #X connect 2 4 1 0; #X connect 3 0 4 0; #X connect 4 0 29 0; #X connect 7 0 4 0; #X connect 8 0 4 0; #X connect 9 0 4 0; #X connect 13 0 4 0; #X connect 14 0 2 0; #X connect 16 0 4 0; #X connect 20 0 4 0; #X connect 27 0 2 0; --- NEW FILE: markov-machine.pd --- #N canvas 637 33 900 932 10; #X obj 93 -33 inlet; #X obj 154 644 cnv 15 600 200 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 407 257 cnv 15 200 300 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 97 351 cnv 15 200 150 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 130 110 cnv 15 200 150 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 179 155 matrix; #X obj 225 115 prepend row; #X msg 139 119 zeros \$1; #X obj 18 23 loadbang; #X obj 20 50 f \$1; #X obj 111 396 f; #X text 138 398 current state; #X obj 12 755 outlet; #X obj 456 325 drip; #X obj 495 326 sum; #X obj 469 403 /; #X obj 159 456 random 1e+06; #X obj 159 480 / 1e+06; #X text 218 482 1/1000000; #X msg 574 339 set; #X msg 443 485 0.4 0.7 0.9 1; #X msg 468 430 add2 \$1; #X msg 409 351 bang; #X obj 177 704 moses; #X obj 223 706 moses; #X obj 271 706 moses; #X obj 317 708 moses; #X obj 364 708 moses; #X obj 410 710 moses; #X obj 458 710 moses; #X obj 504 712 moses; #X obj 546 713 moses; #X obj 589 713 moses; #X obj 635 715 moses; #X obj 677 716 moses; #X obj 292 661 unpack f f f f f f f f f f f f f f; #X obj 178 819 f; #X obj 159 428 t b f; #X msg 245 418 row \$1; #X text 207 822 next state; #X obj 16 694 f; #X obj 12 292 t b f; #X text 54 288 sets state; #X obj 67 311 t b b; #X text 109 309 gets next state; #X text 452 515 threshold (n/1.0) for each state according to its probability ; #X text 20 -5 arg: size; #X obj 453 364 +; #X msg 530 329 0; #X obj 451 274 t b a a b b; #X obj 518 373 f; #X text 509 402 Each treshold is added to all the numbers before... ; #X obj 161 250 mtx_print; #X obj 267 195 print debug; #X msg 178 733 1; #X msg 226 731 2; #X msg 266 734 3; #X msg 323 735 4; #X msg 365 737 5; #X msg 415 734 6; #X msg 453 738 7; #X msg 509 740 8; #X msg 551 742 9; #X msg 599 740 10; #X msg 639 743 11; #X msg 695 745 12; #X obj 145 359 loadbang; #X msg 144 378 1; #X obj 160 193 route matrix; #X obj 160 229 prepend matrix; #X text 667 624 MARKOV CHAIN; #X text 427 242 WEIGHTS FOR THIS ROW/STATE; #X text 260 332 STATE; #X text 219 90 ADJACENCY MATRIX; #X obj 423 -27 cnv 15 450 125 empty empty empty 20 12 0 14 -258699 -66577 0; #X obj 706 74 iemmatrix; #X obj 799 74 zexy; #N canvas 0 0 485 139 todo 0; #N canvas 0 0 450 300 1008-dynamic 0; #X restore 69 65 pd \$0-dynamic; #X text 67 43 todo: dynamic patching for unlimited number of states ; #X text 67 93 todo: use [list] and not dynamic messages (faster?); #X restore 775 -20 pd todo; #X text 437 -26 )c( Copyleft 2006 Alexandre Quessy http://alexandre.quessy.net/ ; #X text 500 75 Using -lib iemmatrix \, zexy; #X text 435 18 [markov-machine] is a weighted finite states machine using an adjency matrix for storing probabilities to get to each other state \, It can be illustrated as an oriented graph.; #X text 837 -43 ABOUT; #X msg 23 126 bang; #X obj 93 -7 route size row next set content; #X obj 261 25 t b; #X connect 0 0 83 0; #X connect 5 0 68 0; #X connect 6 0 5 0; #X connect 7 0 5 0; #X connect 8 0 9 0; #X connect 9 0 7 0; #X connect 10 0 37 0; #X connect 10 0 40 1; #X connect 13 0 47 0; #X connect 14 0 15 1; #X connect 15 0 21 0; #X connect 16 0 17 0; #X connect 17 0 23 0; #X connect 19 0 20 0; #X connect 20 0 35 0; #X connect 21 0 20 0; #X connect 22 0 20 0; #X connect 23 0 54 0; #X connect 23 1 24 0; #X connect 24 0 55 0; #X connect 24 1 25 0; #X connect 25 0 56 0; #X connect 25 1 26 0; #X connect 26 0 57 0; #X connect 26 1 27 0; #X connect 27 0 28 0; #X connect 27 0 58 0; #X connect 28 0 59 0; #X connect 28 1 29 0; #X connect 29 0 60 0; #X connect 29 1 30 0; #X connect 30 0 61 0; #X connect 30 1 31 0; #X connect 31 0 62 0; #X connect 31 1 32 0; #X connect 32 0 63 0; #X connect 32 1 33 0; #X connect 33 0 64 0; #X connect 33 1 34 0; #X connect 34 0 65 0; #X connect 35 0 23 1; #X connect 35 1 24 1; #X connect 35 2 25 1; #X connect 35 3 26 1; #X connect 35 4 27 1; #X connect 35 5 28 1; #X connect 35 7 29 1; #X connect 35 9 30 1; #X connect 35 10 31 1; #X connect 35 11 32 1; #X connect 35 12 33 1; #X connect 35 13 34 1; #X connect 36 0 10 1; #X connect 37 0 16 0; #X connect 37 1 38 0; #X connect 38 0 5 0; #X connect 40 0 12 0; #X connect 41 0 40 0; #X connect 41 1 10 0; #X connect 43 0 40 0; #X connect 43 1 10 0; #X connect 47 0 50 0; #X connect 48 0 47 1; #X connect 49 0 22 0; #X connect 49 1 13 0; #X connect 49 2 14 0; #X connect 49 3 48 0; #X connect 49 4 19 0; #X connect 50 0 47 1; #X connect 50 0 15 0; #X connect 54 0 36 0; #X connect 55 0 36 0; #X connect 56 0 36 0; #X connect 57 0 36 0; #X connect 58 0 36 0; #X connect 59 0 36 0; #X connect 60 0 36 0; #X connect 61 0 36 0; #X connect 62 0 36 0; #X connect 63 0 36 0; #X connect 64 0 36 0; #X connect 65 0 36 0; #X connect 66 0 67 0; #X connect 67 0 10 1; #X connect 68 1 49 0; #X connect 69 0 52 0; #X connect 82 0 5 0; #X connect 83 0 7 0; #X connect 83 1 6 0; #X connect 83 2 43 0; #X connect 83 3 41 0; #X connect 83 4 84 0; #X connect 84 0 5 0;

1 0

pd/src desire.tk,1.1.2.352,1.1.2.353
by Mathieu Bouchard 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23424 Modified Files: Tag: devel_0_39 desire.tk Log Message: clickedit,unclickedit,motionedit are dead (merged) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.352 retrieving revision 1.1.2.353 diff -C2 -d -r1.1.2.352 -r1.1.2.353 *** desire.tk 16 Aug 2006 18:08:11 -0000 1.1.2.352 --- desire.tk 16 Aug 2006 18:24:34 -0000 1.1.2.353 *************** *** 1001,1010 **** def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def* View click {x y f target} {} ;# being clicked in run mode ! def* View clickedit {x y f target} {} ;# being clicked in edit mode ! def* View unclick {x y f target} {} ;# being unclicked in run mode ! def* View unclickedit {x y f target} {} ;# being unclicked in edit mode ! def View motionedit {x y f target} {} ;# mouse motion in edit mode ! def View motion {x y f target} {} ;# mouse motion in run mode def View init {} { --- 1001,1007 ---- 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 init {} { *************** *** 2285,2291 **** #!@#$ this method is too long ! # this method receives (x,y) in descaled coords ! def* Canvas clickedit {x y f target} { ! set c .[$self canvas].c mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} --- 2282,2296 ---- #!@#$ this method is too long ! def* Canvas click {x y f target} { ! if {[winfo exists .completion]} { ! raise .completion ! focus .completion.comp ! return ! } ! set c .$self.c ! focus $c ! set @click_at [list $x $y] ! if {!$@editmode} {if {[llength $id]} {$id click $x $y $f $target}; return} ! mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} *************** *** 2345,2382 **** } ! def* Canvas click {x y f target} { ! if {[winfo exists .completion]} { ! raise .completion ! focus .completion.comp ! return ! } ! set c .$self.c ! focus $c ! set @click_at [list $x $y] ! #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return} ! if {$@editmode} {$self clickedit $x $y $f $target; return} ! mset {type id detail} $target ! if {[llength $id]} {$id click $x $y $f $target} ! } ! ! def* Canvas unclickedit {x y f target} { set c .$self.c mset {type id detail} $target - switch $@action { - edit {set @obj_in_edit $id; $id edit} - move { - foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} - set objs $@selection - $@history add [list $self undomove $objs] - set @action none - } - none {} - default {$@action unclick $x $y $f $target} - } - } - - def* Canvas unclick {x y f target} { if {$@editmode} { ! $self unclickedit $x $y $f $target } else { if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} --- 2350,2368 ---- } ! def* Canvas unclick {x y f target} { set c .$self.c mset {type id detail} $target if {$@editmode} { ! switch $@action { ! edit {set @obj_in_edit $id; $id edit} ! move { ! foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} ! set objs $@selection ! $@history add [list $self undomove $objs] ! set @action none ! } ! none {} ! default {$@action unclick $x $y $f $target} ! } } else { if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} *************** *** 3207,3214 **** } - def BlueBox motionedit {x y f target} { - #puts "motions in $self in edit mode" - } - def BlueBox popup_properties {} {IEMPropertiesDialog new $self} --- 3193,3196 ----

1 0

pd/src desire.tk,1.1.2.351,1.1.2.352
by Mathieu Bouchard 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17091 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed Radio and multiple tags Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.351 retrieving revision 1.1.2.352 diff -C2 -d -r1.1.2.351 -r1.1.2.352 *** desire.tk 16 Aug 2006 17:50:47 -0000 1.1.2.351 --- desire.tk 16 Aug 2006 18:08:11 -0000 1.1.2.352 *************** *** 1018,1025 **** } ! def View item {suffix type coords args} { global font set c .$(a)canvas.c - set ss $self$suffix set scale [$@canvas scale] set coords [lmap * $coords $scale] --- 1018,1024 ---- } ! def View item {suffixes type coords args} { global font set c .$(a)canvas.c set scale [$@canvas scale] set coords [lmap * $coords $scale] *************** *** 1039,1045 **** } } ! if {![llength [$c gettags $ss]]} { ! eval [concat [list $c create $type $coords -tags "$ss $self"] $args] } { eval [concat [list $c itemconfigure $ss] $args] --- 1038,1047 ---- } } ! ! set tags {} ! foreach s $suffixes {lappend tags "$self$s"} ! set ss [lindex $tags 0] if {![llength [$c gettags $ss]]} { ! eval [concat [list $c create $type $coords -tags $tags] $args] } { eval [concat [list $c itemconfigure $ss] $args] *************** *** 1056,1060 **** def View delete {} {$self _delete} ! def* View _delete {} {$self erase; io_erase $self} def* View erase {} {$self item_delete} def View selected? {} {return $@selected?} --- 1058,1062 ---- def View delete {} {$self _delete} ! def* View _delete {} {$self erase} def* View erase {} {$self item_delete} def View selected? {} {return $@selected?} *************** *** 1533,1547 **** set onset [expr $x1 + ($xs-([look iowidth])) * $i / $nplus] set points [list [expr $onset] [expr $y-1] [expr $onset+[look iowidth]] $y] - #will update this code when proc item deals with mult.tags - #if {[llength [$c gettags $self$which$i]] != 0} { - # $c coords ${self}$which$i $points - #} { - # $c create rectangle $points -tags "$self$which $self$which$i $self" \ - # -outline [switch $which { i {concat [look inletfg]} o {concat [look outletfg]}}] - #} - switch $which { i {set color [look inletfg]} o {set color [look outletfg]}} ! $self item $which$i rectangle $points -outline $color -fill $color -tags "$self$which $self$which$i $self" ! } } --- 1535,1540 ---- set onset [expr $x1 + ($xs-([look iowidth])) * $i / $nplus] set points [list [expr $onset] [expr $y-1] [expr $onset+[look iowidth]] $y] switch $which { i {set color [look inletfg]} o {set color [look outletfg]}} ! $self item [list $which$i $which] rectangle $points -outline $color -fill $color } } *************** *** 1554,1559 **** } - def io erase {} {.$(a)canvas.c delete ${self}i ${self}o} - #-----------------------------------------------------------------------------------# class_new TextBox {Box} --- 1547,1550 ---- *************** *** 1978,1989 **** default {$@action motion $x $y $f $target} } ! switch $type { ! inlet {set port [$id hilite_io i $x $y]; set @dehighlight [list $c delete ${id}i${port}b]} ! outlet {set port [$id hilite_io o $x $y]; set @dehighlight [list $c delete ${id}o${port}b]} ! object { ! #if {$@editmode} {set event motionedit} {set event motion} ! #$id $event $x $y $f $target } - wire {} } } --- 1969,1977 ---- default {$@action motion $x $y $f $target} } ! if {$@editmode} { ! switch $type { ! inlet {set port [$id hilite_io i $x $y]; set @dehighlight [list $c delete ${id}i${port}b]} ! outlet {set port [$id hilite_io o $x $y]; set @dehighlight [list $c delete ${id}o${port}b]} } } } *************** *** 2357,2361 **** } - # should be renamed to "click" when the other "click" becomes unneeded. def* Canvas click {x y f target} { if {[winfo exists .completion]} { --- 2345,2348 ---- *************** *** 2370,2379 **** if {$@editmode} {$self clickedit $x $y $f $target; return} mset {type id detail} $target ! if {![llength $id]} {return} ! switch $type { ! object {$id click $x $y $f $target} ! wire {$id click $x $y $f $target} ! default {error BORK} ! } } --- 2357,2361 ---- if {$@editmode} {$self clickedit $x $y $f $target; return} mset {type id detail} $target ! if {[llength $id]} {$id click $x $y $f $target} } *************** *** 3812,3817 **** super for {set i 0} {$i<$@n} {incr i} { ! #fixme: item doesn't support multiple tags yet ! $self item "BUT$i BUT" rectangle \ [list [expr $x1+3] [expr $y1+3] [expr $x1+$@w-3] [expr $y1+$@w-3]] \ -fill #ffffff -outline #000000 --- 3794,3798 ---- super for {set i 0} {$i<$@n} {incr i} { ! $self item [list BUT$i BUT] rectangle \ [list [expr $x1+3] [expr $y1+3] [expr $x1+$@w-3] [expr $y1+$@w-3]] \ -fill #ffffff -outline #000000

1 0

pd/src desire.tk,1.1.2.350,1.1.2.351
by Mathieu Bouchard 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10760 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed slider rendering: out of bounds values; zoom. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.350 retrieving revision 1.1.2.351 diff -C2 -d -r1.1.2.350 -r1.1.2.351 *** desire.tk 16 Aug 2006 15:56:48 -0000 1.1.2.350 --- desire.tk 16 Aug 2006 17:50:47 -0000 1.1.2.351 *************** *** 1945,1949 **** #!@#$ this method is too long ! def* Canvas motion {x y f target} { global font canvas tooltip crosshair set canvas(current) $self --- 1945,1949 ---- #!@#$ this method is too long ! def Canvas motion {x y f target} { global font canvas tooltip crosshair set canvas(current) $self *************** *** 1976,1983 **** } none {} ! #default {error "unknown action '$@action'"} ! default { ! $@action motion $x $y $f $target ! } } switch $type { --- 1976,1980 ---- } none {} ! default {$@action motion $x $y $f $target} } switch $type { *************** *** 2010,2013 **** --- 2007,2011 ---- # now it's same priority, so just stacking order (and it's prolly wrong) set class [$id _class] + if {[$self == $id]} {continue} if {[$class inherit? Wire]} {return [list "wire" $id]} if {[$class inherit? Box]} { *************** *** 2277,2281 **** foreach tag $sel { if {[regexp {^[xz]?[0-9a-f]{6,8}} [$c gettags $tag] id]} { ! if {$@canvas == $id} {continue} switch $_($id:_class) { SelRect {} --- 2275,2279 ---- foreach tag $sel { if {[regexp {^[xz]?[0-9a-f]{6,8}} [$c gettags $tag] id]} { ! if {[$@canvas == $id]} {continue} switch $_($id:_class) { SelRect {} *************** *** 3860,3864 **** } ! def* Slider draw {} { mset {x1 y1 x2 y2} [$self bbox] set xs $@w --- 3858,3883 ---- } ! def Slider draw_knob {} { ! mset {x1 y1 x2 y2} [$self bbox] ! set l [expr [$self orient]?$@h:$@w] ! set span [expr $@max-$@min] ! set color [bluify #ffffff] ! if {[$self orient]} { ! set size $@w ! set y1 [expr $y1+$@h-$@value*($l-1)/$span-2] ! set y2 [expr $y1-2] ! set coords [list [expr $x1+2] $y1 [expr $x1+$size-2] $y2] ! } { ! set size $@h ! set x1 [expr $x1+$@value*($l-1)/$span] ! set x2 [expr $x1+2] ! set y2 [expr $y1+$size] ! set coords [list $x1 [expr $y1+2] $x2 [expr $y1+$size-2]] ! } ! $self item KNOB rectangle $coords \ ! -outline red -fill [darker $color] ! } ! ! def Slider draw {} { mset {x1 y1 x2 y2} [$self bbox] set xs $@w *************** *** 3870,3895 **** set outs [expr [string compare $@snd empty]==0] super ! set color [bluify #ffffff] ! $self item KNOB rectangle [list $x1 $y1 [expr $x1 + 10] [expr $y1 + 10]] \ ! -outline red -fill [darker $color] ! set c .$(a)canvas.c ! set span [expr $@max-$@min] ! set l [expr $orient?$@h:$@w] #set value [expr $@val*$span/($l-1)/100] ! #set value $@value ! set value $@val ! set @value $value ! if {$orient} { ! set size $xs ! set y1 [expr $y1+$ys-$value*($l-1)/$span-2] ! set y2 [expr $y1-2] ! $c coords ${self}KNOB [expr $x1+2] $y1 [expr $x1+$size-2] $y2 ! } { ! set size $ys ! set x1 [expr $x1+$value*($l-1)/$span] ! set x2 [expr $x1+2] ! set y2 [expr $y1+$size] ! $c coords ${self}KNOB $x1 [expr $y1+2] $x2 [expr $y1+$size-2] ! } } --- 3889,3896 ---- set outs [expr [string compare $@snd empty]==0] super ! $self draw_knob #set value [expr $@val*$span/($l-1)/100] ! # why is there both @val and @value again? ! set @value $@val } *************** *** 3908,3917 **** set coords [list $x1 $y3 [expr $x1+$xs] $y3] } ! $@canvas create line $coords -dash [list 1 $eighth 1 $eighth] -width $thick -fill [darker [look sliderbg]] } def Slider click {x y f target} { $@canvas focus= $self ! set @first [list $x $y] set @ovalue $@value set @clicking 1 --- 3909,3918 ---- set coords [list $x1 $y3 [expr $x1+$xs] $y3] } ! $@canvas item NOTCH $coords -dash [list 1 $eighth 1 $eighth] -width $thick -fill [darker [look sliderbg]] } def Slider click {x y f target} { $@canvas focus= $self ! set @click_at [list $x $y] set @ovalue $@value set @clicking 1 *************** *** 3921,3929 **** def Slider unclick {x y f target} { set @clicking 0 ! if {[lindex $@first 1] != $y} { $@canvas focus= "" $self draw pd .$self float $@value - } } --- 3922,3929 ---- def Slider unclick {x y f target} { set @clicking 0 ! if {[lindex $@click_at 1] != $y} { $@canvas focus= "" $self draw pd .$self float $@value } } *************** *** 3932,3944 **** set focused [$self == [$@canvas focus]] if {!$focused} {return} ! set dx [expr $x-[lindex $@first 0]] ! set dy [expr $y-[lindex $@first 1]] set orient [$self orient] set span [expr $@max-$@min] ! set l [expr $orient?$@h:$@w] set d [expr ($orient?-$dy:$dx)*$span/($l+0.0)] ! set @value [expr $@ovalue+$d*$@rate] ! puts "slider value ----------------- $@value" ! puts "max ::: $@max ---------- min ::: $@min" pd .$self float $@value } --- 3932,3943 ---- set focused [$self == [$@canvas focus]] if {!$focused} {return} ! mset {clx cly} $@click_at ! set dx [expr $x-$clx] ! set dy [expr $y-$cly] set orient [$self orient] set span [expr $@max-$@min] ! set l [expr ($orient?$@h:$@w)] set d [expr ($orient?-$dy:$dx)*$span/($l+0.0)] ! set @value [min $@max [max $@min [expr $@ovalue+$d*$@rate]]] pd .$self float $@value } *************** *** 3954,3960 **** set ly [expr $y1+$@ldy] set label $@lab; switch -- $label { empty { set label "" }} ! set lfont [list \ ! [lindex {courier helvetica times} $@fstyle] \ ! $@fs bold] set lcolor [parse_color $@lcol] $self item LABEL text [list $lx $ly] -text $label -anchor w -font $lfont -fill $lcolor --- 3953,3957 ---- set ly [expr $y1+$@ldy] set label $@lab; switch -- $label { empty { set label "" }} ! set lfont [list [lindex {courier helvetica times} $@fstyle] $@fs bold] set lcolor [parse_color $@lcol] $self item LABEL text [list $lx $ly] -text $label -anchor w -font $lfont -fill $lcolor *************** *** 4437,4441 **** } ! def* Canvas hide_crosshair {} { .$self.c delete ${self}VHAIR1 ${self}HHAIR1 ${self}VHAIR2 ${self}HHAIR2 ${self}EYE } --- 4434,4438 ---- } ! def Canvas hide_crosshair {} { .$self.c delete ${self}VHAIR1 ${self}HHAIR1 ${self}VHAIR2 ${self}HHAIR2 ${self}EYE }

1 0

pd/src desire.c,1.1.2.102,1.1.2.103
by Mathieu Bouchard 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2365 Modified Files: Tag: devel_0_39 desire.c Log Message: messagebox: added support for addcomma, addsemi, adddollar, adddollarsym. messagebox: update gui when content is changed by messages. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.102 retrieving revision 1.1.2.103 diff -C2 -d -r1.1.2.102 -r1.1.2.103 *** desire.c 13 Aug 2006 05:00:34 -0000 1.1.2.102 --- desire.c 16 Aug 2006 17:28:43 -0000 1.1.2.103 *************** *** 140,148 **** t_appendix *d = self->g_adix; int i; if (!d) {post("gobj_changed3: no appendix in %p",self); return;} for (i=0; i<d->nobs; i++) { t_gobj *obs = d->obs[i]; t_notice ice = obs->g_pd->c_notice; - //printf("obs=%lx\n",(long)obs); if (ice) ice(obs,origin,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); --- 140,148 ---- t_appendix *d = self->g_adix; int i; + //printf("gobj_changed3 self=%lx origin=%lx\n",(long)self,(long)origin); if (!d) {post("gobj_changed3: no appendix in %p",self); return;} for (i=0; i<d->nobs; i++) { t_gobj *obs = d->obs[i]; t_notice ice = obs->g_pd->c_notice; if (ice) ice(obs,origin,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); *************** *** 298,302 **** canvas_list = x; if (x->gl_havewindow || x->gl_willvis) { - post("subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); gobj_changed(x,0); --- 298,301 ---- *************** *** 855,859 **** canvas_reflecttitle(x); x->gl_havewindow = 1; - post("******subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); gobj_changed(x,0); --- 854,857 ---- *************** *** 862,867 **** int i; t_canvas *x2; ! post("subscribe %lx",(long)x); ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); if (!x->gl_havewindow) { /* bug workaround -- a graph in a visible patch gets "invised" --- 860,864 ---- int i; t_canvas *x2; ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); /* why this, if it's supposed to be invisible? */ if (!x->gl_havewindow) { /* bug workaround -- a graph in a visible patch gets "invised" *************** *** 877,883 **** if (glist_isvisible(x)) canvas_map(x, 0); canvas_create_editor(x, 0); - sys_vgui("destroy .x%lx\n", (long)x); // huh? i=1; for (x2=x; x2; x2=x2->gl_next) i++; - sys_vgui(".mbar.find delete %d\n", i); // huh??? /* if we're a graph on our parent, and if the parent exists and is visible, show ourselves on parent. */ --- 874,878 ---- *************** *** 5083,5086 **** --- 5078,5082 ---- if (rt) rtext_retext(rt); + gobj_changed(y,0); } } *************** *** 10829,10832 **** --- 10825,10860 ---- } + static void message_addcomma(t_message *x) + { + t_atom a; + SETCOMMA(&a); + binbuf_add(x->m_text.te_binbuf, 1, &a); + glist_retext(x->m_glist, &x->m_text); + } + + static void message_addsemi(t_message *x) + { + message_add(x, 0, 0, 0); + } + + static void message_adddollar(t_message *x, t_floatarg f) + { + t_atom a; + int n = f; + if (n < 0) + n = 0; + SETDOLLAR(&a, n); + binbuf_add(x->m_text.te_binbuf, 1, &a); + glist_retext(x->m_glist, &x->m_text); + } + + 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); + glist_retext(x->m_glist, &x->m_text); + } + void canvas_msg(t_glist *gl, t_symbol *s, int argc, t_atom *argv) { *************** *** 11275,11278 **** --- 11303,11307 ---- str[argc-1]=0; text_setto(o,x,str,argc-1); + gobj_changed(x,0); } *************** *** 11327,11330 **** --- 11356,11363 ---- class_addmethod3(c, message_add, "add","*"); class_addmethod3(c, message_add2,"add2","*"); + class_addmethod3(c, message_addcomma, "addcomma", ""); + class_addmethod3(c, message_addsemi, "addsemi", ""); + class_addmethod3(c, message_adddollar, "adddollar", "f"); + class_addmethod3(c, message_adddollsym, "adddollsym","s"); c = gatom_class = class_new(gensym("gatom"), 0, (t_method)gatom_free,

1 0

pd/src desire.tk,1.1.2.349,1.1.2.350
by chunlee 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv949 Modified Files: Tag: devel_0_39 desire.tk Log Message: trivial commits of the progress in canvas key_nav bind arrows to the xy scrollbars of the canvas Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.349 retrieving revision 1.1.2.350 diff -C2 -d -r1.1.2.349 -r1.1.2.350 *** desire.tk 16 Aug 2006 12:22:38 -0000 1.1.2.349 --- desire.tk 16 Aug 2006 15:56:48 -0000 1.1.2.350 *************** *** 2437,2443 **** } wire { ! set wire_sel [lindex $@wires 0] $wire_sel selected?= 1 ! set @keynav_current $wire_sel set @selection_wire $@keynav_current } --- 2437,2444 ---- } wire { ! #set wire_sel [lindex $@wires 0] ! set wire_sel [lindex $_($@keynav_current:wires) $@jump] $wire_sel selected?= 1 ! set @keynav_current_wire $wire_sel set @selection_wire $@keynav_current } *************** *** 2474,2521 **** object { set @keynav_next [$self quadrant $du $dv $@children] } wire { ! set @keynav_next [$self quadrant $du $dv $@wires] ! #set find [lsearch $@wires $@keynav_current] ! #set all [lreplace $@wires $find $find] ! #mset {x1 y1 x2 y2} [$@keynav_current bbox] ! #set obj1 $_($@keynav_current:obj1) ! #set inlets [$obj1 ninlets] ! #set outlets [$obj1 noutlets] ! #set outlet_wire {} ! #set inlet_wire {} ! #for {set i 0} {$i<$outlets} {incr i} {lappend outlet_wire $i} ! #for {set i 0} {$i<$inlets} {incr i} {lappend inlet_wire $i} ! #puts "outlet_wire::: $outlet_wire" ! #puts "inlet_wire::: $inlet_wire" ! #puts "wire $@keynav_current comes from $obj1" ! ! #puts "and it has wires::: $_($obj1:wires)" ! #foreach wire $_($obj1:wires) { ! # set wire_info [$wire report] ! # set find [lsearch $wire_info $obj1] ! # if {$find == 0} { ! # set new [linsert [lindex $outlet_wire [lindex $wire_info 1]] 0 $wire] ! # set outlet_wire [lreplace $outlet_wire [lindex $wire_info 1] [lindex $wire_info 1] $new] ! # } else { ! # set new [linsert [lindex $inlet_wire [lindex $wire_info 3]] 0 $wire] ! # set inlet_wire [lreplace $inlet_wire [lindex $wire_info 3] [lindex $wire_info 3] $new] ! # } ! #} ! #puts "outlet_wire::: $outlet_wire" ! #puts "inlet_wire::: $inlet_wire" } } ! if {!$shift} { ! #set find [lsearch $@selection $@keynav_current] ! #set @selection [lreplace $@selection $find $find] ! $self selection-= $@keynav_current ! $@keynav_current selected?= 0 } ! if {[lsearch $@selection $@keynav_next] < 0} {lappend @selection $@keynav_next} ! $@keynav_next selected?= 1 ! set @keynav_current $@keynav_next } --- 2475,2555 ---- object { set @keynav_next [$self quadrant $du $dv $@children] + set @keynav_active_obj $@keynav_next + + if {!$shift} { + $self selection-= $@keynav_current + $@keynav_current selected?= 0 + } + if {[lsearch $@selection $@keynav_next] < 0} {lappend @selection $@keynav_next} + $@keynav_next selected?= 1 + set @keynav_current $@keynav_next } wire { ! $@keynav_current_wire selected?= 0 ! #set @keynav_next [$self quadrant $du $dv $@wires] ! #$self find_neighbor_wire $du $dv ! #set obj1 $_($@keynav_current:obj1) ! if {$@jump >= [llength $_($@keynav_current:wires)]} {set @jump 0} ! puts " jump::$@jump" ! set @keynav_current_wire [lindex $_($@keynav_current:wires) $@jump] ! incr @jump ! $@keynav_current_wire selected?= 1 ! puts "$@keynav_current" ! ! puts "$_($@keynav_current:wires)" ! #set @keynav_next [$self quadrant $du $dv $wires] ! } } ! #if {!$shift} { ! # $self selection-= $@keynav_current ! # $@keynav_current selected?= 0 ! #} ! #if {[lsearch $@selection $@keynav_next] < 0} {lappend @selection $@keynav_next} ! #$@keynav_next selected?= 1 ! #set @keynav_current $@keynav_next ! } ! ! def Canvas find_neighbor_wire {du dv} { ! set find [lsearch $@wires $@keynav_current] ! set all [lreplace $@wires $find $find] ! mset {x1 y1 x2 y2} [$@keynav_current bbox] ! set obj1 $_($@keynav_current:obj1) ! set inlets [$obj1 ninlets] ! set outlets [$obj1 noutlets] ! set outlet_wires {} ! set inlet_wires {} ! #stores all wires connected to the object and their coords ! set wires_coords {} ! set outport $_($@keynav_current:port1) ! set inport $_($@keynav_current:port2) ! for {set i 0} {$i<$outlets} {incr i} {lappend outlet_wires $i} ! for {set i 0} {$i<$inlets} {incr i} {lappend inlet_wires $i} ! puts "wire $@keynav_current comes from $obj1 of outlet $outport" ! ! puts "and it has wires::: $_($obj1:wires)" ! foreach wire $_($obj1:wires) {lappend wires_coords $wire} ! for {set i 0} {$i < [llength $wires_coords]} {incr i} { ! lset wires_coords $i [list [lindex $wires_coords $i] [[lindex [lindex $wires_coords $i] 0] bbox]] } ! puts "wires_coords::: $wires_coords" ! ! #foreach wire $_($obj1:wires) { ! # set wire_info [$wire report] ! # set find [lsearch $wire_info $obj1] ! # if {$find == 0} { ! # set new [linsert [lindex $outlet_wires [lindex $wire_info 1]] end $wire] ! # set outlet_wires [lreplace $outlet_wires [lindex $wire_info 1] [lindex $wire_info 1] $new] ! # } else { ! # set new [linsert [lindex $inlet_wires [lindex $wire_info 3]] end $wire] ! # set inlet_wires [lreplace $inlet_wires [lindex $wire_info 3] [lindex $wire_info 3] $new] ! # } ! #} ! # ! # if {[llength [lindex $outlet_wires $outport]] > 2} {puts " this outlet has other wires"} ! # puts "outlet_wires::: $outlet_wires" ! # puts "inlet_wires::: $inlet_wires" } *************** *** 2674,2681 **** switch -regexp -- $key { BackSpace|Delete|KP_Delete {$self delete_selection} ! Up {$self selection_move 0 -$motion} ! Down {$self selection_move 0 +$motion} ! Left {$self selection_move -$motion 0} ! Right {$self selection_move +$motion 0} Tab {$self tab_jump} Return { --- 2708,2715 ---- switch -regexp -- $key { BackSpace|Delete|KP_Delete {$self delete_selection} ! Up {if {[llength $@selection]} {$self selection_move 0 -$motion} else {$self scroll y -$motion}} ! Down {if {[llength $@selection]} {$self selection_move 0 +$motion} else {$self scroll y +$motion}} ! Left {if {[llength $@selection]} {$self selection_move -$motion 0} else {$self scroll x -$motion}} ! Right {if {[llength $@selection]} {$self selection_move +$motion 0} else {$self scroll x +$motion}} Tab {$self tab_jump} Return { *************** *** 2842,2845 **** --- 2876,2885 ---- } + def Wire xy2 {} { + set obj2 $@obj2 + mset {x1 y1 x2 y2} [$obj2 xy] + list $x1 $y1 + } + def Wire report {} { list $@obj1 $@port1 $@obj2 $@port2

1 0

pd/src desire.tk,1.1.2.348,1.1.2.349
by chunlee 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19074 Modified Files: Tag: devel_0_39 desire.tk Log Message: crosshair is now in ddrc editor Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.348 retrieving revision 1.1.2.349 diff -C2 -d -r1.1.2.348 -r1.1.2.349 *** desire.tk 16 Aug 2006 04:21:51 -0000 1.1.2.348 --- desire.tk 16 Aug 2006 12:22:38 -0000 1.1.2.349 *************** *** 947,955 **** set scale(canned) [list 25 33 50 75 100 125 150 200 250 300 400] ! set crosshair(state) 1 ! set crosshair(snap) 1 #-----------------------------------------------------------------------------------# proc read_ddrc {} { ! global look set file [open "~/.ddrc" "RDONLY CREAT"] set dd_config [read $file] --- 947,955 ---- set scale(canned) [list 25 33 50 75 100 125 150 200 250 300 400] ! set crosshair(hairstate) 1 ! set crosshair(hairsnap) 1 #-----------------------------------------------------------------------------------# proc read_ddrc {} { ! global look crosshair set file [open "~/.ddrc" "RDONLY CREAT"] set dd_config [read $file] *************** *** 964,967 **** --- 964,971 ---- #puts "look($word2) $word3" } + crosshair { + set crosshair($word2) $word3 + #puts "look($word2) $word3" + } font { #puts "settings for font" *************** *** 1208,1212 **** global crosshair set @editmode [expr !$@editmode] ! if {$crosshair(state) && !$@editmode} {$self hide_crosshair} pd .$self editmode $@editmode } --- 1212,1216 ---- global crosshair set @editmode [expr !$@editmode] ! if {$crosshair(hairstate) && !$@editmode} {$self hide_crosshair} pd .$self editmode $@editmode } *************** *** 1945,1949 **** set canvas(current) $self set c .$self.c ! if {$crosshair(state) && $@editmode} {$self show_crosshair $x $y $target} if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { --- 1949,1953 ---- set canvas(current) $self set c .$self.c ! if {$crosshair(hairstate) && $@editmode} {$self show_crosshair $x $y $target} else {$self hide_crosshair} if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { *************** *** 4358,4362 **** #puts " action::: $@action" ! if {$crosshair(snap)} { if {$type == "object" | $type == "outlet" | $type == "inlet"} { if {$id != $self} { --- 4362,4366 ---- #puts " action::: $@action" ! if {$crosshair(hairsnap)} { if {$type == "object" | $type == "outlet" | $type == "inlet"} { if {$id != $self} { *************** *** 4778,4782 **** frame $f label $f.label -text $label ! checkbutton $f.toggle -variable _($self:name) } section { --- 4782,4788 ---- frame $f label $f.label -text $label ! checkbutton $f.toggle -variable _($self:$name) ! pack $f.label -side left ! pack $f.toggle -side left } section { *************** *** 5391,5394 **** --- 5397,5403 ---- key {load_meter latency_meter} key about + section others + crosshair hairstate + crosshair hairsnap } *************** *** 5397,5401 **** def* ClientPrefsDialog read {} { ! global ddrc_options ddrc_options_h cmdline look key set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] #set contents [split [string map {"\n" " "} [read $fd]] " "] --- 5406,5410 ---- def* ClientPrefsDialog read {} { ! global ddrc_options ddrc_options_h cmdline look key crosshair set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] #set contents [split [string map {"\n" " "} [read $fd]] " "] *************** *** 5422,5425 **** --- 5431,5435 ---- color {set look($item) $value} key {set key($item) $value} + crosshair {set crosshair($item) $value; set _($self:crosshair($item)) $value} default {incr i; set @$name [lindex $contents $i]} } *************** *** 5430,5434 **** def* ClientPrefsDialog write {} { ! global ddrc_options ddrc_options_h cmdline look accels key set fd [open $cmdline(ddrcfilename) w] set check_key {} --- 5440,5444 ---- def* ClientPrefsDialog write {} { ! global ddrc_options ddrc_options_h cmdline look accels key crosshair set fd [open $cmdline(ddrcfilename) w] set check_key {} *************** *** 5464,5467 **** --- 5474,5481 ---- } + crosshair { + set crosshair($name) $_($self:$name) + puts $fd "$type $name $crosshair($name)" + } } } *************** *** 5471,5475 **** } def ClientPrefsDialog init {} { ! global ddrc_options look key $self read super reset cancel apply ok --- 5485,5489 ---- } def ClientPrefsDialog init {} { ! global ddrc_options look key crosshair $self read super reset cancel apply ok *************** *** 5527,5530 **** --- 5541,5551 ---- properties_dialog $self $which_section [list $name $name $type {}] } + crosshair { + set var ${name}path + #this stores the path to the widget on the gui editor. + set @$var $which_section.$name.color + set @$name $crosshair($name) + properties_dialog $self $which_section [list [lindex $name 0] [say $name] toggle {}] + } default { properties_dialog $self $which_section [list $name [say $name] $type {}]

1 0

pd/src desire.tk,1.1.2.347,1.1.2.348
by Mathieu Bouchard 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10384 Modified Files: Tag: devel_0_39 desire.tk Log Message: . Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.347 retrieving revision 1.1.2.348 diff -C2 -d -r1.1.2.347 -r1.1.2.348 *** desire.tk 16 Aug 2006 00:37:01 -0000 1.1.2.347 --- desire.tk 16 Aug 2006 04:21:51 -0000 1.1.2.348 *************** *** 1736,1739 **** --- 1736,1740 ---- def ObjectBox unedit {} { + super $self erase ;# (why?) } *************** *** 1872,1876 **** set x [expr [$c canvasx $x]/$@scale] set y [expr [$c canvasy $y]/$@scale] ! set target [$self identify_target $x $y $f "motion"] $self motion $x $y $f $target } --- 1873,1877 ---- set x [expr [$c canvasx $x]/$@scale] set y [expr [$c canvasy $y]/$@scale] ! set target [$self identify_target $x $y $f] $self motion $x $y $f $target } *************** *** 1880,1884 **** set y [expr [$c canvasy $y]/$@scale] set f [expr 1<<($b+7)|$f] ! set target [$self identify_target $x $y $f "click"] $self click $x $y $f $target } --- 1881,1885 ---- set y [expr [$c canvasy $y]/$@scale] set f [expr 1<<($b+7)|$f] ! set target [$self identify_target $x $y $f] $self click $x $y $f $target } *************** *** 1888,1892 **** set y [expr [$c canvasy $y]/$@scale] set f [expr 1<<($b+7)|$f] ! set target [$self identify_target $x $y $f "unclick"] $self unclick $x $y $f $target } --- 1889,1893 ---- set y [expr [$c canvasy $y]/$@scale] set f [expr 1<<($b+7)|$f] ! set target [$self identify_target $x $y $f] $self unclick $x $y $f $target } *************** *** 1994,1998 **** # wire $id : a wire # nothing : nothing ! def Canvas identify_target {x y f label} { set c .$self.c set cx [expr $x*$@scale] --- 1995,1999 ---- # wire $id : a wire # nothing : nothing ! def Canvas identify_target {x y f} { set c .$self.c set cx [expr $x*$@scale] *************** *** 2045,2051 **** $self addw 1 what 32 "" -padx 8 -fill x -expand yes $self addw 1 mode 4 " Mode: " ! $self addw 1 action 4 " Action: " $self addw 1 sel 4 " Sel: " ! #$self addw 2 wfrom 12 " WireFrom: " #$self addw 2 wto 12 " WireTo: " } --- 2046,2052 ---- $self addw 1 what 32 "" -padx 8 -fill x -expand yes $self addw 1 mode 4 " Mode: " ! $self addw 1 action 12 " Action: " $self addw 1 sel 4 " Sel: " ! $self addw 2 focus 12 " Focus: " #$self addw 2 wto 12 " WireTo: " } *************** *** 2064,2068 **** set tags [$c gettags [lindex [$c find overlapping \ [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] ! foreach {type id} [$@canvas identify_target $x $y -1 "status"] {} switch -- $type { object { --- 2065,2069 ---- set tags [$c gettags [lindex [$c find overlapping \ [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] ! mset {type id detail} [$@canvas identify_target $x $y -1] switch -- $type { object { *************** *** 2079,2083 **** $f.1.action configure -text [$@canvas action] $f.1.sel configure -text [llength [$@canvas selection]] ! #$f.2.wfrom configure -text [$@canvas wire_from] #$f.2.wto configure -text [$@canvas wire_to] } --- 2080,2084 ---- $f.1.action configure -text [$@canvas action] $f.1.sel configure -text [llength [$@canvas selection]] ! $f.2.focus configure -text [$@canvas focus] #$f.2.wto configure -text [$@canvas wire_to] } *************** *** 2301,2305 **** if {[llength $@obj_in_edit]} {$@obj_in_edit unedit; set @obj_in_edit {}} set in_selection [expr [lsearch $@selection $id]>=0] - switch $type { outlet {set @action [FutureWire new $self $x $y $f $target]; return} --- 2302,2305 ---- *************** *** 2367,2371 **** #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return} if {$@editmode} {$self clickedit $x $y $f $target; return} ! mset {type id} $target if {![llength $id]} {return} switch $type { --- 2367,2371 ---- #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return} if {$@editmode} {$self clickedit $x $y $f $target; return} ! mset {type id detail} $target if {![llength $id]} {return} switch $type {

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
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