[Gridflow-cvs] [svn] commit: r6405 - in /trunk/doc/flow_classes: #-help.pd #draw_slider-help.pd #expr-help.pd

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Fri Oct 8 11:54:42 EDT 2010


Author: matju
Date: Fri Oct  8 11:54:41 2010
New Revision: 6405

Log:
fix numop doc_link

Modified:
    trunk/doc/flow_classes/#-help.pd
    trunk/doc/flow_classes/#draw_slider-help.pd
    trunk/doc/flow_classes/#expr-help.pd

Modified: trunk/doc/flow_classes/#-help.pd
==============================================================================
--- trunk/doc/flow_classes/#-help.pd (original)
+++ trunk/doc/flow_classes/#-help.pd Fri Oct  8 11:54:41 2010
@@ -15,44 +15,50 @@
 #X obj 0 0 doc_h;
 #X obj 14 439 doc_cc 0;
 #X obj 3 409 doc_c 1..2;
-#X obj 3 558 doc_i 2;
-#X obj 14 588 doc_ii 0;
-#X obj 14 759 doc_oo 0;
-#X obj 14 487 doc_cc 1;
-#X obj 14 697 doc_ii 1;
-#X obj 3 729 doc_o 1;
+#X obj 3 584 doc_i 2;
+#X obj 14 614 doc_ii 0;
+#X obj 14 785 doc_oo 0;
+#X obj 14 513 doc_cc 1;
+#X obj 14 723 doc_ii 1;
+#X obj 3 755 doc_o 1;
 #X obj 97 439 doc_m c0 numop;
-#X obj 97 487 doc_m c1 grid;
-#X obj 97 588 doc_m i0 grid;
-#X obj 97 697 doc_m i1 grid;
-#X obj 97 675 doc_m i0 numop;
-#X text 232 588 on each element of this grid \, perform the operation
+#X obj 97 513 doc_m c1 grid;
+#X obj 97 614 doc_m i0 grid;
+#X obj 97 723 doc_m i1 grid;
+#X obj 97 701 doc_m i0 numop;
+#X text 232 614 on each element of this grid \, perform the operation
 together with the corresponding element of inlet 1 in the table of
 operators (at the top of this document)elements of inlet 0 are called
 "A" and elements of inlet 1are called "B". the resulting grid is the
 same size as theone in inlet 0;
-#X obj 232 697 doc_same 1;
-#X obj 232 675 doc_same 0;
-#X obj 97 759 doc_m o0 grid;
-#X text 232 487 any grid \, preferably shaped like the one that will
+#X obj 232 723 doc_same 1;
+#X obj 232 701 doc_same 0;
+#X obj 97 785 doc_m o0 grid;
+#X text 232 513 any grid \, preferably shaped like the one that will
 be put in the left inlet \, or like a subpart of it (anyway the contents
 will be redim'ed on-the-fly to fit the grid of inlet-0 \, but the stored
 grid will not be modified itself);
-#X obj 0 811 doc_f;
-#X obj 56 100 ../numop;
-#X obj 232 461 doc_link numop;
-#X obj 3 791 doc_also;
+#X obj 0 837 doc_f;
+#X obj 3 817 doc_also;
 #X text 232 439 pick a way to combine the numbers. (default: ignore)
 ;
+#X obj 232 461 doc_link numop1 1;
+#X obj 232 487 doc_link numop2 1;
+#X text 295 461 (only left inlet is used);
+#X text 296 488 (use both inlets \, or pretend to);
+#X obj 56 100 ../numop1;
+#X obj 76 120 ../numop2;
 #X connect 0 0 5 0;
 #X connect 1 0 5 1;
 #X connect 5 0 8 0;
 #X connect 8 0 7 0;
 #X connect 8 1 6 0;
+#X connect 22 1 34 0;
+#X connect 22 1 35 0;
 #X connect 22 1 36 0;
-#X connect 22 1 34 0;
 #X connect 23 1 31 0;
 #X connect 24 1 27 0;
 #X connect 25 1 28 0;
 #X connect 26 1 29 0;
-#X connect 33 0 5 0;
+#X connect 39 0 5 0;
+#X connect 40 0 5 0;

Modified: trunk/doc/flow_classes/#draw_slider-help.pd
==============================================================================
--- trunk/doc/flow_classes/#draw_slider-help.pd (original)
+++ trunk/doc/flow_classes/#draw_slider-help.pd Fri Oct  8 11:54:41 2010
@@ -47,7 +47,7 @@
 #X text 5 25 Draws a slider-like rectangle (or progress bar) on an
 image.;
 #X text 232 253 composition mode;
-#X obj 232 275 doc_link numop 1;
+#X obj 232 275 doc_link numop2 1;
 #X text 232 301 rgb fill colour;
 #X text 232 323 rgb outline colour;
 #X text 232 345 (y1 x1 y2 x2) position;

Modified: trunk/doc/flow_classes/#expr-help.pd
==============================================================================
--- trunk/doc/flow_classes/#expr-help.pd (original)
+++ trunk/doc/flow_classes/#expr-help.pd Fri Oct  8 11:54:41 2010
@@ -1,19 +1,19 @@
 #N canvas 467 24 632 642 10;
 #X obj 0 0 doc_h;
-#X obj 3 685 doc_also;
-#X obj 0 705 doc_f;
-#X obj 3 425 doc_c 1..;
-#X obj 14 455 doc_cc any;
-#X obj 97 455 doc_m cany <atom>;
-#X text 232 455 floats and symbols (and commas and semicolons) that
+#X obj 3 796 doc_also;
+#X obj 0 816 doc_f;
+#X obj 3 505 doc_c 1..;
+#X obj 14 535 doc_cc any;
+#X obj 97 535 doc_m cany <atom>;
+#X text 232 535 floats and symbols (and commas and semicolons) that
 will be joined together to form a string which will be interpreted
 in a manner quite similar to what [expr] does.;
-#X obj 14 543 doc_ii 0;
-#X obj 97 543 doc_m i0 bang;
-#X text 232 543 evaluate expression and output result.;
-#X obj 103 685 expr;
-#X obj 139 685 expr~;
-#X obj 181 685 fexpr~;
+#X obj 14 623 doc_ii 0;
+#X obj 97 623 doc_m i0 bang;
+#X text 232 623 evaluate expression and output result.;
+#X obj 103 796 expr;
+#X obj 139 796 expr~;
+#X obj 181 796 fexpr~;
 #X obj 98 43 #expr;
 #X text 135 43 computes the result of the formula(s) you write in it.
 ;
@@ -29,34 +29,41 @@
 like [%].;
 #X text 96 188 it supports $f1 \, $f2 \, $f3 \, etc.;
 #X text 96 203 it does not support $s1 \, $v1 \, etc.;
-#X obj 3 513 doc_i 1..;
-#X obj 97 565 doc_m i0 float;
-#X text 232 565 set value of $f1 and then do like bang.;
-#X obj 14 546 doc_ii other;
-#X obj 97 545 doc_m iother float;
-#X text 232 545 set value of any other $f variable \, such as $f2 \,
+#X obj 3 593 doc_i 1..;
+#X obj 97 645 doc_m i0 float;
+#X text 232 645 set value of $f1 and then do like bang.;
+#X obj 14 623 doc_ii other;
+#X obj 97 672 doc_m iother float;
+#X text 232 672 set value of any other $f variable \, such as $f2 \,
 $f3 \, etc. \; for example \, a float into inlet 6 will set $f7.;
-#X obj 3 597 doc_o 1..;
-#X obj 14 627 doc_oo any;
-#X obj 97 627 doc_m oany float;
-#X text 232 627 the results \, output from right to left \, even though
+#X obj 3 708 doc_o 1..;
+#X obj 14 738 doc_oo any;
+#X obj 97 738 doc_m oany float;
+#X text 232 738 the results \, output from right to left \, even though
 they get computed left-to-right. [#expr] makes a list of the results
 and then outputs it in reverse order.;
-#X text 120 248 [#expr rand($f1)] is the same as [expr random(0 \,
+#X text 120 268 [#expr rand($f1)] is the same as [expr random(0 \,
 $f1)];
+#X text 96 289 it supports some functions that have two arguments \,
+which are the following : min max div rem cmp hypot atan2 avg;
+#X text 119 320 [#expr avg($f1 \, $f2)] = [expr ($f1+$f2)/2];
+#X text 119 336 [#expr hypot($f1 \, $f2)] = [expr sqrt($f1*$f1+$f2*$f2)]
+;
+#X text 119 352 [#expr cmp($f1 \, $f2)] = [expr if($f1<$f2 \, -1 \,
+$f1>$f2)];
+#X text 119 368 [#expr rem($f1 \, $f2)] = [expr $f1 % $f2];
+#X text 122 383 ...;
+#X text 97 401 it supports table lookup but only with a constant table
+name (no $s1);
 #X text 96 219 it supports some functions that have a single argument
-\, which are the following : sin cos exp log tanh sqrt abs rand;
-#X text 96 269 it supports some functions that have two arguments \,
-which are the following : min max div rem cmp hypot atan2 avg;
-#X text 119 300 [#expr avg($f1 \, $f2)] = [expr ($f1+$f2)/2];
-#X text 119 316 [#expr hypot($f1 \, $f2)] = [expr sqrt($f1*$f1+$f2*$f2)]
-;
-#X text 119 332 [#expr cmp($f1 \, $f2)] = [expr if($f1<$f2 \, -1 \,
-$f1>$f2)];
-#X text 119 348 [#expr rem($f1 \, $f2)] = [expr $f1 % $f2];
-#X text 122 363 ...;
-#X text 97 381 it supports table lookup but only with a constant table
-name (no $s1);
+\, which are the following : sin cos tan sinh cosh tanh exp log sqrt
+abs rand;
+#X text 95 432 all supported functions are listed over there :;
+#X obj 129 455 doc_link numop1 1;
+#X obj 129 477 doc_link numop2 1;
+#X text 206 476 those that have two arguments: blah($f1 \, $f2);
+#X text 392 458 blah($f1);
+#X text 208 457 those that have one argument:;
 #X connect 1 1 10 0;
 #X connect 1 1 11 0;
 #X connect 1 1 12 0;



More information about the Gridflow-cvs mailing list