Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src desire.tk,1.1.2.331,1.1.2.332
by Mathieu Bouchard 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5232 Modified Files: Tag: devel_0_39 desire.tk Log Message: refixed wire creation Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.331 retrieving revision 1.1.2.332 diff -C2 -d -r1.1.2.331 -r1.1.2.332 *** desire.tk 14 Aug 2006 13:42:36 -0000 1.1.2.331 --- desire.tk 14 Aug 2006 14:04:56 -0000 1.1.2.332 *************** *** 1841,1844 **** --- 1841,1847 ---- set canvas(current) $self set c .$self.c + set b 0 + set f $mods + set bf [list $b $f] set x [expr [$c canvasx $x]/$@scale] set y [expr [$c canvasy $y]/$@scale] *************** *** 1875,1879 **** none {} #default {error "unknown action '$@action'"} ! default {$@action motion $x $y $mods} } mset {type id} [$self identify_target $x $y -1 -1 "move"] --- 1878,1885 ---- none {} #default {error "unknown action '$@action'"} ! default { ! set target [$self identify_target $x $y $b $f "motion"] ! $@action motion $x $y $mods $target ! } } mset {type id} [$self identify_target $x $y -1 -1 "move"] *************** *** 1936,1940 **** def Canvas identify_target {x y b f label} { set r [$self identify_target2 $x $y $b $f $label] ! puts "\[identify_target $x $y $b $f $label\] returns: $r" return $r } --- 1942,1946 ---- def Canvas identify_target {x y b f label} { set r [$self identify_target2 $x $y $b $f $label] ! #puts "\[identify_target $x $y $b $f $label\] returns: $r" return $r } *************** *** 2121,2128 **** --- 2127,2139 ---- } + proc shift? {bf} {mset {b f} $bf; return [expr $f&1]} + proc ctrl? {bf} {mset {b f} $bf; return [expr $f&2]} + proc alt? {bf} {mset {b f} $bf; return [expr $f&4]} + class_new FutureWire {View} def* FutureWire init {canvas x y bf target} { super set @canvas $canvas + mset {type from outlet} $target set @from $from set @outlet $outlet *************** *** 2132,2161 **** set @x1 [expr ($x1+$x2)/2] set @y1 [expr ($y1+$y2)/2] ! $self motion $@x1 $@y1 0 } def* FutureWire motion {x y f target} { set @x2 $x set @y2 $y ! mset {@to @inlet} [$@canvas identify_target $x $y -1 -1 "unclick"] $self draw } ! def* FutureWire unclick {x y b f} { ! $self motion $x $y $f if {$@to != ""} { ! post "WILL CONNECT" ! mset {x1 y1 x2 y2} [$id bbox] ! set ins 0; set ins [$id ninlets] ! if {$y<$y1+6 && $ins} { ! set in [expr int(($x-$x1)*$ins/($x2-$x1))] ! set @wire_to [list $id $in] ! set children [$@canvas children] ! $@canvas connect [list \ ! [lsearch $children $@from] $@outlet \ ! [lsearch $children $@to ] $@inlet] ! } ! } else { ! post "WILL *NOT* CONNECT" } ! if {!$f} {$@canvas end_action} } def FutureWire draw {} { --- 2143,2164 ---- set @x1 [expr ($x1+$x2)/2] set @y1 [expr ($y1+$y2)/2] ! $self motion $@x1 $@y1 0 $target } def* FutureWire motion {x y f target} { set @x2 $x set @y2 $y ! #mset {type @to @inlet} $target ;# fix objective.tcl please... ! mset [list type @to @inlet] $target $self draw } ! def* FutureWire unclick {x y bf target} { ! $self motion $x $y $bf $target if {$@to != ""} { ! set children [$@canvas children] ! $@canvas connect [list \ ! [lsearch $children $@from] $@outlet \ ! [lsearch $children $@to ] $@inlet] } ! if {![shift? $bf]} {$@canvas end_action} } def FutureWire draw {} { *************** *** 2168,2171 **** --- 2171,2175 ---- def* Canvas clickedit {x y b f} { set c .[$self canvas].c + set bf [list $b $f] ;# i want to merge b and f together but it's not going to be merged like this set target [$self identify_target $x $y $b $f "click"] mset {type id detail} $target *************** *** 2184,2187 **** --- 2188,2192 ---- switch $type { + outlet {set @action [FutureWire new $self $x $y $bf $target]; return} object {# handles the dash wire drawing mset {x1 y1 x2 y2} [$id bbox] *************** *** 2189,2195 **** set ins 0; set ins [$id ninlets] if {$y>=$y2-6 && $outs} { # click on outlet - set out [expr int(($x-$x1)*$outs/($x2-$x1))] - set @action [FutureWire new $self $x $y $target] - return } else { if {$y<$y1+2 && $ins} { # click on inlet --- 2194,2197 ---- *************** *** 2296,2299 **** --- 2298,2302 ---- global look set c .$self.c + set bf [list $b $f] switch $@action { rect { *************** *** 2359,2363 **** none {} #default {error "unknown action '$@action'"} ! default {$@action unclick $x $y $b $f} } } --- 2362,2369 ---- none {} #default {error "unknown action '$@action'"} ! default { ! set target [$self identify_target $x $y $b $f "unclick"] ! $@action unclick $x $y $bf $target ! } } }

1 0

pd/src desire.tk,1.1.2.330,1.1.2.331
by Mathieu Bouchard 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29556 Modified Files: Tag: devel_0_39 desire.tk Log Message: committing broken code in order to avoid more conflicts... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.330 retrieving revision 1.1.2.331 diff -C2 -d -r1.1.2.330 -r1.1.2.331 *** desire.tk 14 Aug 2006 11:12:49 -0000 1.1.2.330 --- desire.tk 14 Aug 2006 13:42:36 -0000 1.1.2.331 *************** *** 1234,1238 **** $self new_menubar $self new_binds ! set @scale 1.0 ;# must be a float, not int set @action none set @selection {} --- 1234,1238 ---- $self new_menubar $self new_binds ! set @scale 1.5 ;# must be a float, not int set @action none set @selection {} *************** *** 1242,1247 **** set @select_by "" set @bbox {0 0 100 100} - set @wire_from {} - set @wire_to {} set @children {} set @unborn {} --- 1242,1245 ---- *************** *** 1879,1883 **** default {$@action motion $x $y $mods} } ! mset {type id} [$self identify_target $x $y -1 -1 "move "] switch $type { object { --- 1877,1881 ---- default {$@action motion $x $y $mods} } ! mset {type id} [$self identify_target $x $y -1 -1 "move"] switch $type { object { *************** *** 1906,1918 **** #-----------------------------------------------------------------------------------# ! def Canvas identify_target {x y b f label} { set c .$self.c ! set x [expr $x*$@scale] ! set y [expr $y*$@scale] ! set stack [lreverse [$c find overlapping [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]]] foreach tag $stack { set tags [$c gettags $tag] if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} return [list "object" $id] } --- 1904,1927 ---- #-----------------------------------------------------------------------------------# ! # returns one of those five things: ! # object $id : the body of an object ! # inlet $id $inlet : an inlet of an object ! # outlet $id $outlet : an outlet of an object ! # wire $id : a wire ! # nothing : nothing ! def Canvas identify_target2 {x y b f label} { set c .$self.c ! set cx [expr $x*$@scale] ! set cy [expr $y*$@scale] ! set stack [lreverse [$c find overlapping [expr $cx-2] [expr $cy-2] [expr $cx+2] [expr $cy+2]]] foreach tag $stack { set tags [$c gettags $tag] if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} + mset {x1 y1 x2 y2} [$id bbox] + set outs [$id noutlets] + set ins [$id ninlets] + if {$y>=$y2-6 && $outs} {return [list "outlet" $id [expr int(($x-$x1)*$outs/($x2-$x1))]]} + if {$y< $y1+2 && $ins} {return [list "inlet" $id [expr int(($x-$x1)* $ins/($x2-$x1))]]} return [list "object" $id] } *************** *** 1925,1928 **** --- 1934,1942 ---- } + def Canvas identify_target {x y b f label} { + set r [$self identify_target2 $x $y $b $f $label] + puts "\[identify_target $x $y $b $f $label\] returns: $r" + return $r + } #-----------------------------------------------------------------------------------# *************** *** 1956,1961 **** def Canvas statusbar_draw {x y} {$@statusbar draw $x $y} def Canvas action {} {return $@action} ! def Canvas wire_from {} {return $@wire_from} ! def Canvas wire_to {} {return $@wire_to} def Canvas scale {} {return $@scale} --- 1970,1977 ---- def Canvas statusbar_draw {x y} {$@statusbar draw $x $y} def Canvas action {} {return $@action} ! #def Canvas wire_from {} {return $@wire_from} ! #def Canvas wire_to {} {return $@wire_to} ! def Canvas wire_from {} {return somewhere.} ! def Canvas wire_to {} {return someplace.} def Canvas scale {} {return $@scale} *************** *** 2100,2133 **** } class_new FutureWire {View} ! def* FutureWire init {canvas x1 y1} { super - set @x1 $x1 - set @y1 $y1 set @canvas $canvas ! set @wire_from {} ! set @wire_to {} ! $self motion $x1 $y1 0 } ! def* FutureWire motion {x2 y2 mods} {set @x2 $x2; set @y2 $y2; $self draw} ! def* FutureWire unclick {x2 y2 b f} { ! $self motion $x2 $y2 $f ! post "UNCLICK should happen now" ! mset {type id} [$@canvas identify_target $x2 $y2 -1 -1 "unclick"] ! if {$type != "wire"} { ! mset {obj_x1 obj_y1 obj_x2 obj_y2} [$id bbox] ! set ins 0; set ins [$id ninlets] ! if {$y2<$obj_y1+6 && $ins} { ! set in [expr int(($x2-$obj_x1)*$ins/($obj_x2-$obj_x1))] ! set @wire_to [list $id $in] ! mset {from outlet} $@wire_from ! mset {to inlet} $@wire_to ! $@canvas connect [list \ ! [lsearch $_($@canvas:children) $from] $outlet \ ! [lsearch $_($@canvas:children) $to] $inlet] ! } } ! $self _delete ! } def FutureWire draw {} { --- 2116,2161 ---- } + def Canvas end_action {} { + $@action _delete + set @action "none" + } + class_new FutureWire {View} ! def* FutureWire init {canvas x y bf target} { super set @canvas $canvas ! set @from $from ! set @outlet $outlet ! set @to "" ! set @inlet "" ! mset {x1 y1 x2 y2} [lmap / [.$(a)canvas.c bbox ${from}o${outlet}] [$@canvas scale]] ! set @x1 [expr ($x1+$x2)/2] ! set @y1 [expr ($y1+$y2)/2] ! $self motion $@x1 $@y1 0 } ! def* FutureWire motion {x y f target} { ! set @x2 $x ! set @y2 $y ! mset {@to @inlet} [$@canvas identify_target $x $y -1 -1 "unclick"] ! $self draw ! } ! def* FutureWire unclick {x y b f} { ! $self motion $x $y $f ! if {$@to != ""} { ! post "WILL CONNECT" ! mset {x1 y1 x2 y2} [$id bbox] ! set ins 0; set ins [$id ninlets] ! if {$y<$y1+6 && $ins} { ! set in [expr int(($x-$x1)*$ins/($x2-$x1))] ! set @wire_to [list $id $in] ! set children [$@canvas children] ! $@canvas connect [list \ ! [lsearch $children $@from] $@outlet \ ! [lsearch $children $@to ] $@inlet] ! } ! } else { ! post "WILL *NOT* CONNECT" } ! if {!$f} {$@canvas end_action} } def FutureWire draw {} { *************** *** 2140,2144 **** def* Canvas clickedit {x y b f} { set c .[$self canvas].c ! mset {type id} [$self identify_target $x $y $b $f "click"] if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} if {[llength $@obj_in_edit]} {$@obj_in_edit unedit; set @obj_in_edit {}} --- 2168,2173 ---- def* Canvas clickedit {x y b f} { set c .[$self canvas].c ! set target [$self identify_target $x $y $b $f "click"] ! mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} if {[llength $@obj_in_edit]} {$@obj_in_edit unedit; set @obj_in_edit {}} *************** *** 2155,2177 **** switch $type { ! object { ! # handles the dash wire drawing ! mset {x1 y1 x2 y2} [$id bbox] ! set outs 0; set outs [$id noutlets] ! set ins 0; set ins [$id ninlets] ! if {$y>=$y2-6 && $outs} { ! set out [expr int(($x-$x1)*$outs/($x2-$x1))] ! mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] ! set @action [FutureWire new $self [expr ($x1+$x2)/2] [expr ($y1+$y2)/2]] ! set _($@action:wire_from) [list $id $out] ! set @wire_from [list $id $out] ! #click on a outlet with shift ! if {$f == 1 && ![llength $@shift_wires]} {set @shift_wires $@wire_from} return ! } else { ! if {$y<$y1+2 && $ins} { ! switch $f { ! 1 { ! #click on a inlet with shift mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] if {$id != ""} { --- 2184,2198 ---- switch $type { ! object {# handles the dash wire drawing ! mset {x1 y1 x2 y2} [$id bbox] ! set outs 0; set outs [$id noutlets] ! set ins 0; set ins [$id ninlets] ! if {$y>=$y2-6 && $outs} { # click on outlet ! set out [expr int(($x-$x1)*$outs/($x2-$x1))] ! set @action [FutureWire new $self $x $y $target] return ! } else { ! if {$y<$y1+2 && $ins} { # click on inlet ! if {$f} {#click on an inlet with shift mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] if {$id != ""} { *************** *** 2186,2192 **** } return ! } ! } ! default {puts "do nothing....."} } } else { --- 2207,2211 ---- } return ! } } } else { *************** *** 2210,2217 **** $id selected?= 1 } ! 1 { ! puts " click on a wire with shift" ! #clcik on a wire with shift ! #if clcik on the one already selected wire, reconnect it if {[llength $@selection_wire] == 1 && $@selection_wire == $id} { set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] --- 2229,2234 ---- $id selected?= 1 } ! 1 {#click on a wire with shift ! #if click on the one already selected wire, reconnect it if {[llength $@selection_wire] == 1 && $@selection_wire == $id} { set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] *************** *** 2222,2231 **** set obj1 [lindex $@children [lindex $wire 0]] set outlet [lindex $wire 1] - mset {x1 y1 x2 y2} [$obj1 bbox] mset {x1 y1 x2 y2} [$c bbox ${obj1}o${outlet}] ! $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! set @wire_from [list $obj1 $outlet] ! if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"} ! set @action wire } else { #else selecting mltiple wires --- 2239,2244 ---- set obj1 [lindex $@children [lindex $wire 0]] set outlet [lindex $wire 1] mset {x1 y1 x2 y2} [$c bbox ${obj1}o${outlet}] ! set @action [FutureWire new $x $y $obj1 $outlet] } else { #else selecting mltiple wires *************** *** 2233,2237 **** } } ! 2 { set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] $id delete --- 2246,2250 ---- } } ! 2 {# ctrl-click on wire? set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] $id delete *************** *** 2245,2249 **** $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] set @wire_from [list $obj1 $outlet] - if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"} set @action wire } --- 2258,2261 ---- *************** *** 2328,2352 **** $c delete selrect } - wire { - #mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] - # if making wire without shift key (delete the dash line) - set x1 $x - set y1 $y - mset {type id} [$@canvas identify_target $x $y -1 -1 "unclick"] - if {$id != ""} { - mset {x1 y1 x2 y2} [$id bbox] - set ins 0; set ins [$id ninlets] - if {$y<$y1+6 && $ins} { - set in [expr int(($x-$x1)*$ins/($x2-$x1))] - set @wire_to [list $id $in] - mset {from outlet} $@wire_from - mset {to inlet} $@wire_to - $self connect [list \ - [lsearch $@children $from] $outlet \ - [lsearch $@children $to] $inlet] - } - } - if {!$f} {$c delete lnew} - } edit { #foreach {type id} [$self identify_target $cx $cy -1 -1 "blah "] {} --- 2340,2343 ---- *************** *** 2703,2707 **** for {set n 0} {$n<$ports} {incr n} { set tag $self$type$n ! set area [.$(a)canvas.c bbox $self$type$n] set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ] set dist [expr abs($x - $center)] --- 2694,2698 ---- for {set n 0} {$n<$ports} {incr n} { set tag $self$type$n ! set area [lmap / [.$(a)canvas.c bbox $self$type$n] [$@canvas scale]] set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ] set dist [expr abs($x - $center)]

1 0

externals/iem/iemmatrix/src mtx_fill.c,1.8,1.9
by Franz Zotter 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6228 Modified Files: mtx_fill.c Log Message: corrections to mtx_fill: passive inlet matrix can pass through if invalid indices/ empty indexing vectors are defined. this is useful when combining with mtx_find and the result of mtx_find is empty or undefined (=0 indices). Index: mtx_fill.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_fill.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mtx_fill.c 9 Aug 2006 19:26:19 -0000 1.8 --- mtx_fill.c 14 Aug 2006 12:43:53 -0000 1.9 *************** *** 18,22 **** typedef enum { FILL_SUBMATRIX, ! FILL_INDEXED_ELEMENTS } FillStyle; --- 18,23 ---- typedef enum { FILL_SUBMATRIX, ! FILL_INDEXED_ELEMENTS, ! DONT_FILL_JUST_PASS } FillStyle; *************** *** 36,39 **** --- 37,41 ---- int *index; int index_size; + int num_idcs_used; int max_index; *************** *** 42,46 **** t_outlet *list_outlet; - t_atom *list_in; t_atom *list_out; }; --- 44,47 ---- *************** *** 48,53 **** static void deleteMTXFill (MTXfill *mtx_fill_obj) { - if (mtx_fill_obj->list_in) - freebytes (mtx_fill_obj->list_in, sizeof(t_atom)*(mtx_fill_obj->size+2)); if (mtx_fill_obj->list_out) freebytes (mtx_fill_obj->list_out, sizeof(t_atom)*(mtx_fill_obj->size+2)); --- 49,52 ---- *************** *** 107,111 **** // size check if (!size) { ! post("mtx_fill: invalid dimensions/invalid start index"); return; } --- 106,110 ---- // size check if (!size) { ! mtx_fill_obj->fill_type = DONT_FILL_JUST_PASS; return; } *************** *** 114,117 **** --- 113,117 ---- if ((rows<1) || (columns<1)){ post("mtx_fill: row and column indices must be >0"); + mtx_fill_obj->fill_type = DONT_FILL_JUST_PASS; return; } *************** *** 121,125 **** } else if (list_size<size) { ! post("mtx_fill: sparse matrix not yet supported: use \"mtx_check\""); return; } --- 121,125 ---- } else if (list_size<size) { ! mtx_fill_obj->fill_type = DONT_FILL_JUST_PASS; return; } *************** *** 133,151 **** sizeof (t_atom) * (size + 2)); mtx_fill_obj->index_size = size; } mtx_fill_obj->max_index = copyNonZeroAtomsToIntegerArrayMax (&size, argv++, index); ! if (!size) { ! post("mtx_fill: indexing matrix contains zero-values only!!!"); ! return; ! } ! if (size != mtx_fill_obj->index_size) { ! index = (int *) resizebytes (index, ! sizeof (int) * (mtx_fill_obj->index_size+2), ! sizeof (t_atom) * (size + 2)); ! mtx_fill_obj->index_size = size; ! } ! mtx_fill_obj->fill_type = FILL_INDEXED_ELEMENTS; ! mtx_fill_obj->index = index; } } --- 133,145 ---- sizeof (t_atom) * (size + 2)); mtx_fill_obj->index_size = size; + mtx_fill_obj->index = index; } mtx_fill_obj->max_index = copyNonZeroAtomsToIntegerArrayMax (&size, argv++, index); ! mtx_fill_obj->num_idcs_used = size; ! if (!size) ! mtx_fill_obj->fill_type = DONT_FILL_JUST_PASS; ! else ! mtx_fill_obj->fill_type = FILL_INDEXED_ELEMENTS; } } *************** *** 155,161 **** MTXfill *mtx_fill_obj = (MTXfill *) pd_new (mtx_fill_class); mtx_fill_obj->fill_startrow = 1; mtx_fill_obj->fill_startcol = 1; ! mtx_fill_obj->fill_type = FILL_SUBMATRIX; error("[mtx_fill]: this object _might_ change in the future!"); if (argc) { --- 149,156 ---- MTXfill *mtx_fill_obj = (MTXfill *) pd_new (mtx_fill_class); + mtx_fill_obj->size = 0; mtx_fill_obj->fill_startrow = 1; mtx_fill_obj->fill_startcol = 1; ! mtx_fill_obj->fill_type = DONT_FILL_JUST_PASS; error("[mtx_fill]: this object _might_ change in the future!"); if (argc) { *************** *** 175,183 **** int argc, t_atom *argv) { ! int rows = atom_getint (argv++); ! int columns = atom_getint (argv++); int size = rows * columns; int list_size = argc - 2; - t_atom *list_in = mtx_fill_obj->list_in; t_atom *list_out = mtx_fill_obj->list_out; --- 170,177 ---- int argc, t_atom *argv) { ! int rows = atom_getint (argv); ! int columns = atom_getint (argv+1); int size = rows * columns; int list_size = argc - 2; t_atom *list_out = mtx_fill_obj->list_out; *************** *** 199,208 **** sizeof (t_atom) * (mtx_fill_obj->size+2), sizeof (t_atom) * (size + 2)); - if (!list_in) - list_in = (t_atom *) getbytes (sizeof (t_atom) * (size + 2)); - else - list_in = (t_atom *) resizebytes (list_in, - sizeof (t_atom) * (mtx_fill_obj->size+2), - sizeof (t_atom) * (size + 2)); } --- 193,196 ---- *************** *** 211,217 **** mtx_fill_obj->rows = rows; mtx_fill_obj->list_out = list_out; - mtx_fill_obj->list_in = list_in; ! copyList (size, argv, list_in); } --- 199,204 ---- mtx_fill_obj->rows = rows; mtx_fill_obj->list_out = list_out; ! memcpy(list_out,argv,argc*sizeof(t_atom)); } *************** *** 233,264 **** { t_atom *list_out = mtx_fill_obj->list_out; - t_atom *list_in = mtx_fill_obj->list_in; int rows = mtx_fill_obj->rows; int columns = mtx_fill_obj->columns; - if (mtx_fill_obj->fill_type == FILL_INDEXED_ELEMENTS) { - if (mtx_fill_obj->max_index > mtx_fill_obj->size) { - post("mtx_fill: index matrix index exceeds matrix borders"); - return; - } - else if (mtx_fill_obj->size == 0) { - post("mtx_fill: no matrix defined for filling"); - return; - } ! // main part ! list_out += 2; ! copyList (mtx_fill_obj->size, list_in, list_out); ! ! writeFloatIndexedIntoMatrix (mtx_fill_obj->index_size, ! mtx_fill_obj->index, f,list_out); ! list_out = mtx_fill_obj->list_out; ! SETSYMBOL(list_out, gensym("matrix")); ! SETFLOAT(list_out, rows); ! SETFLOAT(&list_out[1], columns); ! outlet_anything(mtx_fill_obj->list_outlet, gensym("matrix"), ! mtx_fill_obj->size+2, list_out); } - else - post("mtx_fill: scalar fill for submatrices not supported yet"); } --- 220,246 ---- { t_atom *list_out = mtx_fill_obj->list_out; int rows = mtx_fill_obj->rows; int columns = mtx_fill_obj->columns; ! switch (mtx_fill_obj->fill_type) { ! case FILL_SUBMATRIX: ! post("mtx_fill: scalar fill for submatrices not supported yet"); ! return; ! break; ! case FILL_INDEXED_ELEMENTS: ! if (mtx_fill_obj->max_index > mtx_fill_obj->size) { ! post("mtx_fill: index matrix index exceeds matrix borders"); ! return; ! } ! if (mtx_fill_obj->size == 0) { ! post("mtx_fill: no matrix defined for filling"); ! return; ! } ! // main part ! writeFloatIndexedIntoMatrix (mtx_fill_obj->num_idcs_used, ! mtx_fill_obj->index, f,list_out+2); ! default: ! mTXFillBang(mtx_fill_obj); } } *************** *** 274,282 **** int columns = mtx_fill_obj->columns; t_atom *fill_mtx = argv; - t_atom *list_in = mtx_fill_obj->list_in; t_atom *list_out = mtx_fill_obj->list_out; int stopcol = mtx_fill_obj->fill_startcol+fill_columns-1; int stoprow = mtx_fill_obj->fill_startrow+fill_rows-1; // size check if (!list_size) { --- 256,268 ---- int columns = mtx_fill_obj->columns; t_atom *fill_mtx = argv; t_atom *list_out = mtx_fill_obj->list_out; int stopcol = mtx_fill_obj->fill_startcol+fill_columns-1; int stoprow = mtx_fill_obj->fill_startrow+fill_rows-1; + if (mtx_fill_obj->fill_type == DONT_FILL_JUST_PASS) { + mTXFillBang(mtx_fill_obj); + return; + } + // size check if (!list_size) { *************** *** 297,301 **** break; case FILL_INDEXED_ELEMENTS: ! if (list_size < mtx_fill_obj->index_size) { post("mtx_fill: fill matrix smaller than indexing vector"); return; --- 283,287 ---- break; case FILL_INDEXED_ELEMENTS: ! if (list_size < mtx_fill_obj->num_idcs_used) { post("mtx_fill: fill matrix smaller than indexing vector"); return; *************** *** 312,320 **** } - // main part - list_out += 2; - copyList (mtx_fill_obj->size, list_in, list_out); - switch (mtx_fill_obj->fill_type) { case FILL_SUBMATRIX: --- 298,302 ---- *************** *** 322,338 **** mtx_fill_obj->fill_startcol-1; writeFillMatrixIntoList (fill_rows, fill_columns, ! columns, fill_mtx, list_out); break; case FILL_INDEXED_ELEMENTS: ! writeIndexedValuesIntoMatrix (mtx_fill_obj->index_size, ! mtx_fill_obj->index, fill_mtx,list_out); break; } ! list_out = mtx_fill_obj->list_out; ! SETSYMBOL(list_out, gensym("matrix")); ! SETFLOAT(list_out, rows); ! SETFLOAT(&list_out[1], columns); ! outlet_anything(mtx_fill_obj->list_outlet, gensym("matrix"), ! mtx_fill_obj->size+2, list_out); } --- 304,315 ---- mtx_fill_obj->fill_startcol-1; writeFillMatrixIntoList (fill_rows, fill_columns, ! columns, fill_mtx, list_out+2); break; case FILL_INDEXED_ELEMENTS: ! writeIndexedValuesIntoMatrix (mtx_fill_obj->num_idcs_used, ! mtx_fill_obj->index, fill_mtx,list_out+2); break; } ! mTXFillBang(mtx_fill_obj); }

1 0

pd/src desire.tk,1.1.2.329,1.1.2.330
by chunlee 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7945 Modified Files: Tag: devel_0_39 desire.tk Log Message: small wire connect fix using futurewire Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.329 retrieving revision 1.1.2.330 diff -C2 -d -r1.1.2.329 -r1.1.2.330 *** desire.tk 14 Aug 2006 01:03:48 -0000 1.1.2.329 --- desire.tk 14 Aug 2006 11:12:49 -0000 1.1.2.330 *************** *** 2106,2109 **** --- 2106,2111 ---- set @y1 $y1 set @canvas $canvas + set @wire_from {} + set @wire_to {} $self motion $x1 $y1 0 } *************** *** 2112,2116 **** --- 2114,2133 ---- $self motion $x2 $y2 $f post "UNCLICK should happen now" + mset {type id} [$@canvas identify_target $x2 $y2 -1 -1 "unclick"] + if {$type != "wire"} { + mset {obj_x1 obj_y1 obj_x2 obj_y2} [$id bbox] + set ins 0; set ins [$id ninlets] + if {$y2<$obj_y1+6 && $ins} { + set in [expr int(($x2-$obj_x1)*$ins/($obj_x2-$obj_x1))] + set @wire_to [list $id $in] + mset {from outlet} $@wire_from + mset {to inlet} $@wire_to + $@canvas connect [list \ + [lsearch $_($@canvas:children) $from] $outlet \ + [lsearch $_($@canvas:children) $to] $inlet] + } + } $self _delete + } def FutureWire draw {} { *************** *** 2147,2150 **** --- 2164,2168 ---- mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] set @action [FutureWire new $self [expr ($x1+$x2)/2] [expr ($y1+$y2)/2]] + set _($@action:wire_from) [list $id $out] set @wire_from [list $id $out] #click on a outlet with shift

1 0

externals/vbap vbap.c,1.3,1.4
by Hans-Christoph Steiner 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/externals/vbap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28823 Modified Files: vbap.c Log Message: tracked down crasher bug due to an array index calculation resulting in a negative index. This was caused by running in 2D mode when that array calculation was set up for 3D mode. Also, I fixed basically all warnings by commenting out Index: vbap.c =================================================================== RCS file: /cvsroot/pure-data/externals/vbap/vbap.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vbap.c 26 Nov 2002 10:28:17 -0000 1.3 --- vbap.c 14 Aug 2006 01:24:08 -0000 1.4 *************** *** 48,56 **** static void additive_vbap(float *final_gs, float cartdir[3], t_vbap *x); static void vbap_bang(t_vbap *x); ! static void vbap_int(t_vbap *x, t_float n); static void vbap_matrix(t_vbap *x, t_symbol *s, int ac, t_atom *av); static void vbap_in1(t_vbap *x, long n); static void vbap_in2(t_vbap *x, long n); static void vbap_in3(t_vbap *x, long n); static void spread_it(t_vbap *x, float *final_gs); static void *vbap_new(t_symbol *s, int ac, t_atom *av); /* using A_GIMME - typed message list */ --- 48,59 ---- static void additive_vbap(float *final_gs, float cartdir[3], t_vbap *x); static void vbap_bang(t_vbap *x); ! /* static void vbap_int(t_vbap *x, t_float n); */ static void vbap_matrix(t_vbap *x, t_symbol *s, int ac, t_atom *av); + /* + * unused 2006-08-13 <hans(a)at.or.at> static void vbap_in1(t_vbap *x, long n); static void vbap_in2(t_vbap *x, long n); static void vbap_in3(t_vbap *x, long n); + */ static void spread_it(t_vbap *x, float *final_gs); static void *vbap_new(t_symbol *s, int ac, t_atom *av); /* using A_GIMME - typed message list */ *************** *** 66,70 **** /* vbap_new = creation function, A_DEFLONG = its (optional) arguement is a long (32-bit) int */ ! #if 0 /* max methods ... */ --- 69,73 ---- /* vbap_new = creation function, A_DEFLONG = its (optional) arguement is a long (32-bit) int */ ! #ifdef MAXMSP /* max methods ... */ *************** *** 79,83 **** #endif class_addbang(vbap_class, vbap_bang); ! class_addfloat(vbap_class, vbap_int); class_addmethod(vbap_class, (t_method)vbap_matrix, gensym("loudspeaker-matrices"), A_GIMME, 0); } --- 82,86 ---- #endif class_addbang(vbap_class, vbap_bang); ! /* class_addfloat(vbap_class, vbap_int); */ class_addmethod(vbap_class, (t_method)vbap_matrix, gensym("loudspeaker-matrices"), A_GIMME, 0); } *************** *** 96,103 **** /* converts cartesian coordinates to angular */ { ! float tmp, tmp2, tmp3, tmp4; float atorad = (2 * 3.1415927 / 360) ; float pi = 3.1415927; ! float power; float dist, atan_y_per_x, atan_x_pl_y_per_z; float azi, ele; --- 99,106 ---- /* converts cartesian coordinates to angular */ { ! // float tmp, tmp2, tmp3, tmp4; /* warning: unused variable */ float atorad = (2 * 3.1415927 / 360) ; float pi = 3.1415927; ! // float power; /* warning: unused variable */ float dist, atan_y_per_x, atan_x_pl_y_per_z; float azi, ele; *************** *** 116,123 **** --- 119,128 ---- atan_x_pl_y_per_z = atan(cvec[2] / dist); if(dist == 0.0) + { if(cvec[2]<0.0) atan_x_pl_y_per_z = -pi/2.0; else atan_x_pl_y_per_z = pi/2.0; + } ele = atan_x_pl_y_per_z / atorad; dist = sqrtf(cvec[0] * cvec[0] +cvec[1] * cvec[1] +cvec[2]*cvec[2]); *************** *** 135,139 **** float small_g; float big_sm_g, gtmp[3]; ! long winner_set; float cartdir[3]; float new_cartdir[3]; --- 140,144 ---- float small_g; float big_sm_g, gtmp[3]; ! long winner_set=0; float cartdir[3]; float new_cartdir[3]; *************** *** 255,268 **** float big_sm_g, gtmp[3]; long winner_set; ! float new_cartdir[3]; ! float new_angle_dir[3]; long dim = x->x_dimension; long neg_g_am, best_neg_g_am; float g[3]; ! long ls[3]; big_sm_g = -100000.0; best_neg_g_am=3; ! for(i=0;i<x->x_lsset_amount;i++){ small_g = 10000000.0; --- 260,278 ---- float big_sm_g, gtmp[3]; long winner_set; ! // float new_cartdir[3]; /* warning: unused variable */ ! // float new_angle_dir[3]; /* warning: unused variable */ long dim = x->x_dimension; long neg_g_am, best_neg_g_am; float g[3]; ! long ls[3] = { 0, 0, 0 }; big_sm_g = -100000.0; best_neg_g_am=3; ! ! /* BUG: there is a bug that sometimes causes x->x_lsset_amount to be a massive ! * number. I haven't tracked it down yet, but its probably an init ! * bug. 2006-08-13 <hans(a)at.or.at> ! */ ! // post("x_lsset_amount: %li", x->x_lsset_amount); for(i=0;i<x->x_lsset_amount;i++){ small_g = 10000000.0; *************** *** 300,311 **** if(gains_modified != 1){ ! power=sqrt(g[0]*g[0] + g[1]*g[1] + g[2]*g[2]); g[0] /= power; g[1] /= power; ! g[2] /= power; final_gs[ls[0]-1] += g[0]; final_gs[ls[1]-1] += g[1]; ! final_gs[ls[2]-1] += g[2]; } } --- 310,329 ---- if(gains_modified != 1){ ! if(dim==3) ! power=sqrt(g[0]*g[0] + g[1]*g[1] + g[2]*g[2]); ! else ! power=sqrt(g[0]*g[0] + g[1]*g[1]); g[0] /= power; g[1] /= power; ! if(dim==3) ! g[2] /= power; final_gs[ls[0]-1] += g[0]; final_gs[ls[1]-1] += g[1]; ! /* BUG FIX: this was causing negative indices with 2 dimensions so I ! * made it only try when using 3 dimensions. ! * 2006-08-13 <hans(a)at.or.at> */ ! if(dim==3) ! final_gs[ls[2]-1] += g[2]; } } *************** *** 473,491 **** /*--------------------------------------------------------------------------*/ ! static void vbap_int(t_vbap *x, t_float n) /* x = the instance of the object, n = the int received in the right inlet */ { ! /* do something if an int comes in the left inlet??? */ } static void vbap_matrix(t_vbap *x, t_symbol *s, int ac, t_atom *av) /* read in loudspeaker matrices */ { ! long counter; long datapointer=0; long setpointer=0; long i; ! long deb=0; ! if(ac>0) /* if(av[datapointer].a_type == A_LONG){ x->x_dimension = av[datapointer++].a_w.w_long; --- 491,511 ---- /*--------------------------------------------------------------------------*/ ! /* ! static void vbap_int(t_vbap *x, t_float n) // x = the instance of the object, n = the int received in the right inlet { ! // do something if an int comes in the left inlet??? } + */ static void vbap_matrix(t_vbap *x, t_symbol *s, int ac, t_atom *av) /* read in loudspeaker matrices */ { ! long counter=0; long datapointer=0; long setpointer=0; long i; ! // long deb=0; ! if(ac>0) { /* if(av[datapointer].a_type == A_LONG){ x->x_dimension = av[datapointer++].a_w.w_long; *************** *** 500,505 **** return; } /* post("%d",deb++); */ ! if(ac>1) /* if(av[datapointer].a_type == A_LONG) x->x_ls_amount = av[datapointer++].a_w.w_long; --- 520,526 ---- return; } + } /* post("%d",deb++); */ ! if(ac>1) { /* if(av[datapointer].a_type == A_LONG) x->x_ls_amount = av[datapointer++].a_w.w_long; *************** *** 512,515 **** --- 533,537 ---- return; } + } else x->x_lsset_available=0; *************** *** 522,526 **** x->x_lsset_amount=counter; ! if(counter<=0){ post("vbap: Error in loudspeaker data!",0); x->x_lsset_available=0; --- 544,548 ---- x->x_lsset_amount=counter; ! if(counter<=0) { post("vbap: Error in loudspeaker data!",0); x->x_lsset_available=0; *************** *** 572,599 **** } ! static void vbap_in1(t_vbap *x, long n) /* x = the instance of the object, n = the int received in the right inlet */ ! /* panning angle azimuth */ { ! x->x_azi = n; /* store n in a global variable */ } ! static void vbap_in2(t_vbap *x, long n) /* x = the instance of the object, n = the int received in the right inlet */ ! /* panning angle elevation */ { ! x->x_ele = n; /* store n in a global variable */ } - /*--------------------------------------------------------------------------*/ ! static void vbap_in3(t_vbap *x, long n) /* x = the instance of the object, n = the int received in the right inlet */ ! /* spread amount */ { if (n<0) n = 0; if (n>100) n = 100; ! x->x_spread = n; /* store n in a global variable */ } ! static void *vbap_new(t_symbol *s, int ac, t_atom *av) --- 594,622 ---- } ! /* ! * unused 2006-08-13 <hans(a)at.or.at> ! static void vbap_in1(t_vbap *x, long n) // x = the instance of the object, n = the int received in the right inlet ! // panning angle azimuth { ! x->x_azi = n; // store n in a global variable } ! static void vbap_in2(t_vbap *x, long n) // x = the instance of the object, n = the int received in the right inlet ! // panning angle elevation { ! x->x_ele = n; // store n in a global variable } ! static void vbap_in3(t_vbap *x, long n) // x = the instance of the object, n = the int received in the right inlet ! // spread amount { if (n<0) n = 0; if (n>100) n = 100; ! x->x_spread = n; // store n in a global variable } ! */ static void *vbap_new(t_symbol *s, int ac, t_atom *av)

1 0

pd/src desire.tk,1.1.2.328,1.1.2.329
by Mathieu Bouchard 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21247 Modified Files: Tag: devel_0_39 desire.tk Log Message: new zoom code, and introducing action classes (first of which, FutureWire) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.328 retrieving revision 1.1.2.329 diff -C2 -d -r1.1.2.328 -r1.1.2.329 *** desire.tk 13 Aug 2006 22:11:19 -0000 1.1.2.328 --- desire.tk 14 Aug 2006 01:03:48 -0000 1.1.2.329 *************** *** 65,69 **** proc mset {vars list} {uplevel 1 "foreach {$vars} {$list} {}"} ! # add or substract one value to a list proc l+ { al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a + $b]}; return $r} proc l- { al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a - $b]}; return $r} --- 65,69 ---- proc mset {vars list} {uplevel 1 "foreach {$vars} {$list} {}"} ! # add or substract two lists proc l+ { al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a + $b]}; return $r} proc l- { al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a - $b]}; return $r} *************** *** 71,75 **** # like l+ or l- but for any infix supported by expr proc lzip {op al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a $op $b]}; return $r} ! proc lmap {op al } {set r {}; foreach a $al b $bl {lappend r [expr $a $op ]}; return $r} # halve a list --- 71,77 ---- # like l+ or l- but for any infix supported by expr proc lzip {op al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a $op $b]}; return $r} ! ! # do an operation between all elements of a list and a second argument ! proc lmap {op al b } {set r {}; foreach a $al {lappend r [expr $a $op $b]}; return $r} # halve a list *************** *** 826,830 **** def Menuable populate_menu {menu list} { global key ! set menu $(a)menubar.$menu foreach name $list { if {$name == ""} {$menu add separator; continue} --- 828,832 ---- def Menuable populate_menu {menu list} { global key ! if {[string index $menu 0] != "."} {set menu $(a)menubar.$menu} foreach name $list { if {$name == ""} {$menu add separator; continue} *************** *** 1013,1028 **** set c .$(a)canvas.c set ss $self$suffix ! ! if {$suffix != "WIRE"} { ! for {set i 0} {$i < [llength $coords]} {incr i} { ! set val [expr [lindex $coords $i]*$_($@canvas:scale)] ! set coords [lreplace $coords $i $i $val] ! } ! } ! set find [lsearch $args "-width"] if {$find >= 0} { ! set new_width [format %.0f [expr [lindex $args [expr $find+1]] * $_($@canvas:scale)]] set args [lreplace $args [expr $find + 1] [expr $find + 1] $new_width] } --- 1015,1024 ---- set c .$(a)canvas.c set ss $self$suffix ! set scale [$@canvas scale] ! set coords [lmap * $coords $scale] set find [lsearch $args "-width"] if {$find >= 0} { ! set new_width [format %.0f [expr [lindex $args [expr $find+1]] * $scale]] set args [lreplace $args [expr $find + 1] [expr $find + 1] $new_width] } *************** *** 1031,1035 **** set find [lsearch $args "-font"] if {$find >= 0} { ! set new_size [format %.0f [expr $font(size)*$_($@canvas:scale)]] set s [format $font(str2) $new_size] set args [lreplace $args [expr $find + 1] [expr $find + 1] $s] --- 1027,1031 ---- set find [lsearch $args "-font"] if {$find >= 0} { ! set new_size [format %.0f [expr $font(size)*$scale]] set s [format $font(str2) $new_size] set args [lreplace $args [expr $find + 1] [expr $find + 1] $s] *************** *** 1052,1063 **** def* View draw {} {} ! def* View delete {} {$self erase; $self _delete; io_erase $self} def* View erase {} {$self item_delete} - def* View click {args} {} - #def* View clickedit {args} {} - def* View unclick {args} {} - def* View unclickedit {args} {} - def View motion {args} {} - def View motionedit {args} {} def View selected? {} {return $@selected?} def View selected?= {x} {set @selected? $x; $self changed} --- 1048,1054 ---- def* View draw {} {} ! def View delete {} {$self _delete} ! def* View _delete {} {$self erase; io_erase $self} def* View erase {} {$self item_delete} def View selected? {} {return $@selected?} def View selected?= {x} {set @selected? $x; $self changed} *************** *** 1243,1246 **** --- 1234,1238 ---- $self new_menubar $self new_binds + set @scale 1.0 ;# must be a float, not int set @action none set @selection {} *************** *** 1280,1284 **** set @keynav_next 0 set @shift_wires {} - set @scale 1 } --- 1272,1275 ---- *************** *** 1385,1390 **** $self bind <KeyRelease> keyup %x %y %K %A 0 $self bind <Shift-KeyRelease> keyup %x %y %K %A 1 ! $self bind <Motion> motion %x %y 0 %s ! $self bind <Alt-Motion> motion %x %y 4 %s $self bind <Map> map $self bind <Unmap> unmap --- 1376,1381 ---- $self bind <KeyRelease> keyup %x %y %K %A 0 $self bind <Shift-KeyRelease> keyup %x %y %K %A 1 ! $self bind <Motion> motion %x %y 0 ! $self bind <Alt-Motion> motion %x %y 4 $self bind <Map> map $self bind <Unmap> unmap *************** *** 1532,1537 **** set c .$(a)canvas.c for {set i 0} {$i<$n} {incr i} { ! set onset [expr $x1 + ($xs-([look iowidth]*$_($@canvas:scale))) * $i / $nplus] ! set points [list [expr $onset] [expr $y-1] [expr $onset+([look iowidth]*$_($@canvas:scale))] [expr $y+(1*$_($@canvas:scale))]] #will update this code when proc item deals with mult.tags #if {[llength [$c gettags $self$which$i]] != 0} { --- 1523,1528 ---- set c .$(a)canvas.c for {set i 0} {$i<$n} {incr i} { ! 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} { *************** *** 1648,1653 **** global font set textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] ! set topwidth [expr (2* $@ninlets-1) * ([look iowidth]*$_($@canvas:scale))] ! set bottomwidth [expr (2*$@noutlets-1) * ([look iowidth]*$_($@canvas:scale))] set @xs [max [look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $font(pady)+$font(height)] --- 1639,1644 ---- global font set textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] ! set topwidth [expr (2* $@ninlets-1) * [look iowidth]] ! set bottomwidth [expr (2*$@noutlets-1) * [look iowidth]] set @xs [max [look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $font(pady)+$font(height)] *************** *** 1710,1714 **** set propose $c.${self}propose set @text [$t get 1.0 1.end] - $self erase after 1 "destroy $t" #after 1 "destroy $propose" --- 1701,1704 ---- *************** *** 1717,1720 **** --- 1707,1711 ---- pd .$@canvas text_setto !$self $l focus $c + $self erase ;# (why?) } *************** *** 1757,1780 **** global canvas clipboard set wires {} - # look up for wire id foreach x $wires2 { ! mset {outobj outport inobj inport} $x ! set obj1 [lindex $@children $outobj] ! set obj2 [lindex $@children $inobj] ! set find [lsearch $@wires_pair $x] ! if { $find == -1} { ! # new wire!!! ! if {[info exists _($obj1:valid)] & [info exists _($obj2:valid)]} { ! lappend @wires_pair [list $outobj $outport $inobj $inport] ! set new_wire [eval [list Wire_new $self $outobj $outport $inobj $inport]] ! lappend @wires_pair $new_wire ! lappend wires $new_wire ! } else { puts "$obj1 or $obj2 not born yet" ! set @unborn_wire [lappend @unborn_wire $x]} ! } else { ! # wire already exist ! lappend wires [lindex $@wires_pair [expr $find + 1]] ! } } set born [lwithout $wires $@wires] --- 1748,1769 ---- global canvas clipboard set wires {} foreach x $wires2 { ! mset {outobj outport inobj inport} $x ! set obj1 [lindex $@children $outobj] ! set obj2 [lindex $@children $inobj] ! set find [lsearch $@wires_pair $x] ! if {$find == -1} {# new wire!!! ! if {[info exists _($obj1:valid)] & [info exists _($obj2:valid)]} { ! lappend @wires_pair [list $outobj $outport $inobj $inport] ! set new_wire [eval [list Wire_new $self $outobj $outport $inobj $inport]] ! lappend @wires_pair $new_wire ! lappend wires $new_wire ! } else { puts "$obj1 or $obj2 not born yet" ! set @unborn_wire [lappend @unborn_wire $x] ! } ! } else {# wire already exists ! lappend wires [lindex $@wires_pair [expr $find + 1]] ! } } set born [lwithout $wires $@wires] *************** *** 1785,1803 **** $x changed $x canvas= $self - if {$@duplicating} { - lappend @selection_wire $x - #puts "appending $x from duplication..........." - $x selected?= 1 - if {[llength $@selection_wire] == $canvas(dup_wire_num)} {set @duplicating 0} - } - if {[info exists clipboard(copying)]} { - if {$clipboard(copying)} { - lappend @selection_wire $x; $x selected?= 1 - if {$i == $born_num} { - set clipboard(copying) 0 - set clipboard(orig_cpcanvas) $self - } - } - } incr i } --- 1774,1777 ---- *************** *** 1849,1856 **** def View move {dx dy} { mset {x y} [$self xy] ! set dx2 [expr $dx / $_($@canvas:scale)] ! set dy2 [expr $dy / $_($@canvas:scale)] ! set @x1 [expr $@x1+$dx2] ! set @y1 [expr $@y1+$dy2] #mset {u v} [$self xy] #.$(a)canvas.c move $self [expr $u-$x] [expr $v-$y] --- 1823,1828 ---- def View move {dx dy} { mset {x y} [$self xy] ! set @x1 [expr $@x1+$dx] ! set @y1 [expr $@y1+$dy] #mset {u v} [$self xy] #.$(a)canvas.c move $self [expr $u-$x] [expr $v-$y] *************** *** 1867,1876 **** #!@#$ this method is too long ! def Canvas motion {x y mods state} { global font canvas tooltip set canvas(current) $self set c .$self.c ! set x [$c canvasx $x] ! set y [$c canvasy $y] if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { --- 1839,1848 ---- #!@#$ this method is too long ! def Canvas motion {x y mods} { global font canvas tooltip set canvas(current) $self set c .$self.c ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { *************** *** 1883,1897 **** set oldpos $@curpos set @curpos [list $x $y] - if {[llength [$c gettags lnew]]} { - mset {ox1 oy1 ox2 oy2} [lrange [$c coords lnew] end-3 end] - mset {x1 y1} [lrange [$c coords lnew] 0 1] - set l [$c coords lnew] - #if {[llength $l]<4 || [distance [list $ox1 $oy1] [list $x $y]] < 30} { - # set l [lrange $l 0 [expr [llength $l]-3]] - #} - #lappend l $x $y - set l [list $x1 $y1 $x $y] - $c coords lnew $l - } # detects if the focus is not on the canvas itself in run mode, ie. numbox if {!$@editmode & [$self focus] != $self & [$self focus] != ""} {[$self focus] motion $x $y $mods} --- 1855,1858 ---- *************** *** 1914,1917 **** --- 1875,1881 ---- } } + none {} + #default {error "unknown action '$@action'"} + default {$@action motion $x $y $mods} } mset {type id} [$self identify_target $x $y -1 -1 "move "] *************** *** 1922,1930 **** if {$@editmode && [llength [$id bbox]]} { mset {x1 y1 x2 y2} [$id bbox] - set x1 [expr $x1 * $@scale] - set y1 [expr $y1 * $@scale] - set x2 [expr $x2 * $@scale] - set y2 [expr $y2 * $@scale] - set var [expr 2*$@scale] if {$y<[expr $y1+2]} { set port [$id hilite_io i $x $y] --- 1886,1889 ---- *************** *** 1942,1947 **** } } ! wire { ! } } } --- 1901,1905 ---- } } ! wire {} } } *************** *** 1949,1957 **** #-----------------------------------------------------------------------------------# def Canvas identify_target {x y b f label} { - global _ set c .$self.c set stack [lreverse [$c find overlapping [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]]] foreach tag $stack { ! set tags [$c gettags $tag] if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} --- 1907,1916 ---- #-----------------------------------------------------------------------------------# def Canvas identify_target {x y b f label} { set c .$self.c + set x [expr $x*$@scale] + set y [expr $y*$@scale] set stack [lreverse [$c find overlapping [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]]] foreach tag $stack { ! set tags [$c gettags $tag] if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} *************** *** 1999,2002 **** --- 1958,1962 ---- def Canvas wire_from {} {return $@wire_from} def Canvas wire_to {} {return $@wire_to} + def Canvas scale {} {return $@scale} def StatusBar draw {x y} { *************** *** 2004,2009 **** set c .$(a)canvas.c set f [$self widget] ! set x [$c canvasx $x] ! set y [$c canvasy $y] set tags [$c gettags [lindex [$c find overlapping \ [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] --- 1964,1970 ---- set c .$(a)canvas.c set f [$self widget] ! set scale [$@canvas scale] ! set x [expr [$c canvasx $x]/$scale] ! set y [expr [$c canvasy $y]/$scale] set tags [$c gettags [lindex [$c find overlapping \ [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] *************** *** 2018,2022 **** } if {[string length [$@canvas focus]]} {set t "focus: [$@canvas focus]"} ! $f.1.pos configure -text "($x,$y)" $f.1.what configure -text $t $f.1.mode configure -text [if {[$@canvas editmode]} {list "Edit"} {list "Run "}] --- 1979,1983 ---- } if {[string length [$@canvas focus]]} {set t "focus: [$@canvas focus]"} ! $f.1.pos configure -text [format "(%d,%d)" [expr int($x)] [expr int($y)]] $f.1.what configure -text $t $f.1.mode configure -text [if {[$@canvas editmode]} {list "Edit"} {list "Run "}] *************** *** 2139,2143 **** --- 2100,2124 ---- } + class_new FutureWire {View} + def* FutureWire init {canvas x1 y1} { + super + set @x1 $x1 + set @y1 $y1 + set @canvas $canvas + $self motion $x1 $y1 0 + } + def* FutureWire motion {x2 y2 mods} {set @x2 $x2; set @y2 $y2; $self draw} + def* FutureWire unclick {x2 y2 b f} { + $self motion $x2 $y2 $f + post "UNCLICK should happen now" + $self _delete + } + def FutureWire draw {} { + $self item WIRE line [list $@x1 $@y1 $@x2 $@y2] -dash {4 4 4 4} -fill [look wiredash] + } + def* FutureWire _delete {} {super} + #!@#$ this method is too long + # this method receives (x,y) in descaled coords def* Canvas clickedit {x y b f} { set c .[$self canvas].c *************** *** 2160,2167 **** # handles the dash wire drawing mset {x1 y1 x2 y2} [$id bbox] - set x1 [expr $x1 * $@scale] - set y1 [expr $y1 * $@scale] - set x2 [expr $x2 * $@scale] - set y2 [expr $y2 * $@scale] set outs 0; set outs [$id noutlets] set ins 0; set ins [$id ninlets] --- 2141,2144 ---- *************** *** 2169,2179 **** set out [expr int(($x-$x1)*$outs/($x2-$x1))] mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] ! $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] set @wire_from [list $id $out] #click on a outlet with shift ! if {$f == 1} { ! if {![llength $@shift_wires]} {set @shift_wires $@wire_from; puts "store::::: $@shift_wires"} ! } ! set @action wire return } else { --- 2146,2153 ---- set out [expr int(($x-$x1)*$outs/($x2-$x1))] mset {x1 y1 x2 y2} [$c bbox ${id}o${out}] ! set @action [FutureWire new $self [expr ($x1+$x2)/2] [expr ($y1+$y2)/2]] set @wire_from [list $id $out] #click on a outlet with shift ! if {$f == 1 && ![llength $@shift_wires]} {set @shift_wires $@wire_from} return } else { *************** *** 2225,2229 **** set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] $id delete ! pd .$self disconnect $wire set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $id] [lsearch $@wires_pair $id]] set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] --- 2199,2203 ---- set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] $id delete ! $self disconnect $wire set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $id] [lsearch $@wires_pair $id]] set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] *************** *** 2244,2248 **** set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] $id delete ! pd .$self disconnect $wire set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $id] [lsearch $@wires_pair $id]] set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] --- 2218,2222 ---- set wire [lindex $@wires_pair [expr [lsearch $@wires_pair $id]-1]] $id delete ! $self disconnect $wire set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $id] [lsearch $@wires_pair $id]] set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] *************** *** 2274,2279 **** set c .$self.c focus $c ! set x [$c canvasx $x] ! set y [$c canvasy $y] set @click_at [list $x $y] #if {$@editmode && !($f&2)} {$self clickedit $x $y $b $f; return} --- 2248,2253 ---- set c .$self.c focus $c ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] set @click_at [list $x $y] #if {$@editmode && !($f&2)} {$self clickedit $x $y $b $f; return} *************** *** 2302,2306 **** set selected_elements [lreplace $selected_elements $selrect_index $selrect_index] if {[llength $selected_elements]} { - set element_tags {} set ids {} set wids {} --- 2276,2279 ---- *************** *** 2311,2315 **** if {[regexp {^([0-9a-f]{6,8})} [$c gettags $tag] id]} {lappend wids $id} } ! set selected_objs [lsort -unique $ids] set selected_wires [lsort -unique $wids] --- 2284,2288 ---- if {[regexp {^([0-9a-f]{6,8})} [$c gettags $tag] id]} {lappend wids $id} } ! set selected_objs [lsort -unique $ids] set selected_wires [lsort -unique $wids] *************** *** 2324,2330 **** } - puts "selected_objs:$selected_objs selection:$@selection selection_wire:$@selection_wire" # hilite objects - #foreach obj $@selection {$c itemconfigure ${obj}BASE -outline [look selectframe]} foreach obj $@selection {$obj selected?= 1} if {[llength $@selection] == 1} { --- 2297,2301 ---- *************** *** 2340,2375 **** } wire { ! #mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] ! # if making wire without shift key (delete the dash line) ! if {!$f} {$c delete lnew} else { ! $c delete lnew ! mset {from outlet} $@wire_from ! set orig $from ! mset {x1 y1 x2 y2} [$c bbox ${orig}o${outlet}] ! $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! } ! set x1 [expr $x/$_($@canvas:scale)] ! set y1 [expr $y/$_($@canvas:scale)] ! set x2 [expr $x1 - 1] ! set y2 [expr $y1 - 1] ! mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] ! puts "type:: $type ||| id:: $id" if {$id != ""} { ! mset {x1 y1 x2 y2} [$id bbox] ! set x1 [expr $x1 * $@scale] ! set y1 [expr $y1 * $@scale] ! set x2 [expr $x2 * $@scale] ! set y2 [expr $y2 * $@scale] ! set ins 0; set ins [$id ninlets] ! if {$y<$y1+6 && $ins} { ! set in [expr int(($x-$x1)*$ins/($x2-$x1))] ! set @wire_to [list $id $in] ! post "wire_from=%s wire_to=%s" $@wire_from $@wire_to ! mset {from outlet} $@wire_from ! mset {to inlet} $@wire_to ! pd .$self connect [lsearch $@children $from] $outlet \ ! [lsearch $@children $to] $inlet } ! } } edit { --- 2311,2333 ---- } wire { ! #mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] ! # if making wire without shift key (delete the dash line) ! set x1 $x ! set y1 $y ! mset {type id} [$@canvas identify_target $x $y -1 -1 "unclick"] if {$id != ""} { ! mset {x1 y1 x2 y2} [$id bbox] ! set ins 0; set ins [$id ninlets] ! if {$y<$y1+6 && $ins} { ! set in [expr int(($x-$x1)*$ins/($x2-$x1))] ! set @wire_to [list $id $in] ! mset {from outlet} $@wire_from ! mset {to inlet} $@wire_to ! $self connect [list \ ! [lsearch $@children $from] $outlet \ ! [lsearch $@children $to] $inlet] ! } } ! if {!$f} {$c delete lnew} } edit { *************** *** 2379,2384 **** set @obj_in_edit $id $id edit - $id draw - } move { --- 2337,2340 ---- *************** *** 2392,2397 **** $@history add [list $self undomove $objs] } } - } --- 2348,2355 ---- $@history add [list $self undomove $objs] } + none {} + #default {error "unknown action '$@action'"} + default {$@action unclick $x $y $b $f} } } *************** *** 2402,2407 **** def* Canvas unclick {x y b f} { set c .$self.c ! set x [$c canvasx $x] ! set y [$c canvasy $y] if {$@editmode} {$self unclickedit $x $y $b $f} {$self unclickrun $x $y %b} $self adjust_scrollbars --- 2360,2365 ---- def* Canvas unclick {x y b f} { set c .$self.c ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] if {$@editmode} {$self unclickedit $x $y $b $f} {$self unclickrun $x $y %b} $self adjust_scrollbars *************** *** 2575,2579 **** set per [lindex $scale(canned) $i] $spinbox set $per% ! set @scale [expr $per/100.0] $self redraw } --- 2533,2537 ---- set per [lindex $scale(canned) $i] $spinbox set $per% ! set @scale [expr $per/100.0] ;# @scale must be float, not int $self redraw } *************** *** 2607,2614 **** def Canvas key {x y key iso shift} { set c .$self.c ! set x [$c canvasx $x] ! set y [$c canvasy $y] ! global OS ! set c .$self.c $self hide_tooltip if {[$self focus] != ""} { --- 2565,2570 ---- def Canvas key {x y key iso shift} { set c .$self.c ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] $self hide_tooltip if {[$self focus] != ""} { *************** *** 2616,2624 **** } #if {$iso != ""} {scan $iso %c key} - if {$key == "BackSpace" || $key == "Delete" || $key == "KP_Delete"} { - $self delete_selection - } if {$shift} {set motion 10} {set motion 1} ! switch $key { Up {$self selection_move 0 -$motion} Down {$self selection_move 0 +$motion} --- 2572,2578 ---- } #if {$iso != ""} {scan $iso %c key} if {$shift} {set motion 10} {set motion 1} ! switch -regexp -- $key { ! BackSpace|Delete|KP_Delete {$self delete_selection} Up {$self selection_move 0 -$motion} Down {$self selection_move 0 +$motion} *************** *** 2676,2681 **** --- 2630,2637 ---- def Box update_size {} {} + # will be so that @wires are updated correctly without break encapsulation def* Box connect_out {} {} def* Box connect_in {} {} + def Box draw {} { #set text "[$@canvas index $self]: " *************** *** 2770,2775 **** def Wire draw {} { ! set bbox1 [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] ! set bbox2 [.$(a)canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] if {[llength $bbox1] < 4} {puts stderr "wire_draw: crap ($@obj1 outlet)"; return} if {[llength $bbox2] < 4} {puts stderr "wire_draw: crap ($@obj2 inlet)"; return} --- 2726,2732 ---- def Wire draw {} { ! set scale [$@canvas scale] ! set bbox1 [lmap / [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $scale] ! set bbox2 [lmap / [.$(a)canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] $scale] if {[llength $bbox1] < 4} {puts stderr "wire_draw: crap ($@obj1 outlet)"; return} if {[llength $bbox2] < 4} {puts stderr "wire_draw: crap ($@obj2 inlet)"; return}

1 0

packages TODO,1.19,1.20
by Hans-Christoph Steiner 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26860 Modified Files: TODO Log Message: did some TODO-o-rama Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/TODO,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** TODO 25 Jul 2006 02:13:30 -0000 1.19 --- TODO 13 Aug 2006 22:15:47 -0000 1.20 *************** *** 1,3 **** --- 1,6 ---- + - make a web page that has stuff that can't be included due to license and patent issues: + (percolate, mp3, mpeg2, mpeg4, etc) + - reintroduce patch for making Pd window font not bold

1 0

packages/darwin_app TODO,1.20,1.21
by Hans-Christoph Steiner 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26860/darwin_app Modified Files: TODO Log Message: did some TODO-o-rama Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/TODO,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TODO 11 Apr 2006 02:06:06 -0000 1.20 --- TODO 13 Aug 2006 22:15:47 -0000 1.21 *************** *** 1,3 **** --- 1,7 ---- + - create background image for .dmg + + - create /Applications link in .dmg + - fix app permissions so that you can drop a new app on top of an old one to upgrade *************** *** 65,71 **** semi-abandoned TODOs - - make a web page that has stuff that can't be included due to license issues: - (percolate) - - instead of shipping Pd.app with a org.puredata.pd.plist, make a script that uses the "defaults" command to add the desired prefs to any existing --- 69,72 ---- *************** *** 73,77 **** working, i.e. loadlib1, loadlib2, etc) - - - create Tcl script called from Prefs that creates links for the standard unix - (this probably makes more sense to have in "make devsymlinks") --- 74,75 ----

1 0

pd/src desire.tk,1.1.2.327,1.1.2.328
by Mathieu Bouchard 14 Aug '06

14 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25408 Modified Files: Tag: devel_0_39 desire.tk Log Message: can undo wire deletion Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.327 retrieving revision 1.1.2.328 diff -C2 -d -r1.1.2.327 -r1.1.2.328 *** desire.tk 13 Aug 2006 19:09:04 -0000 1.1.2.327 --- desire.tk 13 Aug 2006 22:11:19 -0000 1.1.2.328 *************** *** 1807,1821 **** } ! def* Canvas wires {} {return $@wires} ! def* Canvas delete_selection {} { ! set c .$self.c foreach obj $@selection { - #pd .$self object_delete !$obj - puts "wire to erase: $_($obj:wires)" foreach wire $_($obj:wires) { set find [lsearch $@wires_pair $wire] if { $find != -1} { ! pd .$self disconnect [lindex $@wires_pair [expr $find - 1]] ## remove the selected wire from the @wires_pair... set @wires_pair [lreplace $@wires_pair $find $find] --- 1807,1819 ---- } ! def Canvas wires {} {return $@wires} ! def Canvas delete_selection {} { ! #if {![llength $@selection] && ![llength $@selection_wire]} {return} foreach obj $@selection { foreach wire $_($obj:wires) { set find [lsearch $@wires_pair $wire] if { $find != -1} { ! $self disconnect [lindex $@wires_pair [expr $find - 1]] ## remove the selected wire from the @wires_pair... set @wires_pair [lreplace $@wires_pair $find $find] *************** *** 1824,1831 **** $wire delete } - #$obj erase pd .$self object_delete !$obj } ! # before obj is deleted, it will be selected, therefore # $@obj_in_edit != {}, so don't forget to set it to {}. # needs to handle obj_in_edit and selection!!! --- 1822,1837 ---- $wire delete } pd .$self object_delete !$obj } ! foreach x $@selection_wire { ! set find [lsearch $@wires_pair $x] ! if {$find != -1} { ! $self disconnect [lindex $@wires_pair [expr $find - 1]] ! set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]] ! } ! $x delete ! } ! set $@selection_wire {} ! # before obj is deleted, it will be selected, therefore # $@obj_in_edit != {}, so don't forget to set it to {}. # needs to handle obj_in_edit and selection!!! *************** *** 2124,2127 **** --- 2130,2142 ---- } + def Canvas disconnect {wire} { + mset {from outlet to inlet} $wire; pd .$self disconnect $from $outlet $to $inlet + $@history add [list $self connect $wire] + } + def Canvas connect {wire} { + mset {from outlet to inlet} $wire; pd .$self connect $from $outlet $to $inlet + $@history add [list $self disconnect $wire] + } + #!@#$ this method is too long def* Canvas clickedit {x y b f} { *************** *** 2150,2154 **** set y2 [expr $y2 * $@scale] set outs 0; set outs [$id noutlets] ! set ins 0; set ins [$id ninlets] if {$y>=$y2-6 && $outs} { set out [expr int(($x-$x1)*$outs/($x2-$x1))] --- 2165,2169 ---- set y2 [expr $y2 * $@scale] set outs 0; set outs [$id noutlets] ! set ins 0; set ins [$id ninlets] if {$y>=$y2-6 && $outs} { set out [expr int(($x-$x1)*$outs/($x2-$x1))] *************** *** 2176,2181 **** mset {from outlet} $@shift_wires mset {to inlet} $@wire_to ! pd .$self connect [lsearch $@children $from] $outlet \ ! [lsearch $@children $to] $inlet } return --- 2191,2195 ---- mset {from outlet} $@shift_wires mset {to inlet} $@wire_to ! $self connect [lsearch $@children $from] $outlet [lsearch $@children $to] $inlet } return *************** *** 2603,2618 **** #if {$iso != ""} {scan $iso %c key} if {$key == "BackSpace" || $key == "Delete" || $key == "KP_Delete"} { ! if {[llength $@selection] > 0} {$self delete_selection} ! if {[llength $@selection_wire] > 0} { ! foreach x $@selection_wire { ! set find [lsearch $@wires_pair $x] ! if {$find != -1} { ! pd .$self disconnect [lindex $@wires_pair [expr $find - 1]] ! set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]] ! } ! $x delete ! } ! set $@selection_wire {} ! } } if {$shift} {set motion 10} {set motion 1} --- 2617,2621 ---- #if {$iso != ""} {scan $iso %c key} if {$key == "BackSpace" || $key == "Delete" || $key == "KP_Delete"} { ! $self delete_selection } if {$shift} {set motion 10} {set motion 1}

1 0

pd/src desire.tk,1.1.2.326,1.1.2.327
by Mathieu Bouchard 13 Aug '06

13 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24962 Modified Files: Tag: devel_0_39 desire.tk Log Message: cleanup Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.326 retrieving revision 1.1.2.327 diff -C2 -d -r1.1.2.326 -r1.1.2.327 *** desire.tk 13 Aug 2006 08:42:24 -0000 1.1.2.326 --- desire.tk 13 Aug 2006 19:09:04 -0000 1.1.2.327 *************** *** 1880,1884 **** mset {ox1 oy1 ox2 oy2} [lrange [$c coords lnew] end-3 end] mset {x1 y1} [lrange [$c coords lnew] 0 1] - #puts "ox1=$ox1 oy1=$oy1 x=$x y=$y" set l [$c coords lnew] #if {[llength $l]<4 || [distance [list $ox1 $oy1] [list $x $y]] < 30} { --- 1880,1883 ---- *************** *** 1944,1966 **** #-----------------------------------------------------------------------------------# def Canvas identify_target {x y b f label} { set c .$self.c ! set stack [lreverse [$c find overlapping \ ! [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]]] foreach tag $stack { set tags [$c gettags $tag] if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { - global _ if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} - #post "(.....) $id is a \[$class\] object" return [list "object" $id] } } foreach tag $stack { ! set tags [$c gettags $tag] ! if {[regexp {^([0-9a-f]{6,8})} $tags id]} { ! return [list "wire" $id] ! } } - #post "(.....) nothing in particular" return [list "nothing"] } --- 1943,1960 ---- #-----------------------------------------------------------------------------------# def Canvas identify_target {x y b f label} { + global _ set c .$self.c ! set stack [lreverse [$c find overlapping [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]]] foreach tag $stack { set tags [$c gettags $tag] if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} return [list "object" $id] } } foreach tag $stack { ! set tags [$c gettags $tag] ! if {[regexp {^([0-9a-f]{6,8})} $tags id]} {return [list "wire" $id]} } return [list "nothing"] } *************** *** 2093,2096 **** --- 2087,2091 ---- $self copy $self paste + $clipboard _delete set clipboard $backup } *************** *** 2122,2126 **** menu $p -tearoff false if {$id == ""} { ! $self populate_menu $p {popup_properties popup_help} } { $id populate_menu $p {popup_properties popup_open popup_help} --- 2117,2121 ---- menu $p -tearoff false if {$id == ""} { ! $self populate_menu $p {popup_properties popup_help} } { $id populate_menu $p {popup_properties popup_open popup_help} *************** *** 2129,2133 **** } ! # this method is too long def* Canvas clickedit {x y b f} { set c .[$self canvas].c --- 2124,2128 ---- } ! #!@#$ this method is too long def* Canvas clickedit {x y b f} { set c .[$self canvas].c *************** *** 2610,2625 **** if {[llength $@selection] > 0} {$self delete_selection} if {[llength $@selection_wire] > 0} { - puts "delete this $self :: $@selection_wire" foreach x $@selection_wire { ! set find [lsearch $@wires_pair $x] ! if { $find != -1} { ! pd .$self disconnect [lindex $@wires_pair [expr $find - 1]] ! # remove the selected wire from the @wire_pair... ! set @wires_pair [lreplace $@wires_pair $find $find] ! set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]] } $x delete } - set $@selection_wire {} } --- 2605,2616 ---- if {[llength $@selection] > 0} {$self delete_selection} if {[llength $@selection_wire] > 0} { foreach x $@selection_wire { ! set find [lsearch $@wires_pair $x] ! if {$find != -1} { ! pd .$self disconnect [lindex $@wires_pair [expr $find - 1]] ! set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]] } $x delete } set $@selection_wire {} } *************** *** 2637,2649 **** if {$_($@selection:_class) == "ObjectBox"} {$@selection edit; $self dehilite_io} } else { - puts "connect this :::: $@keynav_iosel" set from_obj [lindex $@keynav_iosel 0] ! set to_obj [lindex $@keynav_iosel 1] ! set from [lsearch $@children [lindex $@keynav_iosel 0]] ! set to [lsearch $@children [lindex $@keynav_iosel 1]] ! puts "from::: $from to:::$to" ! pd .$self connect [list $from [lindex $_($from_obj:ioselect) 0] $to [lindex $_($to_obj:ioselect) 0]] $self dehilite_io - } } --- 2628,2639 ---- if {$_($@selection:_class) == "ObjectBox"} {$@selection edit; $self dehilite_io} } else { set from_obj [lindex $@keynav_iosel 0] ! set to_obj [lindex $@keynav_iosel 1] ! set from [lsearch $@children [lindex $@keynav_iosel 0]] ! set inlet [lindex $_($from_obj:ioselect) 0] ! set to [lsearch $@children [lindex $@keynav_iosel 1]] ! set outlet [lindex $_($to_obj:ioselect) 0] ! pd .$self connect [list $from $inlet $to $outlet] $self dehilite_io } } *************** *** 2707,2714 **** super $dx $dy #$self draw_wires - #foreach wire $@wires { - # set _($wire:select_by) $_($@canvas:select_by) - #$wire draw - #} } --- 2697,2700 ---- *************** *** 2722,2731 **** if {$in_selection && [llength $_($@canvas:selection)]>1} { foreach obj $_($@canvas:selection) {mset {x y} [$obj xy];$obj set_orig_xy $x $y} - puts "begin to move _______ $_($@canvas:selection)" set _($@canvas:action) move } { $@canvas deselect_all set _($@canvas:selection) $self - #set _($@canvas:action) move set _($@canvas:action) edit } --- 2708,2715 ---- *************** *** 2741,2752 **** for {set n 0} {$n<$ports} {incr n} { ! set tag $self$type$n ! set area [.$(a)canvas.c bbox $self$type$n] ! set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ] ! set dist [expr abs($x - $center)] ! if {$dist < [expr ([look iowidth]/2)+5] && $dist > 0} {set port $n} } ! ! if {$ports==0 | $port==-1} return #set port [expr int(($x-$x1)*$ports/$xs)] --- 2725,2735 ---- for {set n 0} {$n<$ports} {incr n} { ! set tag $self$type$n ! set area [.$(a)canvas.c bbox $self$type$n] ! set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ] ! set dist [expr abs($x - $center)] ! if {$dist < [expr ([look iowidth]/2)+5] && $dist > 0} {set port $n} } ! if {$ports==0 | $port==-1} return #set port [expr int(($x-$x1)*$ports/$xs)] *************** *** 2771,2779 **** set @port2 $inlet set @canvas $canvas - #set _($@obj1:wires) $self - #set _($@obj2:wires) $self # associate wires to its connected objects lappend _($@obj1:wires) $self - puts "_($@obj1:wires) is $_($@obj1:wires)" lappend _($@obj2:wires) $self # select_by is a hack to get wires remain hilited if selected by serect.... --- 2754,2759 ---- *************** *** 2787,2792 **** def Wire draw {} { - #set thick 2 - #puts "------- from:$@obj1 outlet:$@port1 to:$@obj2 inlet:$@port2" set bbox1 [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] set bbox2 [.$(a)canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] --- 2767,2770 ---- *************** *** 2795,2806 **** mset {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] mset {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] - #wire_draw $self 1 $x1 $y1 $x2 $y2 set xys [list $x1 $y1 $x2 $y2] set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))] ! # how to customise the arrow size/shape? set arrowsize [expr $length<100 ? $length/10 : 10] if {$arrowsize < 5} {set arrow none} {set arrow last} set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] - # need this, maybe... #if {$@select_by == "selrect"} {set wire_color [look wirefg2]} {set wire_color [look wirefg]} if {[$self selected?]} {set wire_color [look wirefg2]} {set wire_color [look wirefg]} --- 2773,2782 ---- mset {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] mset {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] set xys [list $x1 $y1 $x2 $y2] set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))] ! # how to customise the arrow size/shape? set arrowsize [expr $length<100 ? $length/10 : 10] if {$arrowsize < 5} {set arrow none} {set arrow last} set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] #if {$@select_by == "selrect"} {set wire_color [look wirefg2]} {set wire_color [look wirefg]} if {[$self selected?]} {set wire_color [look wirefg2]} {set wire_color [look wirefg]} *************** *** 2808,2831 **** $self item WIRE line $xys -width [look wirethick] -smooth yes \ -arrow $arrow -arrowshape $arrowshape -fill $wire_color - - #puts ".......tags: [.$(a)canvas.c gettags $self]" - #if {[llength [.$(a)canvas.c gettags $self]] != 0} { - #$canvas coords $self $xys - #$canvas itemconfigure -arrow $arrow -arrowshape $arrowshape - #} { - #$canvas create line $xys -tags $self -width $thick \ - # -arrow $arrow -arrowshape $arrowshape -fill [look wirefg] - # $self item WIRE line $xys -width $thick -smooth yes \ - # -arrow $arrow -arrowshape $arrowshape -fill [look wirefg] - #} } - #def* Wire selected?= {flag} { - # if {$flag} {set colour [look wirefg2]} {set colour [look wirefg]} - # .$(a)canvas.c itemconfigure ${self}WIRE -fill $colour - #} - #!@#$ what's this? doesn't match the name of instance variables. def Wire update {source outlet target inlet kind} { set @source $source set @outlet $outlet --- 2784,2792 ---- $self item WIRE line $xys -width [look wirethick] -smooth yes \ -arrow $arrow -arrowshape $arrowshape -fill $wire_color } #!@#$ what's this? doesn't match the name of instance variables. def Wire update {source outlet target inlet kind} { + error "proof that this method is used somewhere..." set @source $source set @outlet $outlet *************** *** 3170,3179 **** set class $_($@of:class) if {![info exists fields($class)]} {set class obj} - puts "this is a $_($@of:class) class" set orig {} set props ".$@of reload" set props2 {} foreach var [lrange $fields($class) 5 end] { - #puts "$var --from-- $_($@of:$var) --to-- $@$var" lappend orig $_($@of:$var) lappend props2 $@$var ;# does $@$ really work or not? if not, fix objective.tcl ... --- 3131,3138 ---- *************** *** 3185,3198 **** default {set val $@$var} } ! if {[regexp -nocase {^([a-z])col$} $var]} { ! set val [unparse_color $val] ! puts "color ---- > $val" ! } switch -- $val { {} {set val "empty"}} set props "$props $val" } - puts "orig props:: $orig" - puts "inter props:: $props2" - puts "real props:: $props" pd $props } --- 3144,3151 ---- default {set val $@$var} } ! if {[regexp -nocase {^([a-z])col$} $var]} {set val [unparse_color $val]} switch -- $val { {} {set val "empty"}} set props "$props $val" } pd $props } *************** *** 3205,3236 **** wm title .$self "\[$class\] [say popup_properties]" if {![info exists fields($class)]} {set class obj} - puts "this is a $_($of:class) class" - puts "it has [llength $fields($class)] properties" - #clone values foreach var $fields($class) { - puts "$var ---------- $_($of:$var)" switch $var { ! is_log {if {$_($of:$var)} {set val "linear"} else { set val "logarithmic"}} ! isa {if {$_($of:$var)} {set val "yes"} else { set val "no"}} ! steady {if {$_($of:$var)} {set val "jump"} else { set val "steady"}} ! fstyle {if {$_($of:$var)} {set val "yes"} else { set val "no"}} default {set val $_($of:$var)} } - #set val $_($of:$var) switch -- $val { empty {set val ""}} if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]} set @$var $val } - - - #set @loadbang [expr $@isa & 1] - #set @scale [expr ($@isa>>20) & 1] set @class $_($of:class) - # the longest label is... foreach prop $fields($class) { ! set label [say $prop] ! if {[string length $label] > $@max_label} {set @max_label [string length $label]} } - foreach prop [lrange $fields($class) 5 end] { switch $prop { --- 3158,3178 ---- wm title .$self "\[$class\] [say popup_properties]" if {![info exists fields($class)]} {set class obj} foreach var $fields($class) { switch $var { ! is_log {if {$_($of:$var)} {set val "linear"} else {set val "logarithmic"}} ! isa {if {$_($of:$var)} {set val "yes" } else {set val "no"}} ! steady {if {$_($of:$var)} {set val "jump" } else {set val "steady"}} ! fstyle {if {$_($of:$var)} {set val "yes" } else {set val "no"}} default {set val $_($of:$var)} } switch -- $val { empty {set val ""}} if {[regexp -nocase {^([a-z])col$} $var]} {set val [parse_color $val]} set @$var $val } set @class $_($of:class) foreach prop $fields($class) { ! set label [say $prop] ! if {[string length $label] > $@max_label} {set @max_label [string length $label]} } foreach prop [lrange $fields($class) 5 end] { switch $prop { *************** *** 3271,3277 **** properties_dialog $self .$self $d } - - - #puts "$self = IEMPropertiesDialog $of" } --- 3213,3216 ---- *************** *** 3283,3287 **** foreach var {xscale yscale graphme} {set @$var $_($of:$var)} wm title .$self "[say canvas] [say popup_properties]" - #wm protocol $id WM_DELETE_WINDOW "canvas_cancel $id" set props { xscale "X units/px: " entry {-width 10} --- 3222,3225 ---- *************** *** 3291,3295 **** pack [checkbutton .$self.graphme -text "graph on parent" \ -variable @graphme -anchor w] -side top - #bind .$self.xscale.entry <KeyPress-Return> "canvas_ok $id" #bind .$self.yscale.entry <KeyPress-Return> "canvas_ok $id" .$self.xscale.entry select from 0 --- 3229,3232 ----

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
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