From e59236f2e02aee6305453a5cc7ba25d2a22f1f02 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Tue, 22 Jul 2014 12:06:45 -0400
Subject: [PATCH] *fixed inconsistent behavior of counter and scale when
 inverting order/range of values.

---
 l2ork_addons/K12/logic_counter.pd | 79 ++++++++++++++++++-------------
 l2ork_addons/K12/math_scale.pd    | 62 ++++++++++++++----------
 2 files changed, 82 insertions(+), 59 deletions(-)

diff --git a/l2ork_addons/K12/logic_counter.pd b/l2ork_addons/K12/logic_counter.pd
index c5bd92943..1f4eb98e9 100755
--- a/l2ork_addons/K12/logic_counter.pd
+++ b/l2ork_addons/K12/logic_counter.pd
@@ -1,6 +1,7 @@
-#N canvas 146 67 452 406 10;
+#N canvas 465 128 452 470 10;
 #X obj 162 55 loadbang;
-#X obj 162 159 ggee/image @pd_extra/K12/objects/logic_counter.png 1;
+#X obj 162 159 ggee/image @pd_extra/K12/objects/logic_counter.png 1
+;
 #X obj 121 157 nbx 5 19 -1e+37 1e+37 0 1 empty empty empty 0 -8 0 16
 -262144 -1 -1 1 256 1;
 #X obj 62 86 preset_node k12;
@@ -9,52 +10,64 @@
 #X text 119 141 Start;
 #X obj 5 55 inlet;
 #X obj 5 86 sel 1;
-#X msg 85 349 min \$1;
-#X msg 136 349 max \$1;
+#X msg 175 369 min \$1;
+#X msg 226 369 max \$1;
 #X text 182 195 End;
-#X obj 15 279 >;
-#X obj 85 322 gate 2;
-#X obj 136 300 + 1;
-#X obj 136 322 gate 2;
-#X msg 15 334 up;
-#X obj 15 301 sel 0 1;
-#X msg 46 334 down;
-#X obj 5 441 outlet;
+#X obj 15 287 >;
+#X obj 175 322 gate 2;
+#X obj 175 298 + 1;
+#X obj 226 322 gate 2;
+#X msg 15 382 up;
+#X obj 15 349 sel 0 1;
+#X msg 46 382 down;
+#X obj 5 489 outlet;
 #X obj 62 55 preset_node k12;
 #X msg 162 85 open @pd_extra/K12/objects/logic_counter.png;
-#X obj 63 210 t f b f;
-#X obj 5 415 counter 1 10;
-#X obj 39 393 loadbang;
-#X obj 14 210 t b f f;
+#X obj 5 463 counter 1 10;
+#X obj 39 441 loadbang;
+#X obj 129 340 change;
+#X obj 129 361 t b;
+#X obj 15 308 t f f f;
+#X obj 84 382 gate 2 0;
+#X obj 14 228 t b f f 1;
+#X obj 83 228 t f b f 2;
 #X connect 0 0 20 0;
 #X connect 2 0 3 0;
-#X connect 2 0 24 0;
+#X connect 2 0 27 0;
 #X connect 3 0 2 0;
 #X connect 4 0 19 0;
-#X connect 4 0 21 0;
+#X connect 4 0 28 0;
 #X connect 6 0 7 0;
-#X connect 7 0 22 0;
-#X connect 8 0 22 0;
-#X connect 9 0 22 0;
-#X connect 11 0 13 0;
-#X connect 11 0 16 0;
+#X connect 7 0 21 0;
+#X connect 8 0 21 0;
+#X connect 9 0 21 0;
+#X connect 11 0 25 0;
 #X connect 12 0 8 0;
 #X connect 12 1 9 0;
 #X connect 13 0 12 0;
 #X connect 13 0 14 0;
 #X connect 14 0 9 0;
 #X connect 14 1 8 0;
-#X connect 15 0 22 0;
+#X connect 15 0 21 0;
 #X connect 16 0 15 0;
 #X connect 16 1 17 0;
-#X connect 17 0 22 0;
+#X connect 17 0 21 0;
 #X connect 19 0 4 0;
-#X connect 21 0 14 1;
-#X connect 21 1 11 0;
-#X connect 21 2 11 1;
-#X connect 22 0 18 0;
-#X connect 23 0 22 2;
-#X connect 24 0 22 2;
-#X connect 24 1 12 1;
-#X connect 24 2 11 0;
+#X connect 21 0 18 0;
+#X connect 22 0 21 2;
+#X connect 23 0 24 0;
+#X connect 24 0 26 1;
+#X connect 25 0 16 0;
+#X connect 25 1 23 0;
+#X connect 25 2 13 0;
+#X connect 26 0 4 0;
+#X connect 26 1 2 0;
+#X connect 27 0 21 2;
+#X connect 27 1 12 1;
+#X connect 27 2 11 0;
+#X connect 27 3 26 0;
+#X connect 28 0 14 1;
+#X connect 28 1 11 0;
+#X connect 28 2 11 1;
+#X connect 28 3 26 0;
 #X coords 0 -1 1 1 89 89 2 117 127;
diff --git a/l2ork_addons/K12/math_scale.pd b/l2ork_addons/K12/math_scale.pd
index 95f77fc94..880a69798 100755
--- a/l2ork_addons/K12/math_scale.pd
+++ b/l2ork_addons/K12/math_scale.pd
@@ -7,7 +7,7 @@
 #X obj 62 16 preset_node k12;
 #X obj 47 533 outlet;
 #X obj 63 39 preset_node k12;
-#X obj 8 240 maxlib/scale 0 10000 0 10000;
+#X obj 8 260 maxlib/scale 0 10000 0 10000;
 #X obj 157 156 nbx 4 14 -1e+37 1e+37 0 1 \$0-s-null \$0-r-null empty
 0 -8 0 11 -262144 -1 -1 100 256 3;
 #X obj 118 183 nbx 4 14 -1e+37 1e+37 0 1 \$0-s-null \$0-r-null empty
@@ -17,7 +17,7 @@
 #X msg 162 85 open @pd_extra/K12/objects/math_scale.png;
 #X obj 63 62 preset_node k12;
 #X obj 64 85 preset_node k12;
-#X obj 129 319 t b f;
+#X obj 132 319 t b f;
 #X obj 8 438 moses 0;
 #X text 156 153 -;
 #X text 156 180 -;
@@ -25,14 +25,17 @@
 #X obj 55 371 + 1;
 #X obj 55 393 gate 2 1;
 #X obj 113 393 gate 2 1;
-#X obj 102 295 t f f;
-#X obj 62 295 t f f;
 #X obj 47 480 moses 0;
 #X msg 59 438 set \$1;
 #X msg 86 503 1;
 #X msg 147 438 set \$1;
 #X obj 55 349 >;
 #X msg 8 480 0;
+#X obj 244 377 change;
+#X obj 244 398 t b;
+#X obj 199 419 gate 2 0;
+#X obj 113 295 t f f 2;
+#X obj 62 295 t f f 1;
 #X connect 1 0 7 0;
 #X connect 2 0 11 0;
 #X connect 3 0 4 0;
@@ -43,35 +46,42 @@
 #X connect 8 0 7 2;
 #X connect 9 0 12 0;
 #X connect 9 0 7 3;
-#X connect 9 0 23 0;
+#X connect 9 0 32 0;
 #X connect 10 0 13 0;
 #X connect 10 0 7 4;
-#X connect 10 0 22 0;
+#X connect 10 0 31 0;
 #X connect 12 0 9 0;
 #X connect 13 0 10 0;
-#X connect 14 0 28 0;
-#X connect 14 1 28 1;
-#X connect 15 0 29 0;
-#X connect 15 1 24 0;
+#X connect 14 0 26 0;
+#X connect 14 1 26 1;
+#X connect 15 0 27 0;
+#X connect 15 1 22 0;
 #X connect 19 0 20 0;
 #X connect 19 0 21 0;
 #X connect 20 0 15 1;
-#X connect 20 0 25 0;
-#X connect 20 1 27 0;
-#X connect 20 1 24 1;
-#X connect 21 0 24 1;
-#X connect 21 0 27 0;
+#X connect 20 0 23 0;
+#X connect 20 1 25 0;
+#X connect 20 1 22 1;
+#X connect 21 0 22 1;
+#X connect 21 0 25 0;
 #X connect 21 1 15 1;
-#X connect 21 1 25 0;
-#X connect 22 0 21 1;
-#X connect 22 1 14 0;
-#X connect 23 0 20 1;
-#X connect 23 1 28 0;
+#X connect 21 1 23 0;
+#X connect 22 0 5 0;
+#X connect 22 1 24 0;
+#X connect 23 0 27 0;
 #X connect 24 0 5 0;
-#X connect 24 1 26 0;
-#X connect 25 0 29 0;
-#X connect 26 0 5 0;
-#X connect 27 0 26 0;
-#X connect 28 0 19 0;
-#X connect 29 0 5 0;
+#X connect 25 0 24 0;
+#X connect 26 0 19 0;
+#X connect 26 0 28 0;
+#X connect 27 0 5 0;
+#X connect 28 0 29 0;
+#X connect 29 0 30 1;
+#X connect 30 0 10 0;
+#X connect 30 1 9 0;
+#X connect 31 0 21 1;
+#X connect 31 1 14 0;
+#X connect 31 2 30 0;
+#X connect 32 0 20 1;
+#X connect 32 1 26 0;
+#X connect 32 2 30 0;
 #X coords 0 -1 1 1 89 89 2 117 127;
-- 
GitLab