implemented using 2 element lists, first the segment number, next the value; this seems to work better and makes the patches simple

svn path=/trunk/externals/mapping/; revision=5239

7 files changed, 202 insertions, 201 deletions

diff --git a/TODO b/TODO
index 131a550..2e20121 100644
--- a/TODO
+++ b/TODO
@@ -3,15 +3,6 @@
   used as arguments on in the right inlets
 
 
-- implement [spiral clockwise], (cart2pol is counter-clockwise)
-
-
-- implement [desegment]
-
-
-- debug [segment]
-
-
 - merge ds_ list objects with abstractions/footils/list-abs
 
 
diff --git a/desegment.pd b/desegment.pd
index cdfabbc..b345057 100644
--- a/desegment.pd
+++ b/desegment.pd
@@ -1,14 +1,17 @@
-#N canvas 410 221 692 329 10;
-#X obj 83 58 inlet;
-#X obj 75 266 outlet;
-#X obj 123 58 inlet;
-#X obj 163 58 inlet;
-#X obj 203 58 inlet;
-#X obj 243 58 inlet;
-#X obj 283 58 inlet;
-#X obj 323 58 inlet;
-#X obj 363 58 inlet;
-#X obj 403 58 inlet;
-#X obj 443 58 inlet;
-#X obj 483 58 inlet;
-#X obj 523 58 inlet;
+#N canvas 98 301 426 336 10;
+#X obj 21 15 inlet;
+#X obj 127 279 outlet;
+#X obj 198 81 purepd/float_argument \$1 1;
+#X obj 198 15 inlet;
+#X obj 231 44 loadbang;
+#X obj 21 113 unpack float float;
+#X obj 126 184 +;
+#X obj 127 224 /;
+#X connect 0 0 5 0;
+#X connect 2 0 7 1;
+#X connect 3 0 2 0;
+#X connect 4 0 2 0;
+#X connect 5 0 6 0;
+#X connect 5 1 6 1;
+#X connect 6 0 7 0;
+#X connect 7 0 1 0;
diff --git a/help/desegment-help.pd b/help/desegment-help.pd
new file mode 100644
index 0000000..dbc36aa
--- /dev/null
+++ b/help/desegment-help.pd
@@ -0,0 +1,41 @@
+#N canvas 490 146 676 322 10;
+#X obj 66 28 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 12700 1;
+#X obj 199 28 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 12700 1;
+#X obj 332 28 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 12700 1;
+#X obj 465 28 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 10800 1;
+#X obj 62 248 hsl 527 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 40987 1;
+#X msg 331 138 2;
+#X msg 392 137 6;
+#X msg 361 137 4;
+#X floatatom 74 50 5 0 0 0 - - -;
+#X floatatom 210 50 5 0 0 0 - - -;
+#X floatatom 339 49 5 0 0 0 - - -;
+#X floatatom 472 50 5 0 0 0 - - -;
+#X floatatom 46 271 5 0 0 0 - - -;
+#X obj 242 166 desegment 4;
+#X msg 56 76 0 \$1;
+#X msg 190 71 1 \$1;
+#X msg 331 70 2 \$1;
+#X msg 462 69 3 \$1;
+#X connect 0 0 8 0;
+#X connect 0 0 14 0;
+#X connect 1 0 9 0;
+#X connect 1 0 15 0;
+#X connect 2 0 10 0;
+#X connect 2 0 16 0;
+#X connect 3 0 11 0;
+#X connect 3 0 17 0;
+#X connect 4 0 12 0;
+#X connect 5 0 13 1;
+#X connect 6 0 13 1;
+#X connect 7 0 13 1;
+#X connect 13 0 4 0;
+#X connect 14 0 13 0;
+#X connect 15 0 13 0;
+#X connect 16 0 13 0;
+#X connect 17 0 13 0;
diff --git a/help/segment-help.pd b/help/segment-help.pd
index 588860c..5e1315a 100644
--- a/help/segment-help.pd
+++ b/help/segment-help.pd
@@ -1,33 +1,35 @@
-#N canvas 15 380 668 314 10;
-#X obj 62 198 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 11010 1;
-#X obj 195 198 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 97 1;
-#X obj 328 198 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 21 1;
-#X obj 461 198 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 8322 1;
+#N canvas 389 127 680 326 10;
+#X obj 66 238 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 6674 1;
+#X obj 199 238 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 4029 1;
+#X obj 332 238 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 3204 1;
+#X obj 465 238 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
+-1 -1 2986 1;
 #X obj 62 28 hsl 527 15 0 1 0 0 empty empty empty -2 -6 0 8 -262144
--1 -1 11400 1;
+-1 -1 7700 1;
 #X msg 189 88 2;
 #X msg 250 87 6;
 #X msg 219 87 4;
-#X floatatom 60 222 5 0 0 0 - - -;
-#X floatatom 196 220 5 0 0 0 - - -;
-#X floatatom 328 222 5 0 0 0 - - -;
-#X floatatom 459 220 5 0 0 0 - - -;
+#X floatatom 64 262 5 0 0 0 - - -;
+#X floatatom 200 260 5 0 0 0 - - -;
+#X floatatom 332 262 5 0 0 0 - - -;
+#X floatatom 463 260 5 0 0 0 - - -;
 #X floatatom 46 51 5 0 0 0 - - -;
+#X obj 153 182 route 0 1 2 3;
 #X obj 154 123 segment 4;
 #X connect 0 0 8 0;
 #X connect 1 0 9 0;
 #X connect 2 0 10 0;
 #X connect 3 0 11 0;
 #X connect 4 0 12 0;
-#X connect 4 0 13 0;
-#X connect 5 0 13 1;
-#X connect 6 0 13 1;
-#X connect 7 0 13 1;
+#X connect 4 0 14 0;
+#X connect 5 0 14 1;
+#X connect 6 0 14 1;
+#X connect 7 0 14 1;
 #X connect 13 0 0 0;
 #X connect 13 1 1 0;
 #X connect 13 2 2 0;
 #X connect 13 3 3 0;
+#X connect 14 0 13 0;
diff --git a/help/stepper-help.pd b/help/stepper-help.pd
new file mode 100644
index 0000000..9b8c313
--- /dev/null
+++ b/help/stepper-help.pd
@@ -0,0 +1,76 @@
+#N canvas 263 162 512 393 10;
+#X obj 5 2 cnv 15 450 20 empty empty [stepper] 2 11 1 18 -233017 -66577
+0;
+#X msg 422 3 pddp;
+#X text 27 320 (C) Copyright 2004 Hans-Christoph Steiner <hans@at.or.at>
+;
+#X text 244 334 released under the GNU GPL;
+#X floatatom 25 133 8 0 0 0 - - -;
+#X floatatom 25 264 8 0 0 0 - - -;
+#X obj 28 281 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -262144
+-1 -1 0 1;
+#X obj 28 113 hsl 200 15 0 1 0 0 empty empty empty 22 8 1 12 -225271
+-1 -1 0 1;
+#N canvas 0 22 450 300 graph1 0;
+#X array \$0_ 200 float 0;
+#X coords 0 1 199 0 200 200 1;
+#X restore 261 111 graph;
+#N canvas 266 69 439 429 draw_array 0;
+#X msg 54 82 bang;
+#X obj 54 103 until;
+#X text 85 82 start;
+#X obj 54 125 f;
+#X obj 83 125 + 1;
+#X obj 54 43 loadbang;
+#X obj 298 9 receive \$0-type;
+#X obj 54 180 trigger float float;
+#X obj 127 127 select 0;
+#X obj 53 343 tabwrite \$0_;
+#X text 96 257 mapping output range: 0 to 1;
+#X obj 16 5 inlet;
+#X obj 299 32 float;
+#X obj 54 257 / 200;
+#X obj 83 147 mod 200;
+#X obj 53 313 stepper;
+#X obj 149 34 receive \$0-segments;
+#X obj 299 53 trigger bang float;
+#X obj 149 53 trigger bang float;
+#X connect 0 0 1 0;
+#X connect 1 0 3 0;
+#X connect 3 0 4 0;
+#X connect 3 0 7 0;
+#X connect 4 0 14 0;
+#X connect 5 0 0 0;
+#X connect 6 0 12 0;
+#X connect 7 0 13 0;
+#X connect 7 1 9 1;
+#X connect 8 0 1 1;
+#X connect 11 0 0 0;
+#X connect 12 0 17 0;
+#X connect 13 0 15 0;
+#X connect 14 0 3 1;
+#X connect 14 0 8 0;
+#X connect 15 0 9 0;
+#X connect 16 0 18 0;
+#X connect 17 0 0 0;
+#X connect 17 1 15 2;
+#X connect 18 0 0 0;
+#X connect 18 1 15 1;
+#X restore 321 79 pd draw_array;
+#X msg 321 59 bang;
+#X obj 72 199 hsl 128 15 -1 1 0 0 \$0-type empty curve_factor 5 8 1
+11 -257472 -1 -1 8000 1;
+#X floatatom 81 219 5 0 0 0 - - -;
+#X obj 25 243 stepper;
+#X obj 50 159 hsl 128 15 1 64 0 1 \$0-segments empty segments 5 8 1
+11 -262131 -1 -1 2217 1;
+#X floatatom 56 180 5 0 0 0 - - -;
+#X connect 4 0 13 0;
+#X connect 5 0 6 0;
+#X connect 7 0 4 0;
+#X connect 10 0 9 0;
+#X connect 11 0 12 0;
+#X connect 11 0 13 2;
+#X connect 13 0 5 0;
+#X connect 14 0 15 0;
+#X connect 14 0 13 1;
diff --git a/segment.pd b/segment.pd
index 7a81b36..a09c8ff 100644
--- a/segment.pd
+++ b/segment.pd
@@ -1,133 +1,25 @@
-#N canvas 328 208 865 565 10;
-#X obj 8 28 inlet;
-#X obj 6 4 namecanvas \$0-segment;
-#X obj 360 290 pack float float;
-#X obj 467 270 *;
-#X msg 459 223 1;
-#X obj 360 311 trigger list list;
-#X obj 274 185 +;
-#X msg 274 165 1;
-#X msg 305 165 0;
-#X obj 274 145 until;
-#X obj 167 4 inlet;
-#X obj 360 262 * 125;
-#X obj 360 240 - 1;
-#N canvas 407 40 498 348 clear 0;
-#X obj 21 28 inlet;
-#X text 72 28 do it bang;
-#X obj 21 71 trigger bang bang bang bang;
-#X obj 26 260 outlet;
-#X text 80 259 to namecanvas [send];
-#X msg 306 203 vis 1 \, editmode 1;
-#X msg 153 167 cut;
-#X msg 216 157 mouse 5 480 0 0 \, mouseup 2000 435 0;
-#X msg 30 165 editmode 0;
-#X connect 0 0 2 0;
-#X connect 2 0 8 0;
-#X connect 2 1 6 0;
-#X connect 2 2 7 0;
-#X connect 2 3 5 0;
-#X connect 5 0 3 0;
-#X connect 6 0 3 0;
-#X connect 7 0 3 0;
-#X connect 8 0 3 0;
-#X restore 287 65 pd clear dynamic objects;
-#X obj 320 401 send \$0-segment;
-#X obj 287 84 send \$0-segment;
-#X obj 167 46 trigger float bang;
-#X obj 167 25 route float;
-#X text -3 416 -----------------------------------------------------------
-;
-#X text -3 481 -----------------------------------------------------------
-keep the above area clear for automatic editing;
-#X text 411 416 -----------------------------------------------------------
-;
-#X text 412 481 -----------------------------------------------------------
-;
-#X obj 304 185 float;
-#X msg 333 334 obj \$1 460 outlet;
-#X msg 473 333 obj \$1 440 disjoin \$2;
-#N canvas 0 22 567 496 connect 0;
-#X obj 290 16 inlet;
-#X obj 234 398 outlet;
-#X obj 339 238 pack float float;
-#X msg 338 262 connect \$1 0 \$2 0;
-#X obj 446 218 + 1;
-#X obj 289 181 trigger float float;
-#X obj 289 134 * 2;
-#X obj 199 239 pack float float;
-#X msg 199 263 connect \$2 1 \$1 0;
-#X obj 306 218 - 2;
-#X text 117 119 object count;
-#X obj 289 161 +;
-#X obj 141 218 select 0;
-#X msg 60 263 connect 0 0 \$1 0;
-#X msg 60 243 32;
-#X msg 61 199 set \$1;
-#X obj 193 158 + 2;
-#X obj 208 95 loadbang;
-#X msg 208 118 30;
-#X connect 0 0 6 0;
-#X connect 2 0 3 0;
-#X connect 3 0 1 0;
-#X connect 4 0 2 1;
-#X connect 5 0 2 0;
-#X connect 5 0 12 0;
-#X connect 5 1 4 0;
-#X connect 5 1 9 0;
-#X connect 6 0 11 0;
+#N canvas 310 147 544 471 10;
+#X obj 21 15 inlet;
+#X obj 57 430 outlet;
+#X obj 172 80 purepd/float_argument \$1 1;
+#X obj 172 14 inlet;
+#X obj 205 43 loadbang;
+#X obj 58 162 *;
+#X obj 58 296 pack float float;
+#X obj 58 188 trigger bang float float;
+#X obj 58 277 float;
+#X obj 221 213 int;
+#X obj 165 276 -;
+#X connect 0 0 5 0;
+#X connect 2 0 5 1;
+#X connect 3 0 2 0;
+#X connect 4 0 2 0;
+#X connect 5 0 7 0;
+#X connect 6 0 1 0;
 #X connect 7 0 8 0;
-#X connect 8 0 1 0;
-#X connect 9 0 7 1;
-#X connect 11 0 5 0;
-#X connect 12 0 14 0;
-#X connect 12 1 7 0;
-#X connect 13 0 1 0;
-#X connect 14 0 13 0;
-#X connect 15 0 14 0;
-#X connect 16 0 12 1;
-#X connect 16 0 15 0;
-#X connect 17 0 18 0;
-#X connect 18 0 11 1;
-#X connect 18 0 16 0;
-#X restore 185 290 pd connect messages;
-#X obj 484 250 /;
-#X obj 521 223 expr $f2 - $f1 + 1;
-#X obj 274 204 trigger float float float bang float;
-#X obj 84 82 float_argument \$1;
-#X msg 299 45 bang;
-#X obj 274 124 trigger float bang float;
-#X connect 2 0 5 0;
-#X connect 3 0 2 1;
-#X connect 4 0 26 0;
-#X connect 5 0 23 0;
-#X connect 5 1 24 0;
-#X connect 6 0 22 0;
-#X connect 6 0 28 0;
-#X connect 7 0 6 0;
-#X connect 8 0 22 0;
-#X connect 9 0 7 0;
-#X connect 10 0 17 0;
-#X connect 11 0 2 0;
-#X connect 12 0 11 0;
-#X connect 13 0 15 0;
-#X connect 16 0 31 0;
-#X connect 16 1 13 0;
-#X connect 17 0 16 0;
-#X connect 22 0 6 1;
-#X connect 23 0 14 0;
-#X connect 24 0 14 0;
-#X connect 25 0 14 0;
-#X connect 26 0 3 1;
-#X connect 27 0 26 1;
-#X connect 28 0 25 0;
-#X connect 28 1 12 0;
-#X connect 28 2 3 0;
-#X connect 28 3 4 0;
-#X connect 28 4 27 0;
-#X connect 29 0 31 0;
-#X connect 30 0 13 0;
-#X connect 30 0 8 0;
-#X connect 31 0 9 0;
-#X connect 31 1 8 0;
-#X connect 31 2 27 1;
+#X connect 7 1 10 0;
+#X connect 7 2 9 0;
+#X connect 8 0 6 0;
+#X connect 9 0 10 1;
+#X connect 9 0 8 1;
+#X connect 10 0 6 1;
diff --git a/stepper.pd b/stepper.pd
index 61f3ef2..650353c 100644
--- a/stepper.pd
+++ b/stepper.pd
@@ -1,28 +1,24 @@
-#N canvas 209 56 1032 542 10;
-#X obj 99 38 inlet;
-#X obj 82 496 outlet;
-#X obj 96 390 desegment 12 -----------------------------------;
-#X obj 95 140 segment 12 ------------------------------------;
-#X obj 7 273 curve_power;
-#X obj 90 273 curve_power;
-#X obj 173 273 curve_power;
-#X obj 256 273 curve_power;
-#X obj 339 273 curve_power;
-#X obj 422 273 curve_power;
-#X obj 505 273 curve_power;
-#X obj 588 273 curve_power;
-#X obj 671 273 curve_power;
-#X obj 754 273 curve_power;
-#X obj 837 273 curve_power;
-#X obj 920 273 curve_power;
-#X obj 425 52 inlet;
-#X obj 747 60 inlet;
-#X connect 2 0 1 0;
-#X connect 4 0 2 0;
-#X connect 5 0 2 1;
-#X connect 6 0 2 2;
-#X connect 7 0 2 3;
-#X connect 8 0 2 4;
-#X connect 9 0 2 5;
-#X connect 10 0 2 6;
-#X connect 11 0 2 7;
+#N canvas 105 192 542 295 10;
+#X obj 48 33 inlet;
+#X obj 49 245 outlet;
+#X obj 154 32 inlet;
+#X obj 48 105 segment;
+#X obj 155 72 purepd/float_argument \$1;
+#X obj 357 29 inlet;
+#X obj 358 69 purepd/float_argument \$2;
+#X obj 169 155 mapping/curve;
+#X obj 48 134 unpack float float;
+#X obj 48 180 pack float float;
+#X obj 48 206 desegment;
+#X connect 0 0 3 0;
+#X connect 2 0 4 0;
+#X connect 3 0 8 0;
+#X connect 4 0 3 1;
+#X connect 4 0 10 1;
+#X connect 5 0 6 0;
+#X connect 6 0 7 1;
+#X connect 7 0 9 1;
+#X connect 8 0 9 0;
+#X connect 8 1 7 0;
+#X connect 9 0 10 0;
+#X connect 10 0 1 0;