Browse Source

removed list_accumulate and list_read

m---w 11 years ago
parent
commit
9437b04643
8 changed files with 114 additions and 196 deletions
  1. 5 5
      _DS_TEST.pd
  2. 13 13
      ds_fetch_table.pd
  3. 51 51
      ds_gui.pd
  4. 45 41
      ktabdump.pd
  5. 0 13
      list_accumulate-help.pd
  6. 0 25
      list_accumulate.pd
  7. 0 17
      list_read-help.pd
  8. 0 31
      list_read.pd

+ 5 - 5
_DS_TEST.pd

@@ -1,4 +1,4 @@
-#N canvas 187 22 1075 737 10;
+#N canvas 113 22 1075 737 10;
 #X floatatom 70 449 5 0 0 0 - - -;
 #X msg 70 468 list kjbasd 9b2f #*lafn \$1_88 n\$1;
 #X obj 70 490 list;
@@ -6,13 +6,13 @@
 #X symbolatom 70 590 10 0 0 0 - - -;
 #X obj 70 609 s /variable2;
 #X obj 55 655 vsl 15 128 0 127 0 0 /variable3 /variable3 3 0 -9 0 10
--262144 -1 -1 2900 1;
+-262144 -1 -1 0 1;
 #X obj 75 655 vsl 15 128 0 127 0 0 /variable4 /variable4 4 0 -9 0 10
--262144 -1 -1 600 1;
+-262144 -1 -1 0 1;
 #X obj 95 655 vsl 15 128 0 127 0 0 /variable5 /variable5 5 0 -9 0 10
--262144 -1 -1 1800 1;
+-262144 -1 -1 0 1;
 #X obj 115 655 vsl 15 128 0 127 0 0 /variable6 /variable6 6 0 -9 0
-10 -262144 -1 -1 1600 1;
+10 -262144 -1 -1 0 1;
 #X obj 171 557 r /variable2;
 #X symbolatom 171 609 10 0 0 0 - - -;
 #X obj 318 461 r /variable1;

+ 13 - 13
ds_fetch_table.pd

@@ -1,4 +1,4 @@
-#N canvas 379 23 626 750 10;
+#N canvas 546 22 626 750 10;
 #X obj 152 723 s /ds/\$1/fetched;
 #X obj 152 701 list prepend \$2;
 #X obj 71 219 t b b;
@@ -27,7 +27,6 @@
 #X obj 372 414 s /ds/\$1\$2/route;
 #X obj 172 219 r /ds/\$1\$2/route;
 #X obj 71 59 r /ds/\$1/fetch/tables;
-#X obj 71 337 ktabdump \$2;
 #X text 59 41 fetch table to storage;
 #X text 29 10 ds_fetch_table <domain> <name>;
 #X text 299 77 (used by ds_reg);
@@ -38,8 +37,9 @@
 #X obj 195 564 t b b b;
 #X obj 234 611 s \$2;
 #X msg 234 588 print;
+#X obj 71 337 ktabdump \$2;
 #X connect 1 0 0 0;
-#X connect 2 0 28 0;
+#X connect 2 0 38 0;
 #X connect 2 1 3 0;
 #X connect 3 0 19 1;
 #X connect 4 0 19 1;
@@ -47,11 +47,11 @@
 #X connect 5 1 19 0;
 #X connect 5 2 19 0;
 #X connect 6 0 7 0;
-#X connect 8 0 28 0;
+#X connect 8 0 38 0;
 #X connect 8 1 4 0;
 #X connect 8 2 7 1;
 #X connect 12 0 5 0;
-#X connect 13 0 36 0;
+#X connect 13 0 35 0;
 #X connect 14 0 15 0;
 #X connect 15 0 16 0;
 #X connect 15 1 17 0;
@@ -63,14 +63,14 @@
 #X connect 20 0 21 0;
 #X connect 21 0 2 0;
 #X connect 21 1 22 0;
-#X connect 22 0 33 0;
+#X connect 22 0 32 0;
 #X connect 24 0 25 0;
 #X connect 26 0 8 0;
 #X connect 27 0 20 0;
-#X connect 28 0 12 0;
-#X connect 34 0 23 0;
-#X connect 35 0 21 1;
-#X connect 36 0 34 0;
-#X connect 36 1 18 0;
-#X connect 36 2 38 0;
-#X connect 38 0 37 0;
+#X connect 33 0 23 0;
+#X connect 34 0 21 1;
+#X connect 35 0 33 0;
+#X connect 35 1 18 0;
+#X connect 35 2 37 0;
+#X connect 37 0 36 0;
+#X connect 38 0 12 0;

+ 51 - 51
ds_gui.pd

@@ -10,7 +10,7 @@
 #X obj 174 183 bng 15 250 50 0 /ds/\$1/reload /ds/\$1/reload reload
 17 7 0 10 -4034 -1 -1;
 #X obj 123 119 nbx 3 15 0 1e+37 0 0 /ds/\$1/scene/current /ds/\$1/scene/current
-empty 0 -8 0 12 -204786 -1 -1 2 256;
+empty 0 -8 0 12 -204786 -1 -1 1 256;
 #X obj 104 119 bng 15 250 50 0 /ds/\$1/scene/current/prev /ds/\$1/scene/current/prev
 < 4 7 0 10 -204786 -1 -1;
 #X obj 174 119 bng 15 250 50 0 /ds/\$1/scene/current/next /ds/\$1/scene/current/next
@@ -22,7 +22,7 @@ advanced 17 7 0 10 -262144 -1 -1;
 #X obj 196 140 bng 15 250 50 0 /ds/\$1/store /ds/\$1/store store 17
 7 0 10 -258113 -1 -1;
 #X obj 123 140 nbx 3 15 0 1e+37 0 0 /ds/\$1/scene/selected /ds/\$1/scene/selected
-empty 0 -8 0 12 -261234 -1 -1 2 256;
+empty 0 -8 0 12 -261234 -1 -1 1 256;
 #X obj 104 140 bng 15 250 50 0 /ds/\$1/scene/selected/prev /ds/\$1/scene/selected/prev
 < 4 7 0 10 -261234 -1 -1;
 #X obj 174 140 bng 15 250 50 0 /ds/\$1/scene/selected/next /ds/\$1/scene/selected/next
@@ -36,7 +36,7 @@ empty 0 -8 0 12 -261234 -1 -1 2 256;
 #N canvas 0 22 450 300 ADVANCED 0;
 #X msg 82 112 vis 1;
 #X obj 82 134 s pd-\$0-advanced;
-#N canvas 702 22 232 481 \$0-advanced 0;
+#N canvas 624 82 232 481 \$0-advanced 0;
 #X obj 4 -118 cnv 15 200 105 empty empty Recall 5 10 0 14 -228856 -66577
 0;
 #X obj 28 -94 tgl 15 0 /ds/\$1/recall/data/state /ds/\$1/recall/data/state
@@ -86,7 +86,6 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X coords 0 481 1 480 85 60 0;
 #X restore 82 160 pd \$0-advanced;
 #X obj 82 60 r /ds/\$1/advanced/vis;
-#X obj 82 85 anyonce /ds/\$1/advanced/vis;
 #N canvas 43 108 913 589 register-list-loader 0;
 #X obj 451 433 + 1;
 #X obj 389 467 * 20;
@@ -112,7 +111,6 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X obj 124 464 t b b;
 #X obj 389 366 r \$0-reg-names;
 #X obj 308 61 r /ds/\$1/reg/print/dialog;
-#X obj 308 93 anyonce /ds/\$1/reg/print/dialog;
 #X obj 44 368 s pd-\$0-register-list;
 #X msg 389 615 obj 30 \$1 bng 15 250 50 0 /ds/\$3\$2/print /ds/\$3\$2/print
 \$2 20 7 0 10 -262144 -1 -1;
@@ -123,17 +121,18 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X msg 397 211 0;
 #X msg 348 211 1;
 #X obj 397 244 s /ds/\$1/dsp;
+#X obj 308 93 anyonce /ds/\$1/reg/print/dialog;
 #X connect 0 0 3 1;
 #X connect 1 0 13 0;
-#X connect 2 0 26 0;
+#X connect 2 0 25 0;
 #X connect 3 0 0 0;
 #X connect 3 0 1 0;
 #X connect 4 0 3 1;
 #X connect 5 0 8 0;
 #X connect 6 0 3 0;
 #X connect 6 1 5 1;
-#X connect 7 0 24 0;
-#X connect 8 0 25 0;
+#X connect 7 0 23 0;
+#X connect 8 0 24 0;
 #X connect 9 0 14 0;
 #X connect 9 1 20 0;
 #X connect 9 2 4 0;
@@ -143,7 +142,7 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X connect 10 1 11 0;
 #X connect 10 2 2 0;
 #X connect 11 0 12 0;
-#X connect 12 0 26 0;
+#X connect 12 0 25 0;
 #X connect 13 0 5 0;
 #X connect 14 0 7 0;
 #X connect 15 0 16 0;
@@ -153,18 +152,18 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X connect 20 0 15 0;
 #X connect 20 1 18 0;
 #X connect 21 0 6 0;
-#X connect 22 0 23 0;
-#X connect 23 0 29 0;
-#X connect 25 0 26 0;
-#X connect 27 0 28 0;
-#X connect 28 0 31 0;
-#X connect 28 1 10 0;
-#X connect 28 2 30 0;
+#X connect 22 0 32 0;
+#X connect 24 0 25 0;
+#X connect 26 0 27 0;
+#X connect 27 0 30 0;
+#X connect 27 1 10 0;
+#X connect 27 2 29 0;
+#X connect 28 0 30 0;
+#X connect 28 1 9 0;
+#X connect 28 2 29 0;
 #X connect 29 0 31 0;
-#X connect 29 1 9 0;
-#X connect 29 2 30 0;
-#X connect 30 0 32 0;
-#X connect 31 0 32 0;
+#X connect 30 0 31 0;
+#X connect 32 0 28 0;
 #X restore 82 210 pd register-list-loader;
 #N canvas 726 25 402 401 \$0-register-list 0;
 #X obj 30 20 cnv 15 300 20 empty empty Register_list_for_"domain" 5
@@ -194,7 +193,6 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X msg 515 494 obj 30 20 cnv 15 300 20 empty empty Global_registers_for_"\$1"
 5 10 0 14 -1 -262144 0;
 #X obj 308 91 r /ds/\$1/reg/global/print/dialog;
-#X obj 308 123 anyonce /ds/\$1/reg/global/print/dialog;
 #X obj 44 368 s pd-\$0-global-list;
 #X obj 389 366 r \$0-global-names;
 #X msg 64 520 \$1-global-names;
@@ -206,16 +204,17 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X msg 467 211 0;
 #X msg 418 211 1;
 #X obj 467 244 s /ds/\$1/dsp;
+#X obj 308 123 anyonce /ds/\$1/reg/global/print/dialog;
 #X connect 0 0 3 1;
 #X connect 1 0 12 0;
-#X connect 2 0 25 0;
+#X connect 2 0 24 0;
 #X connect 3 0 0 0;
 #X connect 3 0 1 0;
 #X connect 4 0 3 1;
 #X connect 5 0 8 0;
 #X connect 6 0 3 0;
 #X connect 6 1 5 1;
-#X connect 7 0 22 0;
+#X connect 7 0 21 0;
 #X connect 8 0 18 0;
 #X connect 9 0 13 0;
 #X connect 9 1 17 0;
@@ -228,41 +227,41 @@ debug 17 7 0 10 -262144 -1 -1 1 1;
 #X connect 11 0 19 0;
 #X connect 12 0 5 0;
 #X connect 13 0 7 0;
-#X connect 14 0 24 0;
-#X connect 16 0 26 0;
+#X connect 14 0 23 0;
+#X connect 16 0 25 0;
 #X connect 17 0 14 0;
 #X connect 17 1 16 0;
-#X connect 18 0 25 0;
-#X connect 19 0 25 0;
-#X connect 20 0 21 0;
-#X connect 21 0 29 0;
-#X connect 23 0 6 0;
-#X connect 24 0 15 0;
-#X connect 26 0 15 1;
-#X connect 27 0 28 0;
-#X connect 28 0 31 0;
-#X connect 28 1 10 0;
-#X connect 28 2 30 0;
+#X connect 18 0 24 0;
+#X connect 19 0 24 0;
+#X connect 20 0 32 0;
+#X connect 22 0 6 0;
+#X connect 23 0 15 0;
+#X connect 25 0 15 1;
+#X connect 26 0 27 0;
+#X connect 27 0 30 0;
+#X connect 27 1 10 0;
+#X connect 27 2 29 0;
+#X connect 28 0 30 0;
+#X connect 28 1 9 0;
+#X connect 28 2 29 0;
 #X connect 29 0 31 0;
-#X connect 29 1 9 0;
-#X connect 29 2 30 0;
-#X connect 30 0 32 0;
-#X connect 31 0 32 0;
+#X connect 30 0 31 0;
+#X connect 32 0 28 0;
 #X restore 257 210 pd global-list-loader;
 #N canvas 726 25 383 661 \$0-global-list 0;
 #X obj 30 20 cnv 15 300 20 empty empty Global_registers_for_"domain"
 5 10 0 14 -1 -262144 0;
 #X restore 257 230 pd \$0-global-list;
+#X obj 82 85 anyonce /ds/\$1/advanced/vis;
 #X connect 0 0 1 0;
-#X connect 3 0 4 0;
-#X connect 4 0 0 0;
+#X connect 3 0 8 0;
+#X connect 8 0 0 0;
 #X restore 283 149 pd ADVANCED;
 #N canvas 0 22 450 300 EDIT 0;
 #X msg 136 183 vis 1;
 #X obj 136 101 r /ds/\$1/edit/vis;
-#X obj 136 126 anyonce /ds/\$1/edit/vis;
 #X obj 136 205 s pd-\$0-edit;
-#N canvas 97 54 215 278 \$0-edit 1;
+#N canvas 97 54 215 278 \$0-edit 0;
 #X obj 4 -273 cnv 15 98 50 empty empty all 5 10 0 14 -233017 -66577
 0;
 #X obj 4 -219 cnv 15 200 30 empty empty selected 5 10 0 14 -233017
@@ -300,17 +299,18 @@ tables 17 7 0 10 -262144 -1 -1 1 1;
 #X obj 94 -28 tgl 15 0 /ds/\$1/edit/scene/paste/properties /ds/\$1/edit/scene/paste/properties
 properties 17 7 0 10 -262144 -1 -1 1 1;
 #X obj 124 -212 nbx 3 15 0 1e+37 0 0 /ds/\$1/scene/selected /ds/\$1/scene/selected
-empty 0 -8 0 12 -261234 -1 -1 0 256;
+empty 0 -8 0 12 -261234 -1 -1 1 256;
 #X coords 0 278 1 277 85 60 0;
 #X restore 136 231 pd \$0-edit;
 #X obj 221 205 s /ds/\$1/edit/lock;
 #X msg 221 183 1;
 #X obj 136 148 t b b;
-#X connect 0 0 3 0;
-#X connect 1 0 2 0;
-#X connect 2 0 7 0;
-#X connect 6 0 5 0;
-#X connect 7 0 0 0;
-#X connect 7 1 6 0;
+#X obj 136 126 anyonce /ds/\$1/edit/vis;
+#X connect 0 0 2 0;
+#X connect 1 0 7 0;
+#X connect 5 0 4 0;
+#X connect 6 0 0 0;
+#X connect 6 1 5 0;
+#X connect 7 0 6 0;
 #X restore 283 169 pd EDIT;
 #X coords 0 -1 1 1 150 122 1 100 100;

+ 45 - 41
ktabdump.pd

@@ -1,51 +1,55 @@
-#N canvas 223 136 574 532 10;
-#X obj 256 422 tabread dummy;
-#X obj 102 192 list prepend set;
-#X obj 102 234 list trim;
-#X obj 169 450 list_accumulate;
-#X text 344 486 (c)2013 Marian Weger;
+#N canvas 223 136 610 610 10;
+#X obj 370 409 tabread dummy;
+#X obj 122 192 list prepend set;
+#X obj 122 234 list trim;
+#X text 428 555 (c)2013 Marian Weger;
 #X obj 346 78 loadbang;
 #X obj 346 100 list prepend \$1;
-#X msg 169 234 clear;
 #X obj 346 122 route 0;
-#X obj 327 258 expr size("$s1");
-#X obj 256 357 until;
-#X obj 256 325 t f b;
-#X obj 256 389 f;
-#X obj 299 389 + 1;
-#X msg 299 357 0;
-#X obj 169 472 outlet data;
-#X obj 256 296 f;
-#X obj 327 236 symbol dummy;
-#X text 70 20 tabdump (<table name>);
+#X obj 385 258 expr size("$s1");
+#X obj 370 344 until;
+#X obj 370 312 t f b;
+#X obj 370 376 f;
+#X obj 413 376 + 1;
+#X msg 413 344 0;
+#X obj 239 569 outlet data;
+#X obj 370 283 f;
+#X obj 385 236 symbol dummy;
 #X obj 239 100 route bang set;
 #X obj 239 192 t b b b b;
 #X text 71 47 Pd-Vanilla compatible replacement for zexy/tabdump;
 #X obj 239 78 inlet;
-#X connect 0 0 3 1;
+#X obj 290 467 list prepend;
+#X obj 239 543 list;
+#X obj 290 509 t a a;
+#X text 70 20 ktabdump (<table name>);
+#X connect 0 0 20 0;
 #X connect 1 0 2 0;
 #X connect 2 0 0 0;
-#X connect 3 0 15 0;
+#X connect 4 0 5 0;
 #X connect 5 0 6 0;
-#X connect 6 0 8 0;
-#X connect 7 0 3 0;
-#X connect 8 1 1 0;
-#X connect 8 1 17 0;
-#X connect 9 0 16 1;
-#X connect 10 0 12 0;
-#X connect 11 0 10 0;
-#X connect 11 1 14 0;
-#X connect 12 0 13 0;
-#X connect 12 0 0 0;
-#X connect 13 0 12 1;
-#X connect 14 0 12 1;
-#X connect 16 0 11 0;
-#X connect 17 0 9 0;
-#X connect 19 0 20 0;
-#X connect 19 1 17 0;
-#X connect 19 1 1 0;
-#X connect 20 0 3 0;
-#X connect 20 1 16 0;
-#X connect 20 2 7 0;
-#X connect 20 3 17 0;
-#X connect 22 0 19 0;
+#X connect 6 1 1 0;
+#X connect 6 1 15 0;
+#X connect 7 0 14 1;
+#X connect 8 0 10 0;
+#X connect 9 0 8 0;
+#X connect 9 1 12 0;
+#X connect 10 0 11 0;
+#X connect 10 0 0 0;
+#X connect 11 0 10 1;
+#X connect 12 0 10 1;
+#X connect 14 0 9 0;
+#X connect 15 0 7 0;
+#X connect 16 0 17 0;
+#X connect 16 1 15 0;
+#X connect 16 1 1 0;
+#X connect 17 0 21 0;
+#X connect 17 1 14 0;
+#X connect 17 2 21 1;
+#X connect 17 2 20 1;
+#X connect 17 3 15 0;
+#X connect 19 0 16 0;
+#X connect 20 0 22 0;
+#X connect 21 0 13 0;
+#X connect 22 0 21 1;
+#X connect 22 1 20 1;

+ 0 - 13
list_accumulate-help.pd

@@ -1,13 +0,0 @@
-#N canvas 126 143 436 366 10;
-#X text 243 281 (c)2012 Marian Weger;
-#X text 44 38 list_accumulate;
-#X obj 153 185 list_accumulate;
-#X obj 153 102 bng 15 250 50 0 empty empty output_list 17 7 0 10 -262144
--1 -1;
-#X obj 153 257 print;
-#X floatatom 241 147 5 0 0 0 - - -;
-#X msg 97 132 clear;
-#X connect 2 0 4 0;
-#X connect 3 0 2 0;
-#X connect 5 0 2 1;
-#X connect 6 0 2 0;

+ 0 - 25
list_accumulate.pd

@@ -1,25 +0,0 @@
-#N canvas 126 143 454 455 10;
-#X text 224 389 (c)2012 Marian Weger;
-#X text 44 38 list_accumulate;
-#X obj 106 77 inlet create;
-#X obj 177 199 list prepend;
-#X obj 131 324 outlet list;
-#X obj 131 295 list;
-#X obj 221 77 inlet elements;
-#X obj 221 99 route bang;
-#X obj 106 99 route bang clear;
-#X obj 106 123 b;
-#X obj 152 123 b;
-#X obj 177 241 t a a;
-#X connect 2 0 8 0;
-#X connect 3 0 11 0;
-#X connect 5 0 4 0;
-#X connect 6 0 7 0;
-#X connect 7 1 3 0;
-#X connect 8 0 9 0;
-#X connect 8 1 10 0;
-#X connect 9 0 5 0;
-#X connect 10 0 5 1;
-#X connect 10 0 3 1;
-#X connect 11 0 5 1;
-#X connect 11 1 3 1;

+ 0 - 17
list_read-help.pd

@@ -1,17 +0,0 @@
-#N canvas 522 129 436 366 10;
-#X text 209 269 (c)2012 Marian Weger;
-#X obj 63 237 print;
-#X floatatom 63 83 5 0 0 2 index - -;
-#X obj 63 165 list_read;
-#X obj 114 117 loadbang;
-#X msg 114 139 list a b c 1 2 3 x y z 9 8 7;
-#X text 74 195 if the indexed element is not existent \, a "bang" will
-be sent to the output.;
-#X text 17 16 list_read <index init (optional)>;
-#X obj 30 83 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X connect 2 0 3 0;
-#X connect 3 0 1 0;
-#X connect 4 0 5 0;
-#X connect 5 0 3 1;
-#X connect 8 0 3 0;

+ 0 - 31
list_read.pd

@@ -1,31 +0,0 @@
-#N canvas 555 105 454 553 10;
-#X obj 137 79 inlet list;
-#X obj 51 79 inlet index;
-#X text 241 432 (c)2012 Marian Weger;
-#X obj 97 352 list split 1;
-#X obj 97 446 outlet value;
-#X obj 103 293 route bang;
-#X obj 116 239 list split \$1;
-#X obj 191 352 t b;
-#X obj 116 210 list;
-#X obj 51 128 moses 0;
-#X obj 51 352 t b;
-#X obj 51 101 f \$1;
-#X obj 90 160 t b f;
-#X text 44 38 list_read <index init (optional)>;
-#X connect 0 0 8 1;
-#X connect 1 0 11 0;
-#X connect 3 0 4 0;
-#X connect 3 2 7 0;
-#X connect 5 0 7 0;
-#X connect 5 1 3 0;
-#X connect 6 1 5 0;
-#X connect 6 2 7 0;
-#X connect 7 0 4 0;
-#X connect 8 0 6 0;
-#X connect 9 0 10 0;
-#X connect 9 1 12 0;
-#X connect 10 0 4 0;
-#X connect 11 0 9 0;
-#X connect 12 0 8 0;
-#X connect 12 1 6 1;