Pd-cvs September 2005

pd-cvs@lists.iem.at

10 participants
189 discussions

pd/src desire.tk,1.1.2.41,1.1.2.42
by chunlee 13 Sep '05

13 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27715 Modified Files: Tag: devel_0_39 desire.tk Log Message: item_delete added Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.41 retrieving revision 1.1.2.42 diff -C2 -d -r1.1.2.41 -r1.1.2.42 *** desire.tk 11 Sep 2005 11:31:49 -0000 1.1.2.41 --- desire.tk 13 Sep 2005 09:08:23 -0000 1.1.2.42 *************** *** 535,539 **** pdtk_text_new \ ! $canvas.c ${object_id}TEXT [expr $_($object_id:cx)+2] [expr $_($object_id:cy)+2] \ $obj_name $font(size) #000000 } --- 535,539 ---- pdtk_text_new \ ! $canvas.c $object_id [expr $_($object_id:cx)+2] [expr $_($object_id:cy)+2] \ $obj_name $font(size) #000000 } *************** *** 1052,1057 **** set _($self:current_x) 30 set _($self:current_y) 30 ! set _($self:editable) $editable ! puts "pdtk_canvas_new::: $name $width $height $geometry $editable" } --- 1052,1067 ---- set _($self:current_x) 30 set _($self:current_y) 30 ! #set _($self:editable) $editable ! ! #if {$editable == 1} { ! # puts "editable == 1" ! # set _($self:mode) "edit" ! #} else { ! # set _($self:mode) "run" ! #} ! ! puts "self = $self" ! ! #puts "pdtk_canvas_new::: $name $width $height $geometry $editable" } *************** *** 1257,1261 **** $canvas coords ${self}i$i $points } { ! $canvas create rectangle $points -tags "${self}i ${self}i$i" -outline $look(inletfg) } } --- 1267,1271 ---- $canvas coords ${self}i$i $points } { ! $canvas create rectangle $points -tags "${self}i ${self}i$i $self" -outline $look(inletfg) } } *************** *** 1269,1273 **** $canvas coords ${self}o$i $points } { ! $canvas create rectangle $points -tags "${self}o ${self}o$i" -outline $look(outletfg) } } --- 1279,1283 ---- $canvas coords ${self}o$i $points } { ! $canvas create rectangle $points -tags "${self}o ${self}o$i $self" -outline $look(outletfg) } } *************** *** 1282,1290 **** #-----------------------------------------------------------------------------------# # create a new text object ! proc pdtk_text_new {canvas myname x y text font color} { $canvas create text $x $y \ -font [format -*-courier-medium--normal--%d-* $font] \ ! -tags $myname -text $text -fill $color -anchor nw ! foreach {x1 y1 x2 y2} [$canvas bbox $myname] {} } --- 1292,1300 ---- #-----------------------------------------------------------------------------------# # create a new text object ! proc pdtk_text_new {canvas self x y text font color} { $canvas create text $x $y \ -font [format -*-courier-medium--normal--%d-* $font] \ ! -tags "${self}TEXT $self" -text $text -fill $color -anchor nw ! foreach {x1 y1 x2 y2} [$canvas bbox ${self}TEXT] {} } *************** *** 1319,1323 **** text ${canvas}.${self}text -height 1 -width $name_len -relief flat \ -bg ${look(objectbg)} -borderwidth 0 \ ! -font [format -*-courier-medium--normal--%d-* $font_size] set _(self) $self --- 1329,1333 ---- text ${canvas}.${self}text -height 1 -width $name_len -relief flat \ -bg ${look(objectbg)} -borderwidth 0 \ ! -font [format -*-courier-medium--normal--%d-* $font_size] \ set _(self) $self *************** *** 1330,1334 **** $canvas create window [expr $@cx+1] [expr $@cy+1] \ ! -window ${canvas}.${self}text -anchor nw -tags "${self}text" ${canvas}.${self}text configure -pady 0 ${canvas}.${self}text insert 1.0 $text --- 1340,1344 ---- $canvas create window [expr $@cx+1] [expr $@cy+1] \ ! -window ${canvas}.${self}text -anchor nw -tags "${self}text $self" ${canvas}.${self}text configure -pady 0 ${canvas}.${self}text insert 1.0 $text *************** *** 1364,1367 **** --- 1374,1378 ---- #proc object_new {} { class_new objectbox { + global offset _ set canvas $_(focus) *************** *** 1461,1465 **** } } ! pdtk_text_new $canvas ${self}TEXT [expr $@cx+2] [expr $@cy+2] \ $obj_name $font(size) #000000 } --- 1472,1479 ---- } } ! #pdtk_text_new $canvas ${self}TEXT [expr $@cx+2] [expr $@cy+2] \ ! # $obj_name $font(size) #000000 ! ! pdtk_text_new $canvas $self [expr $@cx+2] [expr $@cy+2] \ $obj_name $font(size) #000000 } *************** *** 1483,1491 **** set canvas_id [canvastosym $canvas] foreach obj $_($canvas_id:selection) { ! objectbox_delete $obj $canvas ! #$canvas delete ${obj}BASE ${obj}BASE2 ${obj}BASE3 ! #$canvas delete ${obj}i ${obj}o ! #$canvas delete ${obj}TEXT ${obj}text destroy ${canvas}.${obj}text } --- 1497,1503 ---- set canvas_id [canvastosym $canvas] foreach obj $_($canvas_id:selection) { ! item_delete $obj $canvas destroy ${canvas}.${obj}text + } *************** *** 2473,2477 **** proc item {self canvas suffix type coords args} { if {![llength [$canvas gettags ${self}${suffix}]]} { ! eval [concat [list $canvas create $type $coords -tags ${self}$suffix] $args] } { eval [concat [list $canvas itemconfigure ${self}$suffix] $args] --- 2485,2490 ---- proc item {self canvas suffix type coords args} { if {![llength [$canvas gettags ${self}${suffix}]]} { ! eval [concat [list $canvas create $type $coords -tags "${self}$suffix $self"] $args] ! #eval [concat [list $canvas create $type $coords -tags ${self}$suffix] $args] } { eval [concat [list $canvas itemconfigure ${self}$suffix] $args] *************** *** 2480,2483 **** --- 2493,2500 ---- } + proc item_delete {self canvas} { + $canvas delete $self + } + def shadow draw {canvas coords} { global look

1 0

[PD-cvs] pd/src pd_base.tk, 1.1.2.5, 1.1.2.6 pd_objects.tk, 1.1.2.8, 1.1.2.9
by carmen rocco 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23927 Modified Files: Tag: devel_0_39 pd_base.tk pd_objects.tk Log Message: Index: pd_objects.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_objects.tk,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** pd_objects.tk 12 Sep 2005 13:34:46 -0000 1.1.2.8 --- pd_objects.tk 12 Sep 2005 17:36:48 -0000 1.1.2.9 *************** *** 7,12 **** } defaults { ! ins 1 ! outs 3 zero_x 0 zero_y 1 --- 7,14 ---- } defaults { ! x 1 y 1 ! ins 2 ! outs 2 ! color {123 232 4} zero_x 0 zero_y 1 *************** *** 114,117 **** --- 116,120 ---- cable { defaults { + class cable x 10 y 10 from "" *************** *** 119,123 **** } init { ! $p create line 0 0 0 0 -tags $tags -fill green -arrow last -width 8 } destroy { --- 122,126 ---- } init { ! $p create line 0 0 0 0 -tags $tags -fill green -arrow last -width 4 } destroy { *************** *** 125,135 **** } redraw { ! if {$from ne "" && [llength $from] == 2 } { ! set loc [ioloc $p $t [lindex $from 0] [lindex $from 1] out] ! set $x [lindex $loc 0]; set y [lindex $loc 1] } ! if {$to ne "" && [llength $to] == 2 } { ! set loc [ioloc $p $t [lindex $to 0] [lindex $to 1] in] ! set $xx [lindex $loc 0]; set yy [lindex $loc 1] } $p coords $item $x $y $xx $yy --- 128,138 ---- } redraw { ! if {[llength $from] == 2 } { ! set loc [ioloc $p $t [lindex $from 0] [lindex $from 1] outs] ! lassign $loc x y } ! if {[llength $to] == 2 } { ! set loc [ioloc $p $t [lindex $to 0] [lindex $to 1] ins] ! lassign $loc xx yy } $p coords $item $x $y $xx $yy *************** *** 139,156 **** } proc { ! proc ioloc {p t id n side} { variable "" ! array set ax {x x xx x y y yy y} ! foreach c {x y xx yy} { ! set $c [tr $p $t $ax($c) t [dict get $($t) $id $c]]} ! # puts "obj $x $y $xx $yy" ! array set nio "out [dict get $($t) $id outs] in [dict get $($t) $id ins]" ! set pos [expr $n / $nio($side).0 * ($xx - $x + 0.0) + $x] ! # puts "io $pos $y" ! return [list $pos $y] } } } msg { tags { --- 142,165 ---- } proc { ! proc ioloc {p t id n io} { variable "" ! foreach c {x xx y yy} { ! set $c [tr $p $t [string range $c 0 0] t [dict get $($t) $id $c]]} ! if {$io eq "ins"} {set py $y} {set py $yy} ! set px [expr ($n / ([dict get $($t) $id $io] + 0.0)) * ($xx - $x + 0.0) + $x] ! return [list $px $py] } } } + io { + init { + puts "io $ins $outs" + } + redraw { + puts "RedrawIO $ins $outs" + } + } + msg { tags { Index: pd_base.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_base.tk,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** pd_base.tk 12 Sep 2005 13:34:46 -0000 1.1.2.5 --- pd_base.tk 12 Sep 2005 17:36:47 -0000 1.1.2.6 *************** *** 7,13 **** io/cables scale selection - gridlines -> objects $p and $t are probably redundant (combine) ! port some complex widgets to test out feasability of this structure } --- 7,12 ---- io/cables scale selection $p and $t are probably redundant (combine) ! port some complex widgets } *************** *** 69,73 **** if {[dict exists $da y]} {set sy [dict get $da y]} {set sy 0} ! update $p $t $id abs [dict merge [dict merge [dict merge {class item color {128 128 128}} $da] [dict remove $a id]] [dict create x $x xx [expr $x + $sx] y $y yy [expr $y + $sy]]] 0 item_draw $p $t $id return $id} --- 68,72 ---- if {[dict exists $da y]} {set sy [dict get $da y]} {set sy 0} ! update $p $t $id abs [dict merge [dict merge [dict merge {class item ins 0 outs 0 color {128 128 128}} $da] [dict remove $a id]] [dict create x $x xx [expr $x + $sx] y $y yy [expr $y + $sy]]] 0 item_draw $p $t $id return $id} *************** *** 85,88 **** --- 84,90 ---- set rgb $color; set color [color $rgb] eval [dict get $obj $type init] + if {$class eq "item" && ($ins > 0 || $outs > 0)} { + eval [dict get $obj io init] + } } redraw $p $t $id *************** *** 166,170 **** set $tag [$p find withtag "$tags && $tag"]}} eval [dict get $obj $type redraw] ! # redraw_io $p $t $id } } --- 168,181 ---- set $tag [$p find withtag "$tags && $tag"]}} eval [dict get $obj $type redraw] ! if {$class eq "item" && ($ins > 0 || $outs > 0)} { ! eval [dict get $obj io redraw] ! foreach i [dict keys $($t)] { ! if {[dict get $($t) $i class] eq "cable"} { ! if {[lindex [dict get $($t) $i from] 0] eq $id || [lindex [dict get $($t) $i to] 0] eq $id} { ! redraw $p $t $i ! } ! } ! } ! } } } *************** *** 213,217 **** proc cleansel {p t sel} { set clean {} ! foreach item $sel {if {[lindex [$p itemcget $item -tags] 0] eq "item"} {lappend clean [lindex [$p itemcget $item -tags] 2]}} set clean [lsort -unique $clean] return $clean --- 224,230 ---- proc cleansel {p t sel} { set clean {} ! foreach item $sel { ! set class [lindex [$p itemcget $item -tags] 0] ! if {$class eq "item" || $class eq "cable"} {lappend clean [lindex [$p itemcget $item -tags] 2]}} set clean [lsort -unique $clean] return $clean *************** *** 268,272 **** proc item_info {p t clicked} { variable "" ! # return set n 0;$p delete hover foreach item $clicked { --- 281,285 ---- proc item_info {p t clicked} { variable "" ! return set n 0;$p delete hover foreach item $clicked { *************** *** 473,477 **** switch $action { selecta { ! updatesel $p $t [dict keys $($t)] } cut { --- 486,492 ---- switch $action { selecta { ! set items {} ! foreach i [dict keys $($t)] {if {[dict get $($t) $i class] eq "item"} {lappend items $i}} ! updatesel $p $t $items } cut {

1 0

[PD-cvs] pd/src pd_base.tk, 1.1.2.4, 1.1.2.5 pd_objects.tk, 1.1.2.7, 1.1.2.8
by carmen rocco 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28817 Modified Files: Tag: devel_0_39 pd_base.tk pd_objects.tk Log Message: eyah Index: pd_objects.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_objects.tk,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** pd_objects.tk 6 Sep 2005 22:58:52 -0000 1.1.2.7 --- pd_objects.tk 12 Sep 2005 13:34:46 -0000 1.1.2.8 *************** *** 33,40 **** } {set photo ""} $p itemconfigure $img -image $photo ! $p itemconfigure $box -fill $gcolor -outline $color -width [expr $selected + 1] } } - subwin { tags { --- 33,67 ---- } {set photo ""} $p itemconfigure $img -image $photo ! $p itemconfigure $box -fill $color -outline [color [lighten $rgb 0.3]] -width [expr $selected + 1] ! } ! } ! gridlines { ! defaults { ! class gridlines ! } ! redraw { ! foreach items $item {$p delete $items} ! foreach xy {x y} { ! array set ta {x n y w} ! array set tj {x center y left} ! array set igx {y width x height} ! set range [expr abs($($t:${xy}b) - $($t:${xy}a))] ! set nSlices [expr $range / $${xy}q] ! if {$nSlices > [set ${xy}m]} {set factor [expr int($nSlices / ($${xy}m + 0.0) + 1)]} else { ! set factor [expr 1. / (int(1./($nSlices / ($${xy}m + 0.0) + 0.0)) + 0.0)] ! } ! set increment [expr $${xy}q * $factor] ! for {set x [expr int($($t:${xy}a) / ($increment + 0.0) + 1)*($increment + 0.0)]} {[expr $($t:${xy}a) > $($t:${xy}b) ? $x >= $($t:${xy}b) : $x <= $($t:${xy}b)]} {set x [expr $($t:${xy}a) > $($t:${xy}b) ? $x - $increment : $x + $increment]} { ! set og [tr $p $t $xy t $x] ! set invgeo [winfo $igx($xy) $p] ! switch $xy { ! y {set coords [concat 0 $og $invgeo $og]} ! x {set coords [concat $og 0 $og $invgeo]}} ! $p lower [$p create text [lrange $coords 0 1] -font {{Bitstream Vera Sans} 8} -fill [rc] -anchor $ta($xy) -text [string range $x 0 7] -justify $tj($xy) -tags $atags] ! $p lower [$p create line $coords -fill $color -stipple gray50 -tags $atags] ! } ! } } } subwin { tags { *************** *** 42,45 **** --- 69,73 ---- } defaults { + x 32 y 24 ins 0 outs 0 *************** *** 130,134 **** } defaults { ! x 6.4 y 1.2 ins 1 outs 1 --- 158,162 ---- } defaults { ! x 2 y 2 ins 1 outs 1 *************** *** 141,145 **** redraw { $p coords $txt $x $y ! $p itemconfigure $box -fill $color $p itemconfigure $txt -font [list {bitstream vera sans} [expr int($sy)]] -text $msg lassign [$p bbox $txt] x y xx yy --- 169,173 ---- redraw { $p coords $txt $x $y ! $p itemconfigure $box -fill $color $p itemconfigure $txt -font [list {bitstream vera sans} [expr int($sy)]] -text $msg lassign [$p bbox $txt] x y xx yy Index: pd_base.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_base.tk,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** pd_base.tk 11 Sep 2005 11:48:37 -0000 1.1.2.4 --- pd_base.tk 12 Sep 2005 13:34:46 -0000 1.1.2.5 *************** *** 5,15 **** set todo { ! io ! cables scale selection gridlines -> objects ! group attr ! markers/snap/quant ! regions / rects (combine?) } --- 5,13 ---- set todo { ! io/cables scale selection gridlines -> objects ! $p and $t are probably redundant (combine) ! port some complex widgets to test out feasability of this structure } *************** *** 29,33 **** # omg the colours!! ! proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16777216))"]]} proc rgb {} {return [list [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"]]} proc lighten {rgb r} {set l {}; foreach c $rgb {lappend l [expr {(256 - $c) * $r + $c}]}; return $l} --- 27,31 ---- # omg the colours!! ! proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16777216.))"]]} proc rgb {} {return [list [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"]]} proc lighten {rgb r} {set l {}; foreach c $rgb {lappend l [expr {(256 - $c) * $r + $c}]}; return $l} *************** *** 58,90 **** $p coords sel $($t:fx) $($t:fy) $x $y}}} ! proc item_new {p t id d} { variable "" - #object definition dictionary (in pd_objects.tk or ~/.pd/*.tk) variable obj ! #generate an ID if one wasn't provided ! if {$id eq "-"} { ! if {[dict keys $($t)] eq ""} {set id 0} else { ! set id -1 ! while true {if {[lsearch -integer [dict keys $($t)] [incr id]] == -1} {break}}}} ! set ($t:ci) $id ! ! set type [dict get $d type] ! ! #figure out size/position ! set x [tr $p $t x i $($t:hx)]; set y [tr $p $t y i $($t:hy)] ! set sx 0; set sy 0 ! if {[dict exists $obj $type defaults x]} {set sx [dict get $obj $type defaults x]} ! if {[dict exists $obj $type defaults y]} {set sy [dict get $obj $type defaults y]} ! # 1 global defaults 2 object defaults 3 instance defaults ! set defaults [dict create x $x xx [expr $x + $sx] y $y yy [expr $y + $sy] color {128 128 128}] ! if {[dict exists $obj $type defaults]} {set defaults [dict merge $defaults [dict get $obj $type defaults]]} ! if {$d ne ""} {set defaults [dict merge $defaults $d]} ! update $p $t $id abs $defaults 0 ! ! #draw the item item_draw $p $t $id ! } proc item_draw {p t is} { --- 56,75 ---- $p coords sel $($t:fx) $($t:fy) $x $y}}} ! proc item_new {p t a} { variable "" variable obj + foreach local [dict keys $a] {set $local [dict get $a $local]} + if {[dict exists $obj $type defaults]} {set da [dict get $obj $type defaults]} {set da {}} + if {$id eq "-"} { + if {[dict keys $($t)] eq ""} {set id 0} else {set id -1 + while true {if {[lsearch [dict keys $($t)] [incr id]] == -1} {break}}}} ! if {![info exists x]} {set x 13; set y 31} ! if {[dict exists $da x]} {set sx [dict get $da x]} {set sx 0} ! if {[dict exists $da y]} {set sy [dict get $da y]} {set sy 0} ! update $p $t $id abs [dict merge [dict merge [dict merge {class item color {128 128 128}} $da] [dict remove $a id]] [dict create x $x xx [expr $x + $sx] y $y yy [expr $y + $sy]]] 0 item_draw $p $t $id ! return $id} proc item_draw {p t is} { *************** *** 94,103 **** foreach id $is { set type [dict get $($t) $id type] ! set tags [list item i$id $id] ! set color [color [dict get $($t:g) $($t:cg) color]] ! if {[dict exists $obj $type defaults]} { ! foreach local [dict keys [dict get $obj $type defaults]] { ! set $local [dict get $obj $type defaults $local]}} ! eval [dict get $obj $type init] redraw $p $t $id } --- 79,89 ---- foreach id $is { set type [dict get $($t) $id type] ! if {[dict exists $obj $type init]} { ! foreach local [dict keys [dict get $($t) $id]] { ! set $local [dict get $($t) $id $local]} ! set tags [list $class i$id $id] ! set rgb $color; set color [color $rgb] ! eval [dict get $obj $type init] ! } redraw $p $t $id } *************** *** 118,122 **** set ($t:sel) {} item_info $p $t "" ! send "delete $item" } } --- 104,108 ---- set ($t:sel) {} item_info $p $t "" ! send "delete $p:$item" } } *************** *** 132,136 **** rel {dict set ($t) $item $a [expr {[dict get $($t) $item $a] + [dict get $u $a]}]} } ! send [concat update $item $a [dict get $($t) $item $a]] } if {$redraw == 1} {redraw $p $t $item} --- 118,122 ---- rel {dict set ($t) $item $a [expr {[dict get $($t) $item $a] + [dict get $u $a]}]} } ! send [concat update $p:$item $a [dict get $($t) $item $a]] } if {$redraw == 1} {redraw $p $t $item} *************** *** 147,151 **** item_pos $p $t $($t:ci) abs [tr $p $t x i $x] [tr $p $t y i $y] [tr $p $t x i $($t:fx)] [tr $p $t y i $y] } ! first {item_new $p $t - [dict create type rect g $($t:cg) x 0 y 0 xx 0 yy 0 v 1]}}} proc resize_canvas {p t a x y} {viewpoint $p $t [dict create action resize x $x y $y]} --- 133,137 ---- item_pos $p $t $($t:ci) abs [tr $p $t x i $x] [tr $p $t y i $y] [tr $p $t x i $($t:fx)] [tr $p $t y i $y] } ! first {set ($t:ci) [item_new $p $t [dict create type rect id - x 0 y 0 xx 0 yy 0 v 1]]}}} proc resize_canvas {p t a x y} {viewpoint $p $t [dict create action resize x $x y $y]} *************** *** 165,178 **** if {[expr $y > $yy]} {lassign "$y $yy" yy y} set sx [expr $xx - $x]; set sy [expr $yy - $y] ! ! if {[lsearch -integer $($t:sel) $id] >= 0} { set color $($t:sc) set selected 1 } else { ! set color [color [dict get $($t) $id color]] set selected 0} ! if {[dict exists $($t) $id g]} { ! set gcolor [color [dict get $($t:g) [dict get $($t) $id g] color]]} ! set tags [concat item && i$id && $id] set item [$p find withtag $tags] if {[dict exists $obj $type tags]} { --- 151,164 ---- if {[expr $y > $yy]} {lassign "$y $yy" yy y} set sx [expr $xx - $x]; set sy [expr $yy - $y] ! if {[lsearch $($t:sel) $id] >= 0} { ! set rgb {233 233 233} set color $($t:sc) set selected 1 } else { ! set rgb [dict get $($t) $id color] ! set color [color $rgb] set selected 0} ! set atags [concat $class i$id $id] ! set tags [concat $class && i$id && $id] set item [$p find withtag $tags] if {[dict exists $obj $type tags]} { *************** *** 228,232 **** set clean {} foreach item $sel {if {[lindex [$p itemcget $item -tags] 0] eq "item"} {lappend clean [lindex [$p itemcget $item -tags] 2]}} ! set clean [lsort -integer -unique $clean] return $clean } --- 214,218 ---- set clean {} foreach item $sel {if {[lindex [$p itemcget $item -tags] 0] eq "item"} {lappend clean [lindex [$p itemcget $item -tags] 2]}} ! set clean [lsort -unique $clean] return $clean } *************** *** 234,238 **** proc hover {p t x y} { variable "" - foreach xy {x y} {set ($t:h$xy) [set $xy]} if {[$p find withtag sel] ne ""} { sel $p $t motion $x $y --- 220,223 ---- *************** *** 296,303 **** proc togglesel {p t d} { variable "" ! if {[lsearch -integer $($t:sel) $d] < 0} { set ($t:sel) [concat $($t:sel) $d] } else { ! set ($t:sel) [lsearch -inline -not -all -integer $($t:sel) $d] } redraw $p $t $d --- 281,288 ---- proc togglesel {p t d} { variable "" ! if {[lsearch $($t:sel) $d] < 0} { set ($t:sel) [concat $($t:sel) $d] } else { ! set ($t:sel) [lsearch -inline -not -all $($t:sel) $d] } redraw $p $t $d *************** *** 308,312 **** set os $($t:sel) set ($t:sel) $ns ! redraw $p $t [lsort -unique -integer [concat $os $ns]] item_info $p $t $ns } --- 293,297 ---- set os $($t:sel) set ($t:sel) $ns ! redraw $p $t [lsort -unique [concat $os $ns]] item_info $p $t $ns } *************** *** 331,340 **** set n 0 foreach k [concat id $keys] { ! text .i$t.$k -wrap none -width 8 -height 1 -bd 0 .i$t.$k insert 1.0 $k .i$t.$k tag add justify 1.0 end .i$t.$k tag configure justify -justify right .i$t.$k configure -state disabled ! text .i$t.${k}v -wrap none -width 16 -height 1 -bd 0 -bg gray94 bind .i$t.${k}v <Any-KeyRelease> "::pd::item_mua $p $t abs \[dict create $k \[.i$t.${k}v get 1.0 end\] \] 1" grid .i$t.$k .i$t.${k}v -sticky nsew --- 316,325 ---- set n 0 foreach k [concat id $keys] { ! text .i$t.$k -wrap none -width 8 -height 1 -bd 0 -font {{Bitstream Vera Sans} 11} .i$t.$k insert 1.0 $k .i$t.$k tag add justify 1.0 end .i$t.$k tag configure justify -justify right .i$t.$k configure -state disabled ! text .i$t.${k}v -wrap none -width 16 -height 1 -bd 0 -bg gray94 -font {{Bitstream Vera Sans} 10} bind .i$t.${k}v <Any-KeyRelease> "::pd::item_mua $p $t abs \[dict create $k \[.i$t.${k}v get 1.0 end\] \] 1" grid .i$t.$k .i$t.${k}v -sticky nsew *************** *** 406,419 **** $me add command -label $a -command "::pd::clip $p $t $a"} - - $m add cascade -label "group" -menu [set mg [menu $m.group -tearoff no]] - $mg add command -label "add" -command "::pd::group_new $p $t -" - $mg add cascade -label "sel" -menu [set mgs [menu $mg.selto -tearoff yes]] - foreach group [dict keys $($t:g)] {$mgs add command -label [dict get $($t:g) $group name] -command "::pd::group_assign $p $t $group"} - $m add cascade -label "object" -menu [set mo [menu $m.object -tearoff no]] foreach type [dict keys $obj] { ! $mo add command -label $type -command "::pd::item_new $p $t - \{type $type\}"} ! $m add cascade -label "view" -menu [set mv [menu $m.view -tearoff no]] --- 391,397 ---- $me add command -label $a -command "::pd::clip $p $t $a"} $m add cascade -label "object" -menu [set mo [menu $m.object -tearoff no]] foreach type [dict keys $obj] { ! $mo add command -label $type -command "::pd::item_new $p $t \{id - type $type x [tr $p $t x i $x] y [tr $p $t y i $y]\}"} $m add cascade -label "view" -menu [set mv [menu $m.view -tearoff no]] *************** *** 489,493 **** } redraw $p $t all - gridlines $p $t } --- 467,470 ---- *************** *** 518,522 **** set pasted {} foreach item [dict keys $($t:c)] { ! item_new $p $t - [dict get $($t:c) $item] } } --- 495,499 ---- set pasted {} foreach item [dict keys $($t:c)] { ! item_new $p $t [dict merge [dict get $($t:c) $item] {id -}] } } *************** *** 531,554 **** } - proc group_new {p t grp} { - variable "" - set exists 0 - dict for {key val} $($t:g) {if {[dict get $val name] eq $grp} {set exists 1}} - if {$exists == 0} { - if {$grp eq "-"} {set grp [random_txt [expr "int(floor(rand() * 10 + 2))"]]} - set n -1 - while true { if {[lsearch -integer [dict keys $($t:g)] [incr n]] == -1} {break}} - dict set ($t:g) $n name $grp - dict set ($t:g) $n color [rgb] - set ($t:cg) $n - } - } - - - proc group_assign {p t group} { - variable "" - item_mua $p $t abs [dict create g $group] 1 - } - proc item_mua {p t r u redraw} { variable "" --- 508,511 ---- *************** *** 565,570 **** set ($t:mode) $m(mode) $p configure -bg $m(bg) ! set ($t:ln) $m(ln) ! gridlines $p $t } --- 522,528 ---- set ($t:mode) $m(mode) $p configure -bg $m(bg) ! ! update $p $t grid abs [dict create ln $m(ln)] 1 ! redraw $p $t grid } *************** *** 595,599 **** set x [tr $p $t x i $x] set y [tr $p $t y i $y] ! item_new $p $t - [dict create type sound g 1 v 1 x $x y $y xx $x yy $y filename [regsub -- {^file:[/]+} $d "/"]] } } --- 553,557 ---- set x [tr $p $t x i $x] set y [tr $p $t y i $y] ! item_new $p $t [dict create type sound id - g 1 v 1 x $x y $y xx $x yy $y filename [regsub -- {^file:[/]+} $d "/"]] } } *************** *** 602,612 **** variable "" variable obj ! set opts [dict merge {bg gray86 ln white mode edit sc orange samplerate 44100 xa 0 xb 100 ya 0 yb 100 qx 10 qy 10 mx 15 my 15} $opts] foreach xy {x y} {foreach ab {a b} {set ($t:${xy}${ab}o) [dict get $opts ${xy}${ab}]}} ! foreach a {sc ln mode xa xb ya yb qx qy mx my samplerate} {set ($t:$a) [dict get $opts $a]} if {[winfo exists $p] != 1} { canvas $p -bg [dict get $opts bg] place $p -relwidth 1 -relheight 1 ! bind $p <Configure> "::pd::gridlines $p $t; ::pd::redraw $p $t all" bind $p <Enter> "focus $p" bind $p <Key> "::pd::key $p $t %k 1" --- 560,570 ---- variable "" variable obj ! set opts [dict merge {bg gray86 ln white mode edit sc orange samplerate 44100 xa 0 xb 100 ya 0 yb 100 xq 10 yq 10 xm 15 ym 15} $opts] foreach xy {x y} {foreach ab {a b} {set ($t:${xy}${ab}o) [dict get $opts ${xy}${ab}]}} ! foreach a {sc ln mode xa xb ya yb xq yq xm ym samplerate} {set ($t:$a) [dict get $opts $a]} if {[winfo exists $p] != 1} { canvas $p -bg [dict get $opts bg] place $p -relwidth 1 -relheight 1 ! bind $p <Configure> "::pd::redraw $p $t all" bind $p <Enter> "focus $p" bind $p <Key> "::pd::key $p $t %k 1" *************** *** 636,674 **** set i -1; set sel {} foreach a {i sel} {set ($t:$a) [set $a]} - group_new $p $t default } } ! gridlines $p $t item_draw $p $t all } ! proc gridlines {p t} { ! variable "" ! foreach item [$p find withtag gridline] {$p delete $item} ! foreach xy {x y} { ! array set ta {x n y w} ! array set tj {x center y left} ! array set igx {y width x height} ! set range [expr {abs($($t:${xy}b) - $($t:${xy}a))}] ! set nSlices [expr {$range / $($t:q$xy)}] ! if {$nSlices > $($t:m${xy})} {set factor [expr {int($nSlices / ($($t:m${xy}) + 0.0) + 1)}]} else { ! set factor [expr {1. / (int(1./($nSlices / ($($t:m${xy}) + 0.0) + 0.0)) + 0.0)}] ! } ! set increment [expr {$($t:q${xy}) * $factor}] ! for {set x [expr {int($($t:${xy}a) / ($increment + 0.0) + 1)*($increment + 0.0)}]} {[expr {$($t:${xy}a) > $($t:${xy}b) ? $x >= $($t:${xy}b) : $x <= $($t:${xy}b)}]} {set x [expr {$($t:${xy}a) > $($t:${xy}b) ? $x - $increment : $x + $increment}]} { ! set og [tr $p $t $xy t $x] ! set invgeo [winfo $igx($xy) $p] ! switch $xy { ! y {set coords [concat 0 $og $invgeo $og]} ! x {set coords [concat $og 0 $og $invgeo]}} ! $p lower [$p create text [lrange $coords 0 1] -font {{Bitstream Vera Sans} 8} -fill [rc] -anchor $ta($xy) -text [string range $x 0 7] -justify $tj($xy) -tags gridline] ! $p lower [$p create line $coords -fill $($t:ln) -stipple gray50 -tags gridline] ! }}} ! ! # variable pd_send ! # if {[catch {set pd_send [socket localhost 4400]}]} {set pd_send -1} {puts "connected $pd_send"} ! # catch { ! # set pd_receive [socket -server ::pd::receive_conn 4401] ! # } proc receive_conn {s addr port} { fileevent $s readable [list ::pd::receive $s] --- 594,610 ---- set i -1; set sel {} foreach a {i sel} {set ($t:$a) [set $a]} } } ! foreach a {ln xa xb ya yb xq yq xm ym} {set $a [dict get $opts $a]} ! item_new $p $t [dict create type gridlines id grid xa $xa xb $xb ya $ya yb $yb xq $xq yq $yq xm $xm ym $ym] item_draw $p $t all } ! variable pd_send ! set pd_send -1 ! proc connect {} { ! if {[catch {set pd_send [socket localhost 4400]}]} {set pd_send -1} {puts "connected $pd_send"} ! catch {set pd_receive [socket -server ::pd::receive_conn 4401]} ! } proc receive_conn {s addr port} { fileevent $s readable [list ::pd::receive $s] *************** *** 685,693 **** } proc send {msg} { ! # variable pd_send ! # if {$pd_send ne -1} { ! # puts $pd_send [concat $msg \;] ! # flush $pd_send ! # } } --- 621,630 ---- } proc send {msg} { ! # puts [concat s: $msg] ! variable pd_send ! if {$pd_send ne -1} { ! puts $pd_send [concat $msg \;] ! flush $pd_send ! } }

1 0

externals/grill/flext/source flbase.cpp, 1.24, 1.25 flbuf.cpp, 1.25, 1.26 fldsp.h, 1.15, 1.16 flext.cpp, 1.38, 1.39 flmsg.cpp, 1.18, 1.19 flsndobj.cpp, 1.9, 1.10 flsndobj.h, 1.8, 1.9 flstk.cpp, 1.6, 1.7 flstk.h, 1.7, 1.8 flsupport.h, 1.96, 1.97
by Thomas Grill 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22978/source Modified Files: flbase.cpp flbuf.cpp fldsp.h flext.cpp flmsg.cpp flsndobj.cpp flsndobj.h flstk.cpp flstk.h flsupport.h Log Message: changed initialization functions accordingly minimal additions for buffers and exception handling change click modifier to shift (seems to work) small fixes for tutorial examples added flfeatures.h for compile-time version-specific feature detection added typed flext::NewAligned fixed severe Altivec bug adapted for pd-devel 0.39 - better handling of click callback slimmed object data structures update DSP methods for SndObj and STK classes - more compatible handling of attributes in patcher (hiding is now an option - define FLEXT_ATTRHIDE) better buffer checking Index: fldsp.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldsp.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** fldsp.h 23 May 2005 16:52:44 -0000 1.15 --- fldsp.h 12 Sep 2005 10:27:40 -0000 1.16 *************** *** 55,61 **** --- 55,67 ---- t_sample *const *InSig() const { return invecs; } + //! returns input vector + t_sample *InSig(int i) const { return invecs[i]; } + //! returns array of output vectors (CntOutSig() vectors) t_sample *const *OutSig() const { return outvecs; } + //! returns output vector + t_sample *OutSig(int i) const { return outvecs[i]; } + //! typedef describing a signal vector #if FLEXT_SYS == FLEXT_SYS_JMAX Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** flsupport.h 30 Aug 2005 10:54:36 -0000 1.96 --- flsupport.h 12 Sep 2005 10:27:40 -0000 1.97 *************** *** 201,205 **** \note This must be true to use any of the other functions except set */ ! bool Ok() const { return sym && data; } /*! \brief Check if buffer content is valid (not in state of content change) --- 201,212 ---- \note This must be true to use any of the other functions except set */ ! bool Ok() const ! { ! return sym ! #if FLEXT_SYS == FLEXT_SYS_PD ! && arr ! #endif ! && data; ! } /*! \brief Check if buffer content is valid (not in state of content change) Index: flstk.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstk.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** flstk.cpp 26 Jan 2005 05:02:03 -0000 1.6 --- flstk.cpp 12 Sep 2005 10:27:40 -0000 1.7 *************** *** 46,50 **** } ! void flext_stk::m_dsp(int n,t_sample *const *in,t_sample *const *out) { // called on every rebuild of the dsp chain --- 46,50 ---- } ! bool flext_stk::CbDsp() { // called on every rebuild of the dsp chain *************** *** 65,74 **** inobj = new Input *[inobjs]; for(i = 0; i < inobjs; ++i) ! inobj[i] = new Input(in[i],blsz); } if(outobjs) { outobj = new Output *[outobjs]; for(i = 0; i < outobjs; ++i) ! outobj[i] = new Output(out[i],blsz); } --- 65,74 ---- inobj = new Input *[inobjs]; for(i = 0; i < inobjs; ++i) ! inobj[i] = new Input(InSig(i),blsz); } if(outobjs) { outobj = new Output *[outobjs]; for(i = 0; i < outobjs; ++i) ! outobj[i] = new Output(OutSig(i),blsz); } *************** *** 78,87 **** // assign changed input/output vectors ! for(i = 0; i < inobjs; ++i) inobj[i]->SetBuf(in[i]); ! for(i = 0; i < outobjs; ++i) outobj[i]->SetBuf(out[i]); } } ! void flext_stk::m_signal(int n,t_sample *const *in,t_sample *const *out) { if(inobjs || outobjs) ProcessObjs(blsz); --- 78,88 ---- // assign changed input/output vectors ! for(i = 0; i < inobjs; ++i) inobj[i]->SetBuf(InSig(i)); ! for(i = 0; i < outobjs; ++i) outobj[i]->SetBuf(OutSig(i)); } + return true; } ! void flext_stk::CbSignal() { if(inobjs || outobjs) ProcessObjs(blsz); Index: flext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flext.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** flext.cpp 30 Jul 2005 21:59:43 -0000 1.38 --- flext.cpp 12 Sep 2005 10:27:40 -0000 1.39 *************** *** 176,180 **** void flext_base::cb_click(t_gobj *c,t_floatarg xpos,t_floatarg ypos,t_floatarg shift,t_floatarg ctrl,t_floatarg alt) { ! if(alt) thisObject(c)->CbClick(); } #endif --- 176,180 ---- void flext_base::cb_click(t_gobj *c,t_floatarg xpos,t_floatarg ypos,t_floatarg shift,t_floatarg ctrl,t_floatarg alt) { ! if(shift) thisObject(c)->CbClick(); } #endif Index: flmsg.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmsg.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** flmsg.cpp 19 Jul 2005 13:17:50 -0000 1.18 --- flmsg.cpp 12 Sep 2005 10:27:40 -0000 1.19 *************** *** 254,263 **** --- 254,266 ---- catch(std::exception &x) { error("%s - Exception while processing method: %s",thisName(),x.what()); + ret = false; } catch(const char *txt) { error("%s - Exception while processing method: %s",thisName(),txt); + ret = false; } catch(...) { error("%s - Unknown exception while processing method",thisName()); + ret = false; } Index: flbase.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbase.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flbase.cpp 30 Jul 2005 12:21:41 -0000 1.24 --- flbase.cpp 12 Sep 2005 10:27:40 -0000 1.25 *************** *** 26,29 **** --- 26,30 ---- #pragma warning (disable:4091) #endif + // for canvas_realizedollar (should be noon-critical) #include <g_canvas.h> #ifdef _MSC_VER Index: flsndobj.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsndobj.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** flsndobj.h 26 Jan 2005 05:02:03 -0000 1.8 --- flsndobj.h 12 Sep 2005 10:27:40 -0000 1.9 *************** *** 42,48 **** virtual void Exit(); - virtual void m_dsp(int n,t_sample *const *in,t_sample *const *out); - virtual void m_signal(int n,t_sample *const *in,t_sample *const *out); - private: //! SndObj for reading from inlet buffer --- 42,45 ---- *************** *** 76,79 **** --- 73,79 ---- }; + virtual bool CbDsp(); + virtual void CbSignal(); + void ClearObjs(); Index: flstk.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstk.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** flstk.h 26 Jan 2005 05:02:03 -0000 1.7 --- flstk.h 12 Sep 2005 10:27:40 -0000 1.8 *************** *** 80,85 **** private: ! virtual void m_dsp(int n,t_sample *const *in,t_sample *const *out); ! virtual void m_signal(int n,t_sample *const *in,t_sample *const *out); void ClearObjs(); --- 80,85 ---- private: ! virtual bool CbDsp(); ! virtual void CbSignal(); void ClearObjs(); Index: flbuf.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbuf.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** flbuf.cpp 22 Aug 2005 19:20:27 -0000 1.25 --- flbuf.cpp 12 Sep 2005 10:27:40 -0000 1.26 *************** *** 327,335 **** bool flext::buffer::IsDirty() const { ! FLEXT_ASSERT(sym); #if FLEXT_SYS == FLEXT_SYS_PD - FLEXT_ASSERT(arr); #ifdef _FLEXT_HAVE_PD_GARRAYUPDATETIME ! return isdirty || garray_updatetime(arr) > cleantime; #else // Don't know.... (no method in PD judging whether buffer has been changed from outside flext...) --- 327,334 ---- bool flext::buffer::IsDirty() const { ! if(!sym) return false; #if FLEXT_SYS == FLEXT_SYS_PD #ifdef _FLEXT_HAVE_PD_GARRAYUPDATETIME ! return arr && (isdirty || garray_updatetime(arr) > cleantime); #else // Don't know.... (no method in PD judging whether buffer has been changed from outside flext...) Index: flsndobj.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsndobj.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** flsndobj.cpp 26 Jan 2005 05:02:02 -0000 1.9 --- flsndobj.cpp 12 Sep 2005 10:27:40 -0000 1.10 *************** *** 51,55 **** } ! void flext_sndobj::m_dsp(int n,t_sample *const *in,t_sample *const *out) { // called on every rebuild of the dsp chain --- 51,55 ---- } ! bool flext_sndobj::CbDsp() { // called on every rebuild of the dsp chain *************** *** 69,73 **** tmpobj = new SndObj *[inobjs]; for(i = 0; i < inobjs; ++i) { ! inobj[i] = new Inlet(in[i],blsz,smprt); tmpobj[i] = new SndObj(NULL,blsz,smprt); } --- 69,73 ---- tmpobj = new SndObj *[inobjs]; for(i = 0; i < inobjs; ++i) { ! inobj[i] = new Inlet(InSig(i),blsz,smprt); tmpobj[i] = new SndObj(NULL,blsz,smprt); } *************** *** 75,79 **** if(outobjs) { outobj = new Outlet *[outobjs]; ! for(i = 0; i < outobjs; ++i) outobj[i] = new Outlet(out[i],blsz,smprt); } --- 75,79 ---- if(outobjs) { outobj = new Outlet *[outobjs]; ! for(i = 0; i < outobjs; ++i) outobj[i] = new Outlet(OutSig(i),blsz,smprt); } *************** *** 83,92 **** // assign changed input/output vectors ! for(i = 0; i < inobjs; ++i) inobj[i]->SetBuf(in[i]); ! for(i = 0; i < outobjs; ++i) outobj[i]->SetBuf(out[i]); } } ! void flext_sndobj::m_signal(int n,t_sample *const *in,t_sample *const *out) { for(int i = 0; i < inobjs; ++i) *tmpobj[i] << *inobj[i]; --- 83,93 ---- // assign changed input/output vectors ! for(i = 0; i < inobjs; ++i) inobj[i]->SetBuf(InSig(i)); ! for(i = 0; i < outobjs; ++i) outobj[i]->SetBuf(OutSig(i)); } + return true; } ! void flext_sndobj::CbSignal() { for(int i = 0; i < inobjs; ++i) *tmpobj[i] << *inobj[i];

1 0

[PD-cvs] externals/grill/flext changes.txt, 1.85, 1.86 flext.vcproj, 1.49, 1.50
by Thomas Grill 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22978 Modified Files: changes.txt flext.vcproj Log Message: changed initialization functions accordingly minimal additions for buffers and exception handling change click modifier to shift (seems to work) small fixes for tutorial examples added flfeatures.h for compile-time version-specific feature detection added typed flext::NewAligned fixed severe Altivec bug adapted for pd-devel 0.39 - better handling of click callback slimmed object data structures update DSP methods for SndObj and STK classes - more compatible handling of attributes in patcher (hiding is now an option - define FLEXT_ATTRHIDE) better buffer checking Index: flext.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/flext.vcproj,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** flext.vcproj 22 Aug 2005 19:20:27 -0000 1.49 --- flext.vcproj 12 Sep 2005 10:27:40 -0000 1.50 *************** *** 122,129 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\data\pd\pd-cvs\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS;xFLEXT_ATTRHIDE;xFLEXT_NOATTREDIT;_WIN32_WINNT=0x501" BasicRuntimeChecks="3" ! RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" --- 122,129 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd-0.39-0\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS_PD;FLEXT_THREADS;FLEXT_USE_SIMD;FLEXT_EXPORTS;xFLEXT_ATTRHIDE;xFLEXT_NOATTREDIT;_WIN32_WINNT=0x501" BasicRuntimeChecks="3" ! RuntimeLibrary="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" *************** *** 172,180 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd-0.39-test4\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD;FLEXT_EXPORTS;FLEXT_DEBUGMEM;_WIN32_WINNT=0x400" StringPooling="TRUE" BasicRuntimeChecks="3" ! RuntimeLibrary="1" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" --- 172,180 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd-0.39-0\src;c:\data\prog\audio\sndobj\include;c:\data\prog\audio\stk\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLEXT_SYS=2;FLEXT_USE_SIMD;FLEXT_EXPORTS;FLEXT_DEBUGMEM;_WIN32_WINNT=0x400" StringPooling="TRUE" BasicRuntimeChecks="3" ! RuntimeLibrary="5" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** changes.txt 22 Aug 2005 19:20:27 -0000 1.85 --- changes.txt 12 Sep 2005 10:27:40 -0000 1.86 *************** *** 16,19 **** --- 16,21 ---- - more compatible handling of attributes in patcher (hiding is now an option - define FLEXT_ATTRHIDE) - added header file flfeatures.h for compile-time detection of version-specific features + - typed flext::NewAligned allocator + - fixed severe Altivec bug (load unaligned)... thanks to Ian Ollmann 0.5.0:

1 0

[PD-cvs] externals/grill/flext/buildsys/mac/max gnumake-gcc-ext.inc, 1.4, 1.5
by Thomas Grill 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/mac/max In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22978/buildsys/mac/max Modified Files: gnumake-gcc-ext.inc Log Message: changed initialization functions accordingly minimal additions for buffers and exception handling change click modifier to shift (seems to work) small fixes for tutorial examples added flfeatures.h for compile-time version-specific feature detection added typed flext::NewAligned fixed severe Altivec bug adapted for pd-devel 0.39 - better handling of click callback slimmed object data structures update DSP methods for SndObj and STK classes - more compatible handling of attributes in patcher (hiding is now an option - define FLEXT_ATTRHIDE) better buffer checking Index: gnumake-gcc-ext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/mac/max/gnumake-gcc-ext.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gnumake-gcc-ext.inc 1 Sep 2005 23:29:52 -0000 1.4 --- gnumake-gcc-ext.inc 12 Sep 2005 10:27:40 -0000 1.5 *************** *** 17,18 **** --- 17,19 ---- $(INSTTARGET)/Contents/Pkginfo: echo "iLaX????" >> $@ +

1 0

externals/zexy/src dirac~.c,1.2,1.3
by IOhannes m zmölnig 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18330 Modified Files: dirac~.c Log Message: added optimization and bug-fixes by tim blechmann Index: dirac~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/dirac~.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dirac~.c 19 May 2005 09:42:55 -0000 1.2 --- dirac~.c 12 Sep 2005 07:16:09 -0000 1.3 *************** *** 7,12 **** --- 7,15 ---- * 1999:forum::für::umläute:2004 * + * * institute of electronic music and acoustics (iem) * + * optimizations + * copyright (c) 2005 tim blechmann ****************************************************** * *************** *** 17,33 **** /* ! This external makes the two main test-functions available : ! dirac~ : will make a single peak (eg: a 1 in all the 0s) at a desired position in the signal-vector ! the position can be passed as an argument when creating the object ! step~ : will make a unity step at a desired point in the signal-vector; the second input specifies a ! length: after the so-specified time has elapsed, the step will toggle back to the previous ! value; ! the length can be passed as an argument when creating the object ! with length==1 you might do the dirac~ thing a little bit more complicated ! with length==0 the output just toggles between 0 and 1 every time you bang the object ! ! NOTE : the inlets do NOT specify any times but sample-NUMBERS; there are 64 samples in a signal-vector, ! each "lasting" for 1/44100 secs. ! */ #include "zexy.h" --- 20,32 ---- /* ! * This external makes the two main test-functions available : ! * dirac~: will make a single peak (eg: a 1 in all the 0s) at ! * a desired position in the signal-vector ! * the position can be passed as an argument when creating the object ! * ! * NOTE : the inlets do NOT specify any times but sample-NUMBERS; ! * there are 64 samples in a "standard" signal-vector, ! * each "lasting" for 1/44100 secs. ! */ #include "zexy.h" *************** *** 41,46 **** { t_object x_obj; ! t_float position; ! t_float do_it; } t_dirac; --- 40,45 ---- { t_object x_obj; ! t_int position; ! t_int do_it; } t_dirac; *************** *** 52,56 **** static void dirac_float(t_dirac *x, t_float where) { ! x->do_it = x->position = where; } --- 51,55 ---- static void dirac_float(t_dirac *x, t_float where) { ! x->do_it = x->position = (t_int)where; } *************** *** 60,71 **** t_float *out = (t_float *)(w[2]); int n = (int)(w[3]); ! int do_it = x->do_it; ! while (n--) ! { ! *out++ = (!do_it--); ! } ! x->do_it = do_it; return (w+4); --- 59,96 ---- t_float *out = (t_float *)(w[2]); int n = (int)(w[3]); + + t_int do_it = x->do_it; ! zero_perform(w+1); ! if (do_it >= n) ! x->do_it -= n; ! else if(do_it >= 0) ! { ! out[do_it] = 1.f; ! x->do_it = -1; ! } ! ! return (w+4); ! } ! ! ! static t_int *dirac_perf8(t_int *w) ! { ! t_dirac *x = (t_dirac *)(w[1]); ! t_float *out = (t_float *)(w[2]); ! int n = (int)(w[3]); ! ! t_int do_it = x->do_it; ! ! zero_perf8(w+1); ! ! if (do_it >= n) ! x->do_it -= n; ! else if(do_it >= 0) ! { ! out[do_it] = 1.f; ! x->do_it = -1; ! } return (w+4); *************** *** 74,78 **** static void dirac_dsp(t_dirac *x, t_signal **sp) { ! dsp_add(dirac_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); } --- 99,106 ---- static void dirac_dsp(t_dirac *x, t_signal **sp) { ! if (sp[0]->s_n & 7) ! dsp_add(dirac_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); ! else ! dsp_add(dirac_perf8, 3, x, sp[0]->s_vec, sp[0]->s_n); } *************** *** 95,100 **** outlet_new(&x->x_obj, gensym("signal")); ! x->do_it = 0; ! x->position = where; return (x); } --- 123,132 ---- outlet_new(&x->x_obj, gensym("signal")); ! x->do_it = where; ! ! if (where > 0) ! x->position = where; ! else ! x->position = -where; return (x); }

1 0

pd/src d_math.c,1.2.4.2,1.2.4.2.2.1
by Mathieu Bouchard 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16421 Modified Files: Tag: devel_0_39 d_math.c Log Message: [rsqrt~] : long might be bigger than float; changing to int Index: d_math.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_math.c,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.2.2.1 diff -C2 -d -r1.2.4.2 -r1.2.4.2.2.1 *** d_math.c 10 Nov 2004 21:53:02 -0000 1.2.4.2 --- d_math.c 12 Sep 2005 03:17:15 -0000 1.2.4.2.2.1 *************** *** 84,88 **** float f; long l = (i ? (i == DUMTAB1SIZE-1 ? DUMTAB1SIZE-2 : i) : 1)<< 23; ! *(long *)(&f) = l; rsqrt_exptab[i] = 1./sqrt(f); } --- 84,88 ---- float f; long l = (i ? (i == DUMTAB1SIZE-1 ? DUMTAB1SIZE-2 : i) : 1)<< 23; ! *(int *)(&f) = l; rsqrt_exptab[i] = 1./sqrt(f); }

1 0

pd/src ChangeLog,NONE,1.1.4.2
by Mathieu Bouchard 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11673 Added Files: Tag: devel_0_39 ChangeLog Log Message: merged ChangeLog from impd --- NEW FILE: ChangeLog --- $Id: ChangeLog,v 1.1.4.2 2005/09/11 23:37:33 matju Exp $ Devil(ish) Desire 0.39.A (-r devel_0_39; scons desire=1) : * merged into the devel branch; enable with scons desire=1, which disables lots of g_*.c files and enables desire.c; use the std devel gui using desire=0. * added proc def, which hides the self arg and turns @foo into _($self:foo) * run the client to start the server and not the other way around: do wish desire.tk * the client can make the server start via GDB * added Pd box (like Ctrl+M but with history) * added Gdb box * other stuff I forget to write about Impd 0.37.B : * moving rendering to the TCL side * moving event-handling to the TCL side too * new file u_object.tk * added pd_scanargs(), pd_upload(), sys_mgui(). * added color schemes (modifiable in u_main.tk) * switched to a jmaxish look * merged g_vdial.c into g_hdial.c * merged g_vslider.c into g_hslider.c * added Patcher->View->Redraw * added proc populate_menu, proc property_dialog * added ~/.pd.tk loading * inlet tooltips have new look * rewrote all of the property dialogs * added object class name completion (the <Tab> key) * mouse scrollwheel works in patchers * plus/minus button on tcl listener * changed default font and borderwidth * if conf not found in ~ ($HOME), looks in Pd's install directory (eg. /usr/local/lib/pd) * looks for .impdrc before .pdrc * pdrc editor * -help lists unavailable options with note "not compiled in" * sys_vgui() message size limit removed * new peak meters (thanks Carmen) * dropper object outputs symbols of filenames (requires tkdnd) * joe sarlo's VST-plugin i/o scheduler available on windows * error() merged into pd_error() and using strerror() to get meaningful error messages for failed I/O * completely breaking compatibility with Pd's GUI externals (for a good reason) Impd 0.37.A.2 (-r impd_0_37_A_2) : * merged GG's reverting of "quote hack" Impd 0.37.A (-r impd_0_37_A) : * forked from devel_0_37, 2004.02.21 * added console for post() * .pdrc: -console <number_of_lines> * added button bar (that does like Ctrl+E & Put menu) * .pdrc: -look <directory_of_icons> (remember you can't use ~ nor $HOME in .pdrc) * includes a selectable windowid (for those who know how to use it) * class list dialog * scans for loaded classes, abstractions/externs dirs * help button fetches help file without needing to instantiate first * filter box helps finding classes quickly * displays some info on the class, like a list of defined methods and such. * statusbar shows cursor position (enable with -statusbar)

1 0

pd/src TODO,NONE,1.1.2.1
by Mathieu Bouchard 12 Sep '05

12 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29201 Added Files: Tag: devel_0_39 TODO Log Message: importing TODO from ImpureData --- NEW FILE: TODO --- DesireData's TODO list, $Id: TODO,v 1.1.2.1 2005/09/11 22:12:14 matju Exp $ ---------------------------- [h] means for Chun [m] means for Matju [c] means for Carmen 0.39.A: [h] remove Chun's hack so that the objectboxes are created server-side first. [m] sort thru old TODO list (0.37.B and 0.37.C) ------------------8<--------cut-here--------8<------------------ Old TODO list (should be cleaned and merged with the new ones) 0.37.B: * <numberat> is there a way to make non-gui objects appear on a GOP? * printf's unused chars: "!\"&(),/:;<=>?@BDHJKMNOPQRTUVWYZ[\\]^_`bkmrvwy{|}~" * receive-symbols are fucked ? * send-symbols are fucked ? * multilingual Tk labels & menus * multilingual labels in objects * multilingual comments * must work with ALL gridflow samples * broke [vu] * bug: redraws hidden gui objects * fix look of selection * Tcl needs default values * make sure $0 actually works (see canvas_realizedollar) * test rcv_able, snd_able * maybe use 0 (==NULL) instead of gensym("empty") * "can't read oval" * pdrc: bug in tcl loader (see on boltanski) * iem: what's the default for steady? * iem: snd/rcv problem! * slider: is_log * numbox: is_log * menuclose problem <ix> btw u know about the 'infinite loop' thing w/ vsliders right * [hradio] : chg -> is_log * [vu] props : scale should appear instead of is_log * [vu],[cnv] have fcol in props ! * [vu] has snd in props ! * Duplicate wires? * Can connect object to an object that is inside a GOP (!!!!) * weird offset stuff when there are negative canvas coords sometimes. * fontbomb blows up GOP or stuff. * better reporting of errors in .pdrc * examine licensing / legal stuff * BUG: undo broken because of my gui stuff? * <dpro> matju: and I still get segfaults if I use -console nn <dpro> matju: it only happens when I load cyclone or hammer or sickle <dpro> matju: and it happens when I load -lib sdjsddsd (i.e. some nonexistent thing) * BUG: doublequote hack, m_binbuf.c:82 * Bug: bad quoting in sys_mgui() * Bug: Control key is fucked on OSX * Bug: spaces in name of vslider cause corruption of properties (devel_0_37) * classlist: add method signatures * bang flash delays should be reimplemented * pdrc_options radio don't load/save 0.37.C: LATER: <MiS> matju: a question about completions: is there a key combination to actually complete the name of an object? The hint area is a lot of fun but how do I complete the name when I'm too lazy to type the whole thing in? <MiS> matju: but, as marc pointed out, do get the fscking diploma... <MiS> matju: it's either the sf.net lag or the GOP isn't quite there... <MiS> matju: need screenshots? <MiS> matju: ah, ok. number2 does not, nor vu~ but I guess for now I can live without it... The funny thing is that vu~ worked fine before. Now it gets misplaced. <MiS> matju: hmmm... segfaults with my looper patch (no GOP), the one I used when I came over with Marc. It's rather GUI intensive... <MiS> sys_vgui: buffer overflow <MiS> matju: may I request a little cosmetic fix. In the "Open" dialog window, I have always found it annoying that all dot directories show up. I'd prefer this to be an option so that I get to scroll less... * patch window may open off-screen (all branches) * patch window may open too big (all branches, osx) * properties on objectboxes (generic dialogs tapping into method signatures) * hooks for outsourcing the preceding stuff to a plugin (eg: GridFlow, PyExt) * VT100 colours in console * use tcl_platform, ditch pd_nt * <alx2> matju: a GOP object is created with the same colour as the edit mode background, it should be made lighter * [graph] is too slow (gui) for real big arrays * add scale, zoom, theme * doublequotes have problems in comments * floats have problems in comments * newlines have problems in comments, msgboxes, objectboxes. * make better C<->Tcl layer (to allow \{ \} \\ spaces newlines etc) * multiple undo <scuntz> matju, could you add an inlet inspector? that goes in the bottom of the window <scuntz> so when you mouseover, it shows you the data types, and what the inlet is expecting <scuntz> like "int: set left operand, bang: do it" <zkink> matju: can you add a font selector right into PD? a menu instead of setting it at load time <zkink> matju: can you add a hotkey configuration dialog. it lets you hit a hotkey and it puts down any object under your mouse <zkink> puts down a [t b i] <matju> yea, of course... eventually... and a button bar manager at the same time <zkink> and color code them, and same with wires <zkink> as well as select multiple wires, or multiple objects, and color code them <zkink> the little square PD window needs cleaning up <zkink> it takes 5x more space than is needed, for the amount of information it shows <zkink> PD should highlight the inlet you're connecting to <zkink> when they're close together, it's difficult to tell which one you're going on <zkink> max doesn't use a circle icon, instead, it highlights the inlet <zkink> much more informative <zkink> if you do segmented patchchords, it needs some functions: <zkink> a hotkey to click on the chord, and add a new segment <zkink> a hotkey to drag the "points" (where two lines meet) <zkink> a modifier key to delete a segment (actually the others should be that way too) <zkink> and: you should be able to right click on a regular patchchord, and press "segment" <zkink> or do a hotkey with it <zkink> and it automatically turns it into an straight-elbow multisegmented chord <zkink> like _| instead of / <zkink> it makes it into three lines: _|~ <zkink> also: pd should have a NULL object. it looks like a point * on the GUI. <zkink> it does nothing but pass data through a splitter/merger. <zkink> circuits do this. they can split. they dont need to go into a module to split. <zkink> PERHAPS, a hack for multisegmented patchchords, would be to make a null object <zkink> a null object is an actual object that just looks like a . <zkink> and wires can connect to it <zkink> next: SUBPATCHERIZE SELECTION. you select a number of objects with your mouse <zkink> and you right click and press subpatcherize <zkink> it puts all the objects you have selected into a subpatcher, and it automatically wires up INLETS/outlets <zkink> so that the code is exactly the same, its just in a subpatcher instead <zkink> after the subpatcher is created, it leaves you with a new object, with the text focus waiting for you to type its name <zkink> next: move ALL functions from the command line into a Options box. <zkink> options box should save a PD config file <zkink> create a mouse cursor/tool that reports DATA TYPE, and MESSAGES when it hovers over any line <zkink> it could be done 2 ways: <zkink> if you select any wire, it reports whats coming through that wire <matju> the NULL object looks like jMax's [fork] except with only one outlet <zkink> yes <matju> or almost like [t a] <zkink> yep <zkink> that would work as a makeshift plan for multisegmented chords <matju> except [t a] is more like "list $1" and converts scalars into 1-element lists (yuck) <zkink> since its compatible with the current pd fileformat <zkink> it can be tiny: 3 pixels by 3 pixels <zkink> just a little DOT <zkink> OK, now as I was saying <zkink> data inspector: <zkink> when this tool is enabled, it prints on the console any data coming through whatever cable you currently have selected <zkink> and if you select multiple chords <zkink> it reports whats going through multiple chords <matju> zkink: well, actually, segmented patchcords are compatible with the .pd format. try adding stuff in a #X connect line, before the semicolon <matju> zkink: (it's just that Pd doesn't save that stuff back...) <zkink> so: example <zkink> SNIFFER: list: 10 10 10 1 66 <zkink> SNIFFER: int: 4 <zkink> SNIFFER: message: boop <zkink> SNIFFER: bang <matju> data inspector looks like a jMax [display] but a bit like the console too, right? <zkink> well i'm not sure, i should install Jmax <matju> a kind of [print] but to a miniconsole? <zkink> well, its just a toggle, you toggle it ON/Off <zkink> when its ON, it reports whats going through ANY patchchord you have "highlighted" <matju> [display] is roughly like [prepend set] -> "" <matju> where "" is an empty message box <zkink> well, print isnt good enough, it doesnt tell you the data type <matju> and [prepend] is from zexy or cyclone... <matju> you mean the selector? <zkink> selector ? wozzat <matju> selector is the message header <zkink> sorry i'm not sure what you mean, i've been using max <matju> sorry i'm not sure what you mean, i've been using jmax <zkink> selector is just the datatype ? before the message? in the packet <zkink> yeah, it would report that. it just tells you whats goin thru lines <zkink> next: you need a way to see cpu usage on individual objects <zkink> or on patchers or on groups of selected objects <zkink> next: there must be a way to click on an object, and "nudge it" with your arrow keys <zkink> right arrow key moves it one pixel to the right, etc <zkink> oftentimes the mouse isnt good enough for aligning stuff up <zkink> next: eliminate the CONSOLE output <zkink> make the console part of PD <zkink> add an option to right click on the console and CLEAR IT <zkink> and allow user to select/copy data from it <zkink> make the font and size customizable within the application <zkink> just like the font/size menu which should be built into pd <matju> zkink: well, i think the distinction goes like, float/int/symbol/list are selectors for ordinary datatypes, and all the other selectors are for so-called "messages", but in pd, every value transmitted counts as a message anyway. <matju> so "float 42" is only a special kind of message called a float... <zkink> ah. well the sniffer can report that <matju> by eliminate console output, i guess you mean the stdout/stderr output as printed in the terminal window that you start pd from <zkink> yes. that's not best for systems like osx/win32 <zkink> was there anything i said so far that was confusing? or unclear <zkink> next: key command dialog box <zkink> allows you to configure all keys for everything <zkink> next: put the "icon set" configuration into Options <zkink> along with all the stuff that you used to have to configure with --console flags <matju> i can't follow, you write too much stuff <matju> making the whole .pdrc thing gui-configurable was already high on my list btw <zkink> OK, i will make a nice list of this and make them explained better and separated by paragraphs. what <zkink> is your email ? sending to matju(a)sympatico.ca .. <zkink> is there some way to drag+copy an object in pd ? so it duplicates <zkink> matju: there must be a modifier key. you just select something, hold down the modifer and DRAG what you have selected, and it creates a copy of it <zkink> its unbelievable that PD doesnt have that!?!? wtf, thats insane <zkink> i only use it like, 500 times a day <zkink> selecting the objects and choosing duplicate is SLOW <mamalala> matju: what about a bash-style history, so if one places a box he can browse with the up/down keys through the list of recent created objects ? [ ] impd todo: send to front, send to back <yaqtil> yalla, is there a trick somewhere to make windows not get auto-resized to the width of the toolbar <yaqtil> i use tiny windows <yaqtil> and dont care if a few buttons are cut off Marius Schebella: I have a small keyboard shortcut wish: change between "entering mode" and "selected mode" with boxes. when I create a new object/message... then it would be nice to have a shortcut that switches from the mode, where the cursor is in the box to the mode, where the object is selected. I think the tab-key could be used for that. As it is now, I type something in, then I have to grab the mouse, then klick, then select, then I can adjust it (which I also do with the keyboard, because it is more precise). I know the toggeling will not be possible when more objects are selected, but maybe someone has an idea for that. [ ] command for unpatcherizing a subpatch or abstraction (useful for making variants)

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs September 2005