From 29210123e9b062eddb9b8045188bdf300174c514 Mon Sep 17 00:00:00 2001 From: user <user@user-ThinkPad-X60.(none)> Date: Wed, 6 May 2015 21:46:39 -0400 Subject: [PATCH] changed element property '""' to 'none' in ds demos --- .../pd-l2ork/ds-demos/arcs.pd | 46 ++++++++--------- .../pd-l2ork/ds-demos/circlehand.pd | 12 ++--- .../pd-l2ork/ds-demos/ellipses.pd | 12 ++--- .../pd-l2ork/ds-demos/lines.pd | 50 +++++++++---------- .../pd-l2ork/ds-demos/objects.pd | 6 +-- .../pd-l2ork/ds-demos/polar-clock.pd | 19 +++---- .../pd-l2ork/ds-demos/quick-graph.pd | 12 ++--- .../pd-l2ork/ds-demos/quick-graph2.pd | 2 +- .../pd-l2ork/ds-demos/raphael-animation.pd | 44 ++++++++-------- .../pd-l2ork/ds-demos/splines.pd | 10 ++-- 10 files changed, 107 insertions(+), 106 deletions(-) diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/arcs.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/arcs.pd index 8e47daec0..c4596b4ac 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/arcs.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/arcs.pd @@ -32,23 +32,23 @@ Z; #X obj 438 280 draw path M 0 90 v -6 v 12 M 0 90 A 50 50 0 1 1 -6 -10 M -6 -10 l -6 -6 M -6 -10 l -6 6; #X obj 448 260 r arrow-left; -#X msg 48 69 stroke red \, stroke-width 2 \, fill ""; -#X msg 48 175 stroke blue \, stroke-width 2 \, fill ""; -#X msg 438 133 stroke red \, fill ""; -#X msg 438 239 stroke red \, fill ""; -#X msg 438 349 stroke purple \, fill "" \, transform matrix 2.82843 --2.82843 2.82843 2.82843 200 200; -#X msg 48 415 stroke-width 2 \, stroke black \, fill ""; #X msg 48 255 fill yellow \, stroke-width 2 \, stroke black; #X msg 48 335 fill yellow \, stroke-width 2 \, stroke black; -#X connect 2 0 25 0; -#X connect 4 0 26 0; -#X connect 5 0 31 0; -#X connect 7 0 32 0; -#X connect 9 0 30 0; -#X connect 11 0 27 0; -#X connect 12 0 28 0; -#X connect 13 0 29 0; +#X msg 48 175 stroke blue \, stroke-width 2 \, fill none; +#X msg 48 415 stroke-width 2 \, stroke black \, fill none; +#X msg 438 133 stroke red \, fill none; +#X msg 438 239 stroke red \, fill none; +#X msg 438 349 stroke purple \, fill none \, transform matrix 2.82843 +-2.82843 2.82843 2.82843 200 200; +#X msg 48 69 stroke red \, stroke-width 2 \, fill none; +#X connect 2 0 32 0; +#X connect 4 0 27 0; +#X connect 5 0 25 0; +#X connect 7 0 26 0; +#X connect 9 0 28 0; +#X connect 11 0 29 0; +#X connect 12 0 30 0; +#X connect 13 0 31 0; #X connect 15 0 1 0; #X connect 16 0 3 0; #X connect 17 0 6 0; @@ -57,14 +57,14 @@ M -6 -10 l -6 -6 M -6 -10 l -6 6; #X connect 20 0 14 0; #X connect 22 0 21 0; #X connect 24 0 23 0; -#X connect 25 0 1 0; -#X connect 26 0 3 0; -#X connect 27 0 21 0; -#X connect 28 0 23 0; -#X connect 29 0 14 0; -#X connect 30 0 10 0; -#X connect 31 0 6 0; -#X connect 32 0 8 0; +#X connect 25 0 6 0; +#X connect 26 0 8 0; +#X connect 27 0 3 0; +#X connect 28 0 10 0; +#X connect 29 0 21 0; +#X connect 30 0 23 0; +#X connect 31 0 14 0; +#X connect 32 0 1 0; #X restore 177 100 pd arcs; #X scalar arcs 148 150 \;; #X obj 248 100 pddp/pddplink http://tclbitprint.sourceforge.net/tkpath/quartz/ diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/circlehand.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/circlehand.pd index ee6b20c66..1b7a87dac 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/circlehand.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/circlehand.pd @@ -31,9 +31,9 @@ control the frame rate using the second argument of [line].; #X text 81 383 The original is here:; #X obj 81 404 pddp/pddplink http://raphaeljs.com/hand.html; #X obj 519 113 * 90; -#X msg 594 180 stroke-width 2 \, stroke blue \, fill ""; #X msg 531 228 stroke-width 2 \, stroke blue \, stroke-opacity 0.4 -\, fill ""; +\, fill none; +#X msg 594 180 stroke-width 2 \, stroke blue \, fill none; #X connect 0 0 18 0; #X connect 5 0 14 0; #X connect 8 0 2 0; @@ -48,8 +48,8 @@ control the frame rate using the second argument of [line].; #X connect 16 0 17 0; #X connect 17 0 6 0; #X connect 18 0 10 0; -#X connect 19 0 26 0; -#X connect 20 0 27 0; +#X connect 19 0 27 0; +#X connect 20 0 26 0; #X connect 25 0 8 0; -#X connect 26 0 2 0; -#X connect 27 0 7 0; +#X connect 26 0 7 0; +#X connect 27 0 2 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/ellipses.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/ellipses.pd index 4283768fc..a52d18bc3 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/ellipses.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/ellipses.pd @@ -30,8 +30,8 @@ #X msg 344 593 fill blue; #X msg 344 533 fill green; #X msg 344 473 fill red; -#X msg 344 413 fill "" \, stroke black; -#X msg 344 293 stroke #999999 \, fill ""; +#X msg 344 293 stroke #999999 \, fill none; +#X msg 344 413 fill none \, stroke black; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 3 0 4 0; @@ -40,15 +40,15 @@ #X connect 7 0 8 0; #X connect 9 0 10 0; #X connect 10 0 11 0; -#X connect 12 0 31 0; +#X connect 12 0 30 0; #X connect 14 0 16 0; #X connect 16 0 15 0; -#X connect 17 0 30 0; +#X connect 17 0 31 0; #X connect 19 0 29 0; #X connect 21 0 28 0; #X connect 23 0 27 0; #X connect 27 0 24 0; #X connect 28 0 22 0; #X connect 29 0 20 0; -#X connect 30 0 18 0; -#X connect 31 0 13 0; +#X connect 30 0 13 0; +#X connect 31 0 18 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/lines.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/lines.pd index 4205be616..c51383b74 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/lines.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/lines.pd @@ -7,7 +7,6 @@ #X obj 415 124 loadbang; #X msg 415 145 stroke blue; #X obj 415 166 draw line 200 20 260 20; -#X msg 415 75; #X obj 415 194 loadbang; #X msg 415 215 stroke green; #X obj 415 236 draw line 20 30 180 30; @@ -44,40 +43,41 @@ #X obj 614 600 draw polygon 240 250 283 275 283 325 240 350 196 325 196 275; #X msg 614 578 stroke #a19de2 \, stroke-width 6 \, fill #d6d6ff; -#X msg 614 419 stroke gray50 \, stroke-width 4 \, fill gray80; #X text 342 307 polygon; #X text 342 167 polyline; #X text 342 37 line; #X text 93 432 Port of tkpath demo of lines:; #X obj 93 453 pddp/pddplink http://tclbitprint.sourceforge.net/tkpath/quartz/ ; -#X msg 614 259 fill "" \, stroke black; -#X msg 614 349 stroke gray50 \, stroke-width 4 \, fill ""; -#X connect 1 0 7 0; +#X msg 614 258 fill none \, stroke black; +#X msg 614 419 stroke gray \, stroke-width 4 \, fill lightgray; +#X msg 614 349 stroke gray \, stroke-width 4 \, fill none; +#X msg 415 75 stroke black; +#X connect 1 0 48 0; #X connect 4 0 5 0; #X connect 5 0 6 0; -#X connect 7 0 2 0; +#X connect 7 0 8 0; #X connect 8 0 9 0; -#X connect 9 0 10 0; +#X connect 10 0 11 0; #X connect 11 0 12 0; -#X connect 12 0 13 0; +#X connect 13 0 14 0; #X connect 14 0 15 0; -#X connect 15 0 16 0; -#X connect 17 0 19 0; -#X connect 19 0 18 0; -#X connect 20 0 22 0; -#X connect 22 0 21 0; +#X connect 16 0 18 0; +#X connect 18 0 17 0; +#X connect 19 0 21 0; +#X connect 21 0 20 0; +#X connect 22 0 23 0; #X connect 23 0 24 0; -#X connect 24 0 25 0; +#X connect 25 0 26 0; #X connect 26 0 27 0; -#X connect 27 0 28 0; -#X connect 29 0 47 0; -#X connect 31 0 48 0; -#X connect 33 0 41 0; -#X connect 35 0 37 0; -#X connect 37 0 36 0; -#X connect 38 0 40 0; -#X connect 40 0 39 0; -#X connect 41 0 34 0; -#X connect 47 0 30 0; -#X connect 48 0 32 0; +#X connect 28 0 45 0; +#X connect 30 0 47 0; +#X connect 32 0 46 0; +#X connect 34 0 36 0; +#X connect 36 0 35 0; +#X connect 37 0 39 0; +#X connect 39 0 38 0; +#X connect 45 0 29 0; +#X connect 46 0 33 0; +#X connect 47 0 31 0; +#X connect 48 0 2 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/objects.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/objects.pd index 95626425c..cf7a1a2fc 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/objects.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/objects.pd @@ -4,9 +4,9 @@ #X obj 600 124 pointer; #X floatatom 427 138 5 0 0 0 - - -, f 5; #X floatatom 553 136 5 0 0 0 - - -, f 5; -#X scalar instance-attr 81 355 12 \;; +#X scalar instance-attr 81 355 23 \;; #X obj 159 109 draw path M 0 0 l 100 0 0 -100; -#X scalar instance-attr 328 421 -18 \;; +#X scalar instance-attr 328 421 -31 \;; #X obj 159 59 loadbang; #X obj 466 83 loadbang; #X obj 600 83 loadbang; @@ -22,7 +22,7 @@ you have to choose a variable name that isn't a drawing command (M #X msg 466 103 traverse ob \, next; #X msg 600 103 traverse ob \, next \, next; #X obj 466 32 namecanvas ob; -#X msg 159 84 transform rotate a \, fill "" \, stroke black; +#X msg 159 83 transform rotate a \, fill none \, stroke black; #X connect 0 0 13 1; #X connect 1 0 14 1; #X connect 2 0 13 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/polar-clock.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/polar-clock.pd index aaaa25d1d..908b227f6 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/polar-clock.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/polar-clock.pd @@ -1,13 +1,14 @@ #N struct polar-clock float x float y float ax float ay float flag float xloc float yloc float mx float my float r; #N canvas 0 19 1062 664 10; -#X scalar polar-clock 281 372 -98.6294 -83.8256 1 0 0 50 -150 200 \; +#X scalar polar-clock 281 372 -111.804 -67.5566 1 0 0 50 -150 200 \; ; #X obj 137 29 struct polar-clock float x float y float ax float ay float flag float xloc float yloc float mx float my float r; #X obj 139 65 loadbang; -#X scalar polar-clock 281 372 210 50 0 0 0 50 -110 160 \;; -#X scalar polar-clock 281 372 81.0584 -65.9111 0 0 0 50 -70 120 \; +#X scalar polar-clock 281 372 -44.046 -79.4424 1 0 0 50 -110 160 \; +; +#X scalar polar-clock 281 372 -53.9232 -9.9997 1 0 0 50 -70 120 \; ; #X scalar polar-clock 281 372 33.3672 128.252 1 0 0 50 -30 80 \;; #X scalar polar-clock 281 382 84.641 30 0 0 0 50 10 40 \;; @@ -189,15 +190,15 @@ that the hypothetical textbook author is going to use your inane spec as the main (and probably _only_) reference. So take a sip of coffee \, think how much easier it is to write code for a living than loading shit into a truck \, and get to work; +#X msg 139 86 stroke-width 30 \, stroke ay ax ay \, fill none; #X msg 395 89 stroke gray \, stroke-width 5 \, stroke-dasharray 1 15 -\, stroke-linecap 1 \, stroke-opacity 0.4 \, fill ""; -#X msg 139 86 stroke-width 30 \, stroke ay ax ay \, fill ""; -#X connect 2 0 25 0; +\, stroke-linecap 1 \, stroke-opacity 0.4 \, fill none; +#X connect 2 0 24 0; #X connect 7 0 12 0; #X connect 7 1 11 0; #X connect 7 2 10 0; #X connect 7 3 9 0; #X connect 7 4 8 0; -#X connect 16 0 24 0; -#X connect 24 0 14 0; -#X connect 25 0 15 0; +#X connect 16 0 25 0; +#X connect 24 0 15 0; +#X connect 25 0 14 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd index 4be76b262..9ed8b19c7 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph.pd @@ -1,8 +1,8 @@ #N struct quick-graph float x float y float y0 float y1 float y2 float y3 float y4 float y5 float y6; #N struct hotspot float x float y float radius; -#N canvas -9 19 619 390 10; -#X scalar quick-graph 30 105 99 89 83 41 80 69 23 \;; +#N canvas 0 19 619 390 10; +#X scalar quick-graph 30 105 99 89 83 57 79 61 32 \;; #X msg 243 97 fill blue \, stroke blue \, stroke-width 2 \, fill-opacity 0.6; #X obj 24 33 struct quick-graph float x float y float y0 float y1 float @@ -74,10 +74,10 @@ y2 float y3 float y4 float y5 float y6; #X scalar hotspot 30 194 4 \;; #X scalar hotspot 50 185 4 \;; #X scalar hotspot 70 178 4 \;; -#X scalar hotspot 90 136 4 \;; -#X scalar hotspot 110 175 4 \;; -#X scalar hotspot 130 164 4 \;; -#X scalar hotspot 150 117 4 \;; +#X scalar hotspot 90 152 4 \;; +#X scalar hotspot 110 173 4 \;; +#X scalar hotspot 130 156 4 \;; +#X scalar hotspot 150 127 4 \;; #X text 241 217 Quick graph demo showing some mouseover animation. ; #X text 241 237 When you mouse over a scalar \, Pd will give you two diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph2.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph2.pd index fd33ff566..b35abb999 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph2.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/quick-graph2.pd @@ -1,7 +1,7 @@ #N struct quick-graph2 float x float y float y0 float y1 float y2 float y3 float y4 float y5 float y6; #N canvas 0 19 619 638 10; -#X scalar quick-graph2 35 123 110 84 69 92 103 99 76 \;; +#X scalar quick-graph2 35 123 98 89 72 125 58 79 109 \;; #X msg 243 97 fill blue \, stroke blue \, stroke-width 2 \, fill-opacity 0.6; #X obj 24 33 struct quick-graph2 float x float y float y0 float y1 diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/raphael-animation.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/raphael-animation.pd index f12babab4..faa7fa661 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/raphael-animation.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/raphael-animation.pd @@ -4,8 +4,6 @@ #X scalar animation 93 121 \;; #X obj 310 50 loadbang; #X obj 310 141 loadbang; -#X msg 310 162 fill #333333 \, stroke ""; -#X msg 310 71 fill #fff \, stroke "" \, fill-opacity 0.2; #X obj 310 182 draw rect -100 -100 200 200; #X obj 310 94 draw path m -10 -10 l 20 0 0 -6 10 16 -10 16 0 -6 -20 0 0 6 -10 -16 10 -16 z; @@ -38,28 +36,30 @@ for the arrow. However \, there is not currently a way to control the z order among _different_ scalars. (But within a scalar \, the stacking order of the parent drawing commands determines the stacking order of the drawings.); -#X msg 380 360 stroke-dasharray 5 2 \, stroke #fff \, stroke-opacity -0.2 \, stroke-width 2 \, fill ""; +#X msg 310 71 fill #fff \, stroke none \, fill-opacity 0.2; +#X msg 310 162 fill #333333 \, stroke none; #X msg 384 442 stroke-dasharray 5 2 \, stroke #fff \, stroke-opacity -0.2 \, stroke-width 2 \, fill ""; -#X connect 0 0 21 0; -#X connect 2 0 5 0; -#X connect 3 0 4 0; -#X connect 4 0 6 0; -#X connect 5 0 7 0; -#X connect 8 0 20 0; +0.2 \, stroke-width 2 \, fill none; +#X msg 380 360 stroke-dasharray 5 2 \, stroke #fff \, stroke-opacity +0.2 \, stroke-width 2 \, fill none; +#X connect 0 0 19 0; +#X connect 2 0 26 0; +#X connect 3 0 27 0; +#X connect 6 0 18 0; +#X connect 8 0 29 0; #X connect 10 0 28 0; -#X connect 12 0 29 0; +#X connect 12 0 13 0; +#X connect 13 0 21 0; #X connect 14 0 15 0; -#X connect 15 0 23 0; +#X connect 14 1 16 1; +#X connect 15 0 16 0; #X connect 16 0 17 0; -#X connect 16 1 18 1; -#X connect 17 0 18 0; -#X connect 18 0 19 0; -#X connect 19 0 9 0; -#X connect 20 0 9 0; -#X connect 21 0 22 0; -#X connect 22 0 14 0; -#X connect 23 0 16 0; +#X connect 17 0 7 0; +#X connect 18 0 7 0; +#X connect 19 0 20 0; +#X connect 20 0 12 0; +#X connect 21 0 14 0; +#X connect 26 0 5 0; +#X connect 27 0 4 0; #X connect 28 0 11 0; -#X connect 29 0 13 0; +#X connect 29 0 9 0; diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd index 5f7893bbe..7f418728c 100644 --- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd +++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/splines.pd @@ -1,6 +1,6 @@ #N struct splines float x float y float qmid float c1 float c2; #N canvas 480 58 700 527 10; -#X scalar splines 92 86 -6.2043 184.445 329.234 \;; +#X scalar splines 92 86 2.7957 174.445 329.234 \;; #X floatatom 311 161 5 0 0 0 - - -, f 5; #N canvas 253 138 810 446 (subpatch) 0; #X obj 129 -207 draw path M 75 qmid h 10 m -5 -5 v 10; @@ -31,10 +31,10 @@ #X obj 679 -210 draw path M 95 c2 h 10 m -5 -5 v 10; #X obj 449 -418 draw path M 20 250 L 60 c1 100 c2 140 250; #X obj 449 -351 draw path M 20 250 C 60 c1 100 c2 140 250; -#X msg 129 -441 stroke blue \, stroke-width 1 \, fill ""; -#X msg 129 -371 stroke black \, stroke-width 3 \, fill ""; -#X msg 449 -441 stroke blue \, stroke-width 1 \, fill ""; -#X msg 449 -371 stroke black \, stroke-width 3 \, fill ""; +#X msg 129 -441 stroke blue \, stroke-width 1 \, fill none; +#X msg 129 -371 stroke black \, stroke-width 3 \, fill none; +#X msg 449 -441 stroke blue \, stroke-width 1 \, fill none; +#X msg 449 -371 stroke black \, stroke-width 3 \, fill none; #X obj 129 -186 outlet; #X obj 449 -188 outlet; #X obj 679 -189 outlet; -- GitLab