Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28768
Modified Files: mat.wid Log Message: index
Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mat.wid 21 Jul 2005 05:02:21 -0000 1.21 --- mat.wid 28 Jul 2005 16:19:35 -0000 1.22 *************** *** 55,61 **** foreach id $is { set tags [list item i$id $id] switch [dict get $_($t) $id type] { note { - set color [dict get $_($t:g) $_($t:cg) color] $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags r] -stroke [color [lighten $color 0.4]] -strokeopacity 1.0 -fill [color $color] -fillopacity 0.08 $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags q] -fill [color $color] -strokewidth 0 -fillopacity 0.8 --- 55,61 ---- foreach id $is { set tags [list item i$id $id] + set color [dict get $_($t:g) $_($t:cg) color] switch [dict get $_($t) $id type] { note { $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags r] -stroke [color [lighten $color 0.4]] -strokeopacity 1.0 -fill [color $color] -fillopacity 0.08 $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags q] -fill [color $color] -strokewidth 0 -fillopacity 0.8 *************** *** 65,69 **** set filename [dict get $_($t) $id filename] s$id read $filename ! $p.m create waveform 0 0 -tags [concat $tags w] -sound s$id set length [expr [s$id length] / ($_($t:samplerate) + 0.0) * 1000] mat_item_ua $p $t $id abs [dict create xx [expr [dict get $_($t) $id x] + $length]] 0 --- 65,70 ---- set filename [dict get $_($t) $id filename] s$id read $filename ! $p.m create path [::tkpath::coords rect 0 0 0 0 -rx 3 -ry 3] -tags [concat $tags r] -strokewidth 0 -fill [color $color] -fillopacity 0.08 ! $p.m create waveform 0 0 -tags [concat $tags w] -sound s$id -fill white set length [expr [s$id length] / ($_($t:samplerate) + 0.0) * 1000] mat_item_ua $p $t $id abs [dict create xx [expr [dict get $_($t) $id x] + $length]] 0 *************** *** 168,174 **** sound { set waveform [$p.m find withtag "i$id && w"] $p.m coords $waveform $x $y ! # $p.m itemconfigure $waveform -width $sx -height $sy ! $p.m itemconfigure $waveform -width $sx $p.m coords [$p.m find withtag "i$id && tl"] [expr $x + 4] [expr $y + 4] $p.m coords [$p.m find withtag "i$id && tlr"] [$p.m bbox [$p.m find withtag "i$id && tl"] ] --- 169,180 ---- sound { set waveform [$p.m find withtag "i$id && w"] + set r [$p.m find withtag "i$id && r"] + # set ro [expr int($ro / 2.)] + set ro 6 + $p.m coords $r [::tkpath::coords rect $x $y $sx $sy -rx $ro -ry $ro] + $p.m itemconfigure $r -fillopacity [dict get $_($t) $id v] -fill $color $p.m coords $waveform $x $y ! $p.m itemconfigure $waveform -width $sx -height [expr int($sy)] ! # $p.m itemconfigure $waveform -width $sx $p.m coords [$p.m find withtag "i$id && tl"] [expr $x + 4] [expr $y + 4] $p.m coords [$p.m find withtag "i$id && tlr"] [$p.m bbox [$p.m find withtag "i$id && tl"] ] *************** *** 254,259 **** set clicked [mat_cleansel $p $t [$p.m find overlapping [expr $x - 2] [expr $y - 2] [expr $x + 2] [expr $y + 2]]] if {$clicked ne ""} { ! mat_resize_modes $p $t $x $y [lindex $clicked 0] ! if {[llength $_($t:sel)] <= 1} {mat_updatesel $p $t [lindex $clicked 0]} } else { mat_mode $p $t move_canvas --- 260,265 ---- set clicked [mat_cleansel $p $t [$p.m find overlapping [expr $x - 2] [expr $y - 2] [expr $x + 2] [expr $y + 2]]] if {$clicked ne ""} { ! mat_resize_modes $p $t $x $y [lindex $clicked end] ! if {[llength $_($t:sel)] <= 1} {mat_updatesel $p $t [lindex $clicked end]} } else { mat_mode $p $t move_canvas