[PD-cvs] externals/miXed/test/toxy multiscale-test.pd,1.1,1.2 multiscale.wid,1.1,1.2

[krzyszcz at users.sourceforge.net]

Update of /cvsroot/pure-data/externals/miXed/test/toxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28627/test/toxy

Modified Files:
	multiscale-test.pd multiscale.wid 
Log Message:
toxy alpha7

Index: multiscale-test.pd
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/multiscale-test.pd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** multiscale-test.pd	9 Mar 2004 12:41:21 -0000	1.1
--- multiscale-test.pd	10 Mar 2004 10:55:56 -0000	1.2
***************
*** 1,20 ****
! #N canvas 39 49 775 469 12;
! #X obj 27 98 widget multiscale m1 #n 30 #dx 15 #dy 60;
! #X obj 27 200 widget multiscale m2 #bg red #dy 120;
! #X obj 188 371 tow . multiscale m1;
! #X msg 27 59 #n \$1;
! #X floatatom 27 24 5 0 0 0 - - -;
  #N canvas 0 0 450 300 graph1 0;
  #X array t 50 float 0;
  #X coords 0 1 49 0 400 140 1;
  #X restore 296 206 graph;
! #X obj 188 410 tabwrite t;
! #X obj 27 367 unpack;
! #X floatatom 27 411 5 0 0 0 - - -;
! #X floatatom 100 411 5 0 0 0 - - -;
! #X connect 1 0 7 0;
! #X connect 2 0 6 0;
! #X connect 3 0 0 0;
! #X connect 4 0 3 0;
! #X connect 7 0 8 0;
! #X connect 7 1 9 0;
--- 1,54 ----
! #N canvas 39 49 800 548 12;
! #X obj 25 84 widget multiscale m1 #n 50 #dx 15 #dy 90;
! #X obj 25 260 widget multiscale m2 #bg red #dy 120;
! #X msg 25 52 #n \$1;
! #X floatatom 25 23 5 0 0 0 - - -;
  #N canvas 0 0 450 300 graph1 0;
  #X array t 50 float 0;
  #X coords 0 1 49 0 400 140 1;
  #X restore 296 206 graph;
! #X obj 265 509 tabwrite t;
! #X obj 27 408 unpack;
! #X floatatom 27 445 5 0 0 0 - - -;
! #X floatatom 100 445 5 0 0 0 - - -;
! #X floatatom 109 196 5 0 0 0 - - -;
! #X obj 589 509 tabread t;
! #X obj 589 477 t 0 0;
! #X obj 589 413 until;
! #X obj 265 477 tow . multiscale m1;
! #X obj 589 381 r rcount;
! #X obj 589 445 int;
! #X obj 629 445 + 1;
! #X obj 527 510 pack;
! #X msg 265 445 tot pd [concat rcount .#n .`.:];
! #X obj 265 408 t b b;
! #X msg 653 414 0;
! #X obj 127 23 widget button b -command .<.> -bg yellow -width 3 -height
! 2;
! #X obj 265 372 tow . button b;
! #X obj 25 228 pack;
! #X floatatom 25 199 5 0 0 0 - - -;
! #X connect 1 0 6 0;
! #X connect 2 0 0 0;
! #X connect 3 0 2 0;
! #X connect 6 0 7 0;
! #X connect 6 1 8 0;
! #X connect 9 0 1 0;
! #X connect 9 0 23 1;
! #X connect 10 0 17 0;
! #X connect 11 0 10 0;
! #X connect 11 1 17 1;
! #X connect 12 0 15 0;
! #X connect 13 0 5 0;
! #X connect 14 0 12 0;
! #X connect 15 0 16 0;
! #X connect 15 0 11 0;
! #X connect 16 0 15 1;
! #X connect 17 0 13 0;
! #X connect 18 0 13 0;
! #X connect 19 0 18 0;
! #X connect 19 1 20 0;
! #X connect 20 0 15 1;
! #X connect 22 0 19 0;
! #X connect 23 0 1 0;
! #X connect 24 0 23 0;

Index: multiscale.wid
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/multiscale.wid,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** multiscale.wid	9 Mar 2004 12:41:21 -0000	1.1
--- multiscale.wid	10 Mar 2004 10:55:56 -0000	1.2
***************
*** 3,6 ****
--- 3,18 ----
  }
  
+ proc ::toxy::multiscale_float {path target count ndx} {
+     if {$ndx >= 0 && $ndx < $count} {
+ 	pd [concat $target _cb [$path.s$ndx get] $ndx \;]
+     }
+ }
+ 
+ proc ::toxy::multiscale_list {path count ndx v} {
+     if {$ndx >= 0 && $ndx < $count} {
+ 	$path.s$ndx set $v
+     }
+ }
+ 
  proc ::toxy::multiscale {path target remote count dx dy bg} {
      if {[winfo exists $path.s0]} {
***************
*** 33,36 ****
--- 45,50 ----
  #. #n 3 #dx 60 #dy 90
  #. #bg yellow
+ #. @float ::toxy::multiscale_float .- .| .#n .#1
+ #. @list ::toxy::multiscale_list .- .#n .#2 .#1
  
  ::toxy::multiscale .- .| . .#n .#dx .#dy .#bg