diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/cyclone/offer-test.pd | 29 | ||||
| -rw-r--r-- | test/toxy/setup.wid | 38 |
2 files changed, 43 insertions, 24 deletions
diff --git a/test/cyclone/offer-test.pd b/test/cyclone/offer-test.pd index 537a3b9..94cdfa7 100644 --- a/test/cyclone/offer-test.pd +++ b/test/cyclone/offer-test.pd @@ -1,11 +1,11 @@ #N canvas 299 297 735 363 12; #X obj 49 244 offer; -#X floatatom 49 279 5 0 0; +#X floatatom 49 279 5 0 0 0 - - -; #X msg 50 114 clear; -#X floatatom 172 181 5 0 0; +#X floatatom 172 181 5 0 0 0 - - -; #X obj 212 244 * -1; #X obj 172 209 t 0 0; -#X floatatom 172 147 5 0 0; +#X floatatom 172 147 5 0 0 0 - - -; #X obj 279 110 Uzi; #X msg 49 181 debug \$1; #X msg 71 147 1; @@ -30,11 +30,14 @@ #X obj 531 234 t 0 b; #X msg 531 196 50; #X msg 582 196 100; -#X obj 429 234 Uzi; -#X msg 429 196 50; -#X msg 480 196 100; -#X obj 429 271 urn 100; +#X obj 409 218 Uzi; +#X msg 330 147 50; +#X msg 369 147 100; #X msg 117 209 1.5; +#X obj 409 181 t 0 0; +#X obj 409 255 urn; +#X msg 409 147 500; +#X msg 449 147 5000; #X connect 0 0 1 0; #X connect 2 0 0 0; #X connect 3 0 5 0; @@ -69,8 +72,12 @@ #X connect 28 1 27 0; #X connect 29 0 28 0; #X connect 30 0 28 0; -#X connect 31 0 34 0; -#X connect 32 0 31 0; -#X connect 33 0 31 0; +#X connect 31 0 36 0; +#X connect 32 0 35 0; +#X connect 33 0 35 0; #X connect 34 0 0 0; -#X connect 35 0 0 0; +#X connect 35 0 31 0; +#X connect 35 1 36 1; +#X connect 36 0 0 0; +#X connect 37 0 35 0; +#X connect 38 0 35 0; diff --git a/test/toxy/setup.wid b/test/toxy/setup.wid index 9da8775..3ae0a70 100644 --- a/test/toxy/setup.wid +++ b/test/toxy/setup.wid @@ -116,20 +116,20 @@ proc ::toxy::item_visconfig {path target name varname cvpath px py} { } } - if {[info exists ::toxy::masterinits]} { - set failed [catch {eval $::toxy::masterinits} res] - unset ::toxy::masterinits - if {$failed} { error [concat in ::toxy::masterinits: $res] } + if {[info exists ::toxy::masterinit]} { + set failed [catch {eval $::toxy::masterinit} res] + unset ::toxy::masterinit + if {$failed} { error [concat in ::toxy::masterinit: $res] } } - if {[info exists ::toxy::typeinits]} { - set failed [catch {eval $::toxy::typeinits} res] - unset ::toxy::typeinits - if {$failed} { error [concat in ::toxy::typeinits: $res] } + if {[info exists ::toxy::typeinit]} { + set failed [catch {eval $::toxy::typeinit} res] + unset ::toxy::typeinit + if {$failed} { error [concat in ::toxy::typeinit: $res] } } - if {[info exists ::toxy::iteminits]} { - set failed [catch {eval $::toxy::iteminits} res] - unset ::toxy::iteminits - if {$failed} { error [concat in ::toxy::iteminits: $res] } + if {[info exists ::toxy::iteminit]} { + set failed [catch {eval $::toxy::iteminit} res] + unset ::toxy::iteminit + if {$failed} { error [concat in ::toxy::iteminit: $res] } } ::toxy::item_getconfig $path $target @@ -204,7 +204,15 @@ proc ::toxy::master {path toppath cvpath target} { # FIXME proc ::toxy::scale_command {target sel v} { - pd [concat $target $sel $v \;] + if {$::toxy::scale_isactive} { + pd [concat $target $sel $v \;] + } + set ::toxy::scale_isactive 1 +} + +proc ::toxy::scale_doset {path v} { + set ::toxy::scale_isactive 0 + $path set $v } proc ::toxy::popup_command {path target remote i text} { @@ -239,6 +247,9 @@ proc ::toxy::popup {path target remote entries args} { ::toxy::master .- .- .^.c .| +# FIXME +set ::toxy::scale_isactive 1 + # standard widget types #> bang button @@ -250,6 +261,7 @@ proc ::toxy::popup {path target remote entries args} { #. -command [concat ::toxy::scale_command .| _cb] #. -bg pink -activebackground red -length 200 #. @float .- set .#1 +#. @vset ::toxy::scale_doset .- .#1 #> symbol entry #. -bg pink -font .(helvetica 24.) -width 16 |