* Bug 6155 fixed: param3d() & param3d1() pages merged & rewritten 19/19719/7
Samuel GOUGEON [Fri, 2 Feb 2018 00:27:24 +0000 (01:27 +0100)]
  http://bugzilla.scilab.org/6155
  PDF version: http://bugzilla.scilab.org/attachment.cgi?id=4621

  Both examples are also changed for more demonstrative versions.

Change-Id: I79dc365cd86568ba07aaa894fca04d782c33c6d5

15 files changed:
scilab/CHANGES.md
scilab/modules/graphics/help/en_US/3d_plot/param3d.xml
scilab/modules/graphics/help/en_US/3d_plot/param3d1.xml [deleted file]
scilab/modules/graphics/help/ja_JP/3d_plot/param3d.xml [deleted file]
scilab/modules/graphics/help/ja_JP/3d_plot/param3d1.xml [deleted file]
scilab/modules/graphics/help/pt_BR/3d_plot/param3d.xml [deleted file]
scilab/modules/graphics/help/pt_BR/3d_plot/param3d1.xml [deleted file]
scilab/modules/graphics/macros/%_param3d.sci
scilab/modules/graphics/macros/%_param3d1.sci
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/param3d1_1.png [deleted file]
scilab/modules/helptools/images/param3d_1.png
scilab/modules/helptools/images/param3d_2.png [new file with mode: 0644]
scilab/modules/helptools/images/param3d_3.png [new file with mode: 0644]
scilab/modules/helptools/images/param3d_4.png [new file with mode: 0644]

index d9aa1c9..bd0e3ce 100644 (file)
@@ -233,7 +233,7 @@ Help pages:
 * rewritten: `consolebox`, `double`, `isoview`, `pixel_drawing_mode`, `householder`, `or`, `|,||`,
  `and`, `&,&&`, `format`, `type`, `typeof`, `brackets`, `setlanguage`, `sleep`, `isinf`, `unique`,
  `bitor`, `bitxor`, `bitand`, `macr2tree`, `geomean`, `clf`, `getPreferencesValue`, `gcd`, `isglobal`,
- `whereis`, `mode`, `%onprompt`, `toeplitz`
+ `whereis`, `mode`, `%onprompt`, `toeplitz`, `param3d`, `param3d1`
 * reorganized:
   - `else`, `elseif`, `end`, `try`, `sciargs`, `global`, `halt`, `empty`, `power`, `numderivative`
   - `pixel_drawing_mode`, `show_window`, `twinkle`, `uigetcolor`, `winsid`, `xdel`, `xgrid`, `xname`, `xnumb`
@@ -368,6 +368,7 @@ Known issues
 * [#5381](http://bugzilla.scilab.org/show_bug.cgi?id=5381): For UTF-8 inputs, `msprintf`, `mprintf` and `mfprintf` shortened the output.
 * [#5602](http://bugzilla.scilab.org/show_bug.cgi?id=5602): Assigning a component of a list in a cells array replaced the whole list.
 * [#5611](http://bugzilla.scilab.org/show_bug.cgi?id=5611): It was not possible to delete the row or column of a cells array.
+* [#6155](http://bugzilla.scilab.org/show_bug.cgi?id=6155): Pages of `param3d()` and `param3d1()` deserved being fixed, improved and merged in a single page.
 * [#6607](http://bugzilla.scilab.org/show_bug.cgi?id=6607): `clear S; S(1:2,1:3).a = 1` yielded an error.
 * [#6608](http://bugzilla.scilab.org/show_bug.cgi?id=6608): Field and data insertion in an array of structures might fail.
 * [#6813](http://bugzilla.scilab.org/show_bug.cgi?id=6813): `makecell` used to create a N>2-D hyperarray yielded an error.
index fab58fb..c32f43d 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) ENPC - Jean-Philippe Chancelier
+ * Copyright (C) 2018 - Samuel GOUGEON
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:id="param3d" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org"  xml:id="param3d" xml:lang="en">
     <refnamediv>
         <refname>param3d</refname>
-        <refpurpose>3D plot of a parametric curve</refpurpose>
+        <refpurpose>plots a single curve in a 3D cartesian frame</refpurpose>
+    </refnamediv>
+    <refnamediv xml:id="param3d1">
+        <refname>param3d1</refname>
+        <refpurpose>plots a set of curves in a 3D cartesian frame. 1D mesh plot</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>param3d(x,y,z,[theta,alpha,leg,flag,ebox])</synopsis>
+        <synopsis>
+            param3d(x, y, z)
+            param3d(x, y, z, [theta, alpha, leg, flag, ebox])
+            param3d   // demo
+
+            param3d1(X, Y, Z)
+            param3d1(X, Y, list(Z, styles))
+            param3d1(.., [theta, alpha, leg, flag, ebox])
+            param3d1  // demo
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>x,y,z</term>
+                <term>x, y, z</term>
+                <listitem>
+                    <para>3 vectors of the same length: cartesian coordinates of the curve's points.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>X, Y, Z</term>
+                <listitem>
+                    <para>matrices of the same size (nl,nc).
+                     Each column #i of the matrices provides the coordinates of the points for the
+                     ith curve.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>styles</term>
+                <listitem>
+                    <para>
+                        vector of nc=size(Z,"c") integers specifying the style -- line color or mark
+                        style -- of each curve. When it is specified, it must be bundled with
+                        <varname>Z</varname> into a list, using <literal>list(Z, styles)</literal>.
+                    </para>
+                    <para>
+                        By default, lines are drawn with colors indexed from 1 to nc in the current
+                        color map, without mark.
+                    </para>
+                    <para>
+                        If <literal>styles(i)&lt;0</literal>, the curve #i is plotted only with
+                        marks of style #|styles(i)|, without line.
+                    </para>
+                    <para>
+                        Otherwise (<literal>styles(i)>0</literal>), the curve #i is rendered as a
+                        solid line of color #styles(i), without marks.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>theta</term>
                 <listitem>
-                    <para>three vectors of the same size (points of the parametric
-                        curve).
+                    <para>Polar angle of the (OP) observation point to the north pole (Oz+), in degrees,
+                        from 0 to 180. Default = 35°.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>theta, alpha</term>
+                <term>alpha</term>
                 <listitem>
-                    <para>real values giving in degree the spherical coordinates of the
-                        observation point. <emphasis>The default values are 35 and 45
-                            degree.
-                        </emphasis>
+                    <para>
+                        Azimuth angle of the (OP) observation point, around the (OZ+) axis,
+                        in degrees. Default = 45°.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>leg</term>
                 <listitem>
-                    <para>string defining the labels for each axis with @ as a field
-                        separator, for example "X@Y@Z".
+                    <para>single string setting the labels for the 3 axes. "@" is used as a labels
+                        separator. Default = "X@Y@Z"
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>flag=[type,box]</term>
+                <term>flag = [type, box]</term>
                 <listitem>
                     <para>
                         <literal>type</literal> and <literal>box</literal> have the
                         <varlistentry>
                             <term>type</term>
                             <listitem>
-                                <para>an integer (scaling).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>type=0</term>
-                                        <listitem>
-                                            <para>the plot is made using the current 3D scaling (set
-                                                by a previous call to <literal>param3d</literal>,
-                                                <literal>plot3d</literal>, <literal>contour</literal> or
-                                                <literal>plot3d1</literal>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=1</term>
-                                        <listitem>
-                                            <para>rescales automatically 3d boxes with extreme
-                                                aspect ratios, the boundaries are specified by the value
-                                                of the optional argument <literal>ebox</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=2</term>
-                                        <listitem>
-                                            <para>rescales automatically 3d boxes with extreme
-                                                aspect ratios, the boundaries are computed using the
-                                                given data. <emphasis>This is the default
-                                                    value.
-                                                </emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=3</term>
-                                        <listitem>
-                                            <para>3d isometric with box bounds given by optional
-                                                <literal>ebox</literal>, similarily to
-                                                <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=4</term>
-                                        <listitem>
-                                            <para>3d isometric bounds derived from the data,
-                                                similarily<literal> to type=2</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=5</term>
-                                        <listitem>
-                                            <para>3d expanded isometric bounds with box bounds given
-                                                by optional <literal>ebox</literal>, similarily to
-                                                <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=6</term>
-                                        <listitem>
-                                            <para>3d expanded isometric bounds derived from the
-                                                data, similarily to <literal>type=2</literal>.Note that
-                                                axes boundaries can be customized through the axes
-                                                entity properties (see <link linkend="axes_properties">axes_properties</link>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
+                                <para>Sets the axes scaling and bounding modes. Default = 2.</para>
+                                <para>
+                                <table border="1">
+                                <tr>
+                                    <th>type</th>
+                                    <th>gca().isoview</th>
+                                    <th>data bounds</th>
+                                </tr>
+                                <tr>
+                                    <th>0</th>
+                                    <td  align="center">off</td>
+                                    <td  align="center">[0,1, 0,1, -1,1]</td>
+                                </tr>
+                                <tr>
+                                    <th>1</th>
+                                    <td  align="center">off</td>
+                                    <td  align="center">in <literal>ebox</literal></td>
+                                </tr>
+                                <tr>
+                                    <th>2</th>
+                                    <td  align="center">off</td>
+                                    <td  align="center">from data points</td>
+                                </tr>
+                                <tr>
+                                    <th>3</th>
+                                    <td  align="center">on</td>
+                                    <td  align="center">in <literal>ebox</literal></td>
+                                </tr>
+                                <tr>
+                                    <th>4</th>
+                                    <td  align="center">on</td>
+                                    <td  align="center">from data points</td>
+                                </tr>
+                                <tr>
+                                    <th>5</th>
+                                    <td  align="center">on</td>
+                                    <td  align="center">in <literal>ebox</literal></td>
+                                </tr>
+                                <tr>
+                                    <th>6</th>
+                                    <td  align="center">on</td>
+                                    <td  align="center">from data points</td>
+                                </tr>
+                                </table>
+                                </para>
+                                                               <note>
+                                                                       Isometrical modes are rendered with <literal>gca().cube_scaling="off"</literal>.
+                                                               </note>
                             </listitem>
                         </varlistentry>
                         <varlistentry>
                             <term>box</term>
                             <listitem>
-                                <para>an integer (frame around the plot).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>box=0</term>
-                                        <listitem>
-                                            <para>nothing is drawn around the plot.</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=1</term>
-                                        <listitem>
-                                            <para>unimplemented (like box=0).</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=2</term>
-                                        <listitem>
-                                            <para>only the axes behind the surface are drawn.</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=3</term>
-                                        <listitem>
-                                            <para>a box surrounding the surface is drawn and
-                                                captions are added.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=4</term>
-                                        <listitem>
-                                            <para>a box surrounding the surface is drawn, captions
-                                                and axes are added.Note that axes aspect can also be
-                                                customized through the axes entity properties (see <link linkend="axes_properties">axes_properties</link>).
-                                                <emphasis>This is the default value.</emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
+                                <para>
+                                    an integer controlling the display of the axes frame (default = 4).
+                                </para>
+                                <para>
+                                    <table border="1">
+                                        <tr>
+                                            <th>Value</th>
+                                            <th>Displayed axes</th>
+                                            <th>Axes legends</th>
+                                            <th>gca().box</th>
+                                            <th>gca().axes_visible</th>
+                                        </tr>
+                                        <tr>
+                                            <th>0</th>
+                                            <td>none. No frame.</td>
+                                            <td align="center">yes</td>
+                                            <td align="center">"off"</td>
+                                            <td align="center">"off"</td>
+                                        </tr>
+                                        <tr>
+                                            <th>1</th>
+                                            <td>not implemented. Like 0. Please use 0.</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
+                                        <tr>
+                                            <th>2</th>
+                                            <td>only axes lines on the back</td>
+                                            <td align="center">NO</td>
+                                            <td align="center">"hidden_axes"</td>
+                                            <td align="center">"off"</td>
+                                        </tr>
+                                        <tr>
+                                            <th>3</th>
+                                            <td>full ungraduated box</td>
+                                            <td align="center">yes</td>
+                                            <td align="center">"on"</td>
+                                            <td align="center">"off"</td>
+                                        </tr>
+                                        <tr>
+                                            <th>4</th>
+                                            <td>full box + 3 graduated axes</td>
+                                            <td align="center">yes</td>
+                                            <td align="center">"on"</td>
+                                            <td align="center">"on"</td>
+                                        </tr>
+                                    </table>
+                                </para>
                             </listitem>
                         </varlistentry>
                     </variablelist>
             <varlistentry>
                 <term>ebox</term>
                 <listitem>
-                    <para>It specifies the boundaries of the plot as the vector
-                        <literal>[xmin,xmax,ymin,ymax,zmin,zmax]</literal>. This argument is
-                        used together with <literal>type</literal> in
-                        <literal>flag</literal> : if it is set to <literal>1</literal>,
-                        <literal>3</literal> or <literal>5</literal> (see above to see the
-                        corresponding behaviour). If <literal>flag</literal> is missing,
-                        <literal>ebox</literal> is not taken into account. Note that, when
-                        specified, the <literal>ebox</literal> argument acts on the
-                        <literal>data_bounds</literal> field that can also be reset through
-                        the axes entity properties (see <link linkend="axes_properties">axes_properties</link>). The ebox default
-                        value is [0,1,0,1,0,1].
+                    <para>
+                        Vector <literal>[xmin,xmax, ymin,ymax, zmin,zmax]</literal> of axes bounds,
+                        used and assigned to <literal>gca().data_bounds</literal> when the
+                        <varname>flag</varname> option is used with the <varname>type</varname>=1|3|5.
+                        By default set to [0,1, 0,1, 0,1].
                     </para>
                 </listitem>
             </varlistentry>
     <refsection>
         <title>Description</title>
         <para>
-            <literal>param3d</literal> is used to plot a 3D curve defined by its
-            coordinates <literal>x</literal>, <literal>y</literal> and
-            <literal>z</literal>. Note that data can also be got or modified through
-            the surface entity properties (see <link linkend="surface_properties">surface_properties</link>).
+            <literal>param3d()</literal> is used to plot a single 3D curve defined by its coordinates
+            <literal>x</literal>, <literal>y</literal> and <literal>z</literal>.
         </para>
         <para>
-            Note that properties like <literal>rotation angles</literal>,
-            <literal>colors</literal> and <literal>thickness</literal> of the plotted
-            curves can also be got or modified through the polyline entity properties
-            (see <link linkend="polyline_properties">polyline_properties</link>).
+            The curve is an object of <literal>polyline</literal> type. When it is used just after
+            <literal>param3d()</literal>, <function>gce</function>() returns the curve's identifier,
+            from which all the curve's properties may be changed: color, line style, thickness,
+            mark style and colors, etc.
         </para>
         <para>
-            Use <literal>param3d1</literal> to do multiple plots.
-        </para>
-        <para>
-            Enter the command <literal>param3d()</literal> to see a demo.
+            <literal>param3d1()</literal> is used to plot a set of 3D curves, all having the
+            same number of points. Then, <function>gce</function><literal>().children</literal>
+            returns the vector of identifiers of the whole set of curves.
+            <note>
+                The graphical identifier of the curve #i is <literal>gce().children($-i+1)</literal>.
+            </note>
         </para>
     </refsection>
 
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-t=0:0.1:5*%pi;
-param3d(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,3])
+t = 0:0.1:5*%pi;
+r = (max(t)-t)/10;
+
+clf
+param3d(r.*sin(t), r.*cos(t), t/10, 30, 72,"X@Y@Z",[4,4])
+
+curve = gce();
+curve.mark_mode = "on";
+curve.mark_style = 10;
+curve.mark_foreground = color("magenta");
+ ]]></programlisting>
+        <scilab:image>
+        t =  0:0.1:5*%pi;
+        r = (max(t)-t)/10;
+        clf
+        param3d(r.*sin(t), r.*cos(t), t/10, 30, 72,"X@Y@Z",[4,4])
+
+        curve = gce();
+        curve.mark_mode = "on";
+        curve.mark_style = 10;
+        curve.mark_foreground = color("magenta");
+        // ----------------------------
+        gca().sub_ticks = [4 4 4];
+        gcf().axes_size = [620 410];
+        </scilab:image>
+        <para/>
+        <para>
+            <emphasis role="bold">box parameter </emphasis> illustrated with
+            <emphasis role="bold">param3d1()</emphasis> used for a single curve :
+        </para>
+        <programlisting role="example"><![CDATA[
+t = (0:0.1:5*%pi)';
+r = (max(t)-t)/10;
+x = r.*sin(t); y = r.*cos(t); z = list(t/10, color("orange"));
+Box = [0 2 3 4];
+
+clf
+for i = 1:4
+   subplot(2,2,i)
+   param3d1(x, y, z, 31, 72,"X legend@Y legend@Z legend",[4, Box(i)])
+   title(msprintf("box = %d",Box(i)), "fontsize", 4)
+end
+gcf().children.children.thickness = 2; // for the 4 curves in a once
+gca().sub_ticks = [4 4 4];             // only for the last axes
+ ]]></programlisting>
+        <scilab:image>
+t = (0:0.1:5*%pi)';
+r = (max(t)-t)/10;
+x = r.*sin(t); y = r.*cos(t); z = list(t/10, color("orange"));
+Box = [0 2 3 4];
+clf
+for i = 1:4
+   subplot(2,2,i)
+   param3d1(x, y, z, 31, 72,"X legend@Y legend@Z legend",[4, Box(i)])
+   title(msprintf("box = %d",Box(i)), "fontsize", 4)
+end
+gcf().children.children.thickness = 2;
+// -------------------
+gcf().axes_size = [820 470];
+gca().sub_ticks = [4 4 4];
+        </scilab:image>
+        <para/>
+        <para>
+            <emphasis role="bold">param3d1() used for an actual set of curves:</emphasis>
+        </para>
+        <programlisting role="example"><![CDATA[
+[X, Y] = ndgrid(-11:0.5:9);
+R = sqrt(X.*X + Y.*Y) + %eps;
+Z = sin(R)./R;
+
+clf
+subplot(1,3,1)
+param3d1(X, Y, Z, 150, 85, flag=[2,4])
+
+subplot(1,3,2)
+param3d1(X, Y, Z, 150, 85, flag=[2,4])
+gce().children.foreground = color("green");
+
+subplot(1,3,3)
+param3d1(X, Y, Z, 150, 85, flag=[2,4])
+curves = gce().children;
+curves(1:2:$).foreground = color("orange");
+gca().box = "back_half";
+
+gcf().children.foreground = color("grey70"); // box & ticks color for the 3 figures
+ ]]></programlisting>
+        <scilab:image>
+        [X, Y] = ndgrid(-11:0.5:9);
+        R = sqrt(X.*X + Y.*Y) + %eps;
+        Z = sin(R)./R;
+
+        clf
+        subplot(1,3,1)
+        param3d1(X, Y, Z, 150, 85, flag=[2,4])
+
+        subplot(1,3,2)
+        param3d1(X, Y, Z, 150, 85, flag=[2,4])
+        gce().children.foreground = color("green");
+
+        subplot(1,3,3)
+        param3d1(X, Y, Z, 150, 85, flag=[2,4])
+        curves = gce().children;
+        curves(1:2:$).foreground = color("orange");
+        gca().box = "back_half";
+
+        gcf().children.foreground = color("grey70"); // box and ticks color for the 3 figures
+        // ----------
+        gcf().children.sub_ticks = [4 4 4];
+        gcf().axes_size = [940 350];
+        </scilab:image>
+        <para/>
+        <programlisting role="example"><![CDATA[
+[X, Y] = ndgrid(-11:0.5:9, -7:0.5:6); // x is the long side, y the short one
+// => X has constant rows. Y has constant columns
 
-e=gce() //the handle on the 3D polyline
+clf
 
-e.foreground=color('red');
+// Meshing lines at constant Y values
+subplot(1, 3, 1)
+R = sqrt(X.*X + Y.*Y) + %eps;
+Z = sin(R)./R;
+param3d1(X, Y, Z, 150, 85, flag=[2,4])
 
-a=gca(); //the handle on the axes
-a.rotation_angles=[10 70];
+// Meshing lines at constant X values, with transposed X and Y:
+subplot(1, 3, 2)
+R = sqrt(X'.*X' + Y'.*Y') + %eps;
+Z = sin(R)./R;
+param3d1(X', Y', Z, 150, 85, flag=[2,4])
+
+// With a curtain and filled curves to avoid messed overlaying parts
+subplot(1, 3, 3)
+[Xo, Yo] = ndgrid(-10:0.5:10);
+R = sqrt(Xo.*Xo + Yo.*Yo) + %eps;
+Zo = sin(R)./R;
+    // we add the curtain on starting and ending sides
+nc = size(Xo,"c");
+zmin = min(Zo);
+X = [Xo(1,:) ; Xo ; Xo($,:)];
+Y = [Yo(1,:) ; Yo ; Yo($,:)];
+Z = [zmin*ones(1,nc) ; Zo ; zmin*ones(1,nc)];
+    // Rendering
+param3d1(X, Y, Z, 150, 85, flag=[2,4])
+e = gce();
+e.children.fill_mode = "on";
+
+// grey box for all axes:
+gcf().children.foreground = color("grey70");
  ]]></programlisting>
         <scilab:image>
-            t=0:0.1:5*%pi;
-            param3d(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,3])
+               [X, Y] = ndgrid(-11:0.5:9, -7:0.5:6); // x is the long side, y the short one
+               // => X has constant rows. Y has constant columns
+
+               clf
+
+               // Meshing lines at constant Y values
+               subplot(1, 3, 1)
+               R = sqrt(X.*X + Y.*Y) + %eps;
+               Z = sin(R)./R;
+               param3d1(X, Y, Z, 150, 85, flag=[2,4])
 
-            e=gce() //the handle on the 3D polyline
+               // Meshing lines at constant X values, with transposed X and Y:
+               subplot(1, 3, 2)
+               R = sqrt(X'.*X' + Y'.*Y') + %eps;
+               Z = sin(R)./R;
+               param3d1(X', Y', Z, 150, 85, flag=[2,4])
 
-            e.foreground=color('red');
+               // With a curtain and filled curves to avoid messed overlaying parts
+               subplot(1, 3, 3)
+               [Xo, Yo] = ndgrid(-10:0.5:10);
+               R = sqrt(Xo.*Xo + Yo.*Yo) + %eps;
+               Zo = sin(R)./R;
+                       // we add the curtain on starting and ending sides
+               nc = size(Xo,"c");
+               zmin = min(Zo);
+               X = [Xo(1,:) ; Xo ; Xo($,:)];
+               Y = [Yo(1,:) ; Yo ; Yo($,:)];
+               Z = [zmin*ones(1,nc) ; Zo ; zmin*ones(1,nc)];
+                       // Rendering
+               param3d1(X, Y, Z, 150, 87, flag=[2,4])
+               e = gce();
+               e.children.fill_mode = "on";
 
-            a=gca(); //the handle on the axes
-            a.rotation_angles=[10 70];
+               // grey box for all axes:
+               gcf().children.foreground = color("grey70");
+        // ----------------------------
+        gcf().axes_size = [900 260];
         </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="param3d1">param3d1</link>
+                <link linkend="plot3d">plot3d</link>
             </member>
             <member>
-                <link linkend="plot3d">plot3d</link>
+                <link linkend="plot3d3">plot3d3</link>
+            </member>
+            <member>
+                <link linkend="scatter3">scatter 3D</link>
+            </member>
+            <member>
+                <link linkend="axes_properties">axes_properties</link>
+            </member>
+            <member>
+                <link linkend="polyline_properties">polyline_properties</link>
             </member>
         </simplelist>
     </refsection>
diff --git a/scilab/modules/graphics/help/en_US/3d_plot/param3d1.xml b/scilab/modules/graphics/help/en_US/3d_plot/param3d1.xml
deleted file mode 100644 (file)
index 4c66fa9..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) ENPC - Jean-Philippe Chancelier
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:id="param3d1" xml:lang="en">
-    <refnamediv>
-        <refname>param3d1</refname>
-        <refpurpose>3D plot of parametric curves</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>param3d1(x,y,z,[theta,alpha,leg,flag,ebox])
-            param3d1(x,y,list(z,colors),[theta,alpha,leg,flag,ebox])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y,z</term>
-                <listitem>
-                    <para>matrices of the same size (nl,nc).</para>
-                    <para>Each column i of the matrices corresponds to the coordinates
-                        of the ith curve. You can give a specific color for each curve by
-                        using <literal>list(z,colors)</literal> instead of
-                        <literal>z</literal>, where <literal>colors</literal> is a vector of
-                        size <literal>nc</literal>. If <literal>color(i)</literal> is
-                        negative the curve is plotted using the mark with id
-                        <literal>abs(style(i))</literal>; if <literal>style(i)</literal> is
-                        strictly positive, a plain line with color id
-                        <literal>style(i)</literal> or a dashed line with dash id
-                        <literal>style(i)</literal> is used.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>theta,alpha</term>
-                <listitem>
-                    <para>real values giving in degree the spherical coordinates of the
-                        observation point. <emphasis>The default values are 35 and 45
-                            degree.
-                        </emphasis>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>leg</term>
-                <listitem>
-                    <para>string defining the captions for each axis with @ as a field
-                        separator, for example "X@Y@Z".
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flag=[type,box]</term>
-                <listitem>
-                    <para>
-                        <literal>type</literal> and <literal>box</literal> have the
-                        same meaning as in <literal>plot3d</literal>:
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>type</term>
-                            <listitem>
-                                <para>an integer (scaling).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>type=0</term>
-                                        <listitem>
-                                            <para>the plot is made using the current 3D scaling (set
-                                                by a previous call to <literal>param3d</literal>,
-                                                <literal>plot3d</literal>, <literal>contour</literal> or
-                                                <literal>plot3d1</literal>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=1</term>
-                                        <listitem>
-                                            <para>rescales automatically 3d boxes with extreme
-                                                aspect ratios, the boundaries are specified by the value
-                                                of the optional argument <literal>ebox</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=2 </term>
-                                        <listitem>
-                                            <para>rescales automatically 3d boxes with extreme
-                                                aspect ratios, the boundaries are computed using the
-                                                given data. <emphasis>This is the default
-                                                    value.
-                                                </emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=3</term>
-                                        <listitem>
-                                            <para>3d isometric with box bounds given by optional
-                                                <literal>ebox</literal>, similarily to
-                                                <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=4</term>
-                                        <listitem>
-                                            <para>3d isometric bounds derived from the data,
-                                                similarily<literal> to type=2</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=5</term>
-                                        <listitem>
-                                            <para>3d expanded isometric bounds with box bounds given
-                                                by optional <literal>ebox</literal>, similarily to
-                                                <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=6</term>
-                                        <listitem>
-                                            <para>3d expanded isometric bounds derived from the
-                                                data, similarily to <literal>type=2</literal>.Note that
-                                                axes boundaries can be customized through the axes
-                                                entity properties (see <link linkend="axes_properties">axes_properties</link>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>box</term>
-                            <listitem>
-                                <para>an integer (frame around the plot).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>box=0</term>
-                                        <listitem>
-                                            <para>nothing is drawn around the plot.</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=1</term>
-                                        <listitem>
-                                            <para>unimplemented (like box=0).</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=2</term>
-                                        <listitem>
-                                            <para>only the axes behind the surface are drawn.</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=3</term>
-                                        <listitem>
-                                            <para>a box surrounding the surface is drawn and
-                                                captions are added.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=4</term>
-                                        <listitem>
-                                            <para>a box surrounding the surface is drawn, captions
-                                                and axes are added.Note that axes aspect can also be
-                                                customized through the axes entity properties (see <link linkend="axes_properties">axes_properties</link>).
-                                                <emphasis>This is the default value.</emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ebox</term>
-                <listitem>
-                    <para>It specifies the boundaries of the plot as the vector
-                        <literal>[xmin,xmax,ymin,ymax,zmin,zmax]</literal>. This argument is
-                        used together with <literal>type</literal> in
-                        <literal>flag</literal> : if it is set to <literal>1</literal>,
-                        <literal>3</literal> or <literal>5</literal> (see above to see the
-                        corresponding behaviour). If <literal>flag</literal> is missing,
-                        <literal>ebox</literal> is not taken into account. Note that, when
-                        specified, the <literal>ebox</literal> argument acts on the
-                        <literal>data_bounds</literal> field that can also be reset through
-                        the axes entity properties (see <link linkend="axes_properties">axes_properties</link>). The
-                        <literal>ebox</literal> default value is
-                        <literal>[0,1,0,1,0,1]</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>param3d1</literal> is used to plot 3D curves defined by
-            their coordinates <literal>x</literal>, <literal>y</literal> and
-            <literal>z</literal>. Note that data can also be got or modified through
-            the surface entity properties (see <link linkend="surface_properties">surface_properties</link>).
-        </para>
-        <para>
-            Note that properties like <literal>rotation angles</literal>,
-            <literal>colors</literal> and <literal>thickness</literal> of the plotted
-            curves can also be got or modified through the polyline entity properties
-            (see <link linkend="polyline_properties">polyline_properties</link>).
-        </para>
-        <para>
-            Enter the command <literal>param3d1()</literal> to see a
-            demo.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-scf(20); // create a window number 20
-t=[0:0.1:5*%pi]';
-param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],..
-         list([t/10,sin(t)],[3,2]),35,45,"X@Y@Z",[2,3])
-
-xdel(20);
-a=gca();//get the handle of the newly created axes
-t=[0:0.1:5*%pi]';
-param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],[t/10,sin(t)]);
-a.rotation_angles=[65,75];
-a.data_bounds=[-1,-1,-1;1,1,2]; //boundaries given by data_bounds
-a.thickness = 2;
-h=a.children; //get the handle of the param3d entity: an Compound composed of 2 curves
-h.children(1).foreground = 3; // first curve
-curve2 = h.children(2);
-curve2.foreground = 6;
-curve2.mark_style = 2;
- ]]></programlisting>
-        <scilab:image>
-            a=gca();
-            t=[0:0.1:5*%pi]';
-            param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],[t/10,sin(t)]);
-            a.rotation_angles=[65,75];
-            a.data_bounds=[-1,-1,-1;1,1,2];
-            a.thickness = 2;
-            h=a.children;
-            h.children(1).foreground = 3;
-            curve2 = h.children(2);
-            curve2.foreground = 6;
-            curve2.mark_style = 2;
-        </scilab:image>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="param3d">param3d</link>
-            </member>
-            <member>
-                <link linkend="plot3d">plot3d</link>
-            </member>
-            <member>
-                <link linkend="plot2d">plot2d</link>
-            </member>
-            <member>
-                <link linkend="gca">gca</link>
-            </member>
-            <member>
-                <link linkend="xdel">xdel</link>
-            </member>
-            <member>
-                <link linkend="delete">delete</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/3d_plot/param3d.xml b/scilab/modules/graphics/help/ja_JP/3d_plot/param3d.xml
deleted file mode 100644 (file)
index 4c5dfdd..0000000
+++ /dev/null
@@ -1,526 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) ENPC - Jean-Philippe Chancelier
-
- *
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
- *
-
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:id="param3d" xml:lang="ja">
-
-    <refnamediv>
-
-        <refname>param3d</refname>
-
-        <refpurpose>パラメータ表現の曲線の3次元プロット</refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>param3d(x,y,z,[theta,alpha,leg,flag,ebox])</synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>引数</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>x,y,z</term>
-
-                <listitem>
-
-                    <para>同じ大きさのベクトル (パラメータ表現の曲線の点).</para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>theta, alpha</term>
-
-                <listitem>
-
-                    <para>観測点の球座標を指定する実数値(単位:度).
-
-                        <emphasis>デフォルト値はT 35 度および 45度です.</emphasis>
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>leg</term>
-
-                <listitem>
-
-                    <para>各軸のラベルを定義する文字列. @ をフィールドセパレータとし,
-
-                        "X@Y@Z"のようになります.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>flag=[type,box]</term>
-
-                <listitem>
-
-                    <para>
-
-                        <literal>type</literal> および <literal>box</literal> の意味は
-
-                        <literal>plot3d</literal>と同じ意味になります:
-
-                    </para>
-
-                    <variablelist>
-
-                        <varlistentry>
-
-                            <term>type</term>
-
-                            <listitem>
-
-                                <para>整数 (スケール).</para>
-
-                                <variablelist>
-
-                                    <varlistentry>
-
-                                        <term>type=0</term>
-
-                                        <listitem>
-
-                                            <para>プロットは
-
-                                                (前の<literal>param3d</literal>,
-
-                                                <literal>plot3d</literal>, <literal>contour</literal> または
-
-                                                <literal>plot3d1</literal>のコールで設定された)
-
-                                                カレントの3次元スケールで行われます.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=1</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                3次元ボックスのスケールがアスペクト比の最大値に基づき
-
-                                                自動的に調整され,
-
-                                                境界はオプションの引数<literal>ebox</literal>の値で
-
-                                                指定されます.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=2</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                3次元ボックスのスケールがアスペクト比の最大値に基づき
-
-                                                自動的に調整され,
-
-                                                境界は指令したデータにより計算されます.
-
-                                                <emphasis>これがデフォルト値です.</emphasis>
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=3</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                オプション<literal>ebox</literal>で指定したボックス境界を有する
-
-                                                3次元等軸プロットで,<literal>type=1</literal>に似ています.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=4</term>
-
-                                        <listitem>
-
-                                            <para>データで定義された境界に基づく3次元等軸プロットで,
-
-                                                <literal>type=2</literal>に似ています.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=5</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                オプション<literal>ebox</literal>で指定されたボックス境界で
-
-                                                定義された境界に基づく3次元拡張等軸プロットで,
-
-                                                <literal>type=1</literal>に似ています.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=6</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                データで定義された境界に基づく3次元拡張等軸プロットで,
-
-                                                <literal>type=2</literal>に似ています.
-
-                                                軸の境界は axes エンティティプロパティによりカスタマイズできる
-
-                                                ことに注意してください(<link linkend="axes_properties">axes_properties</link>参照).
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                </variablelist>
-
-                            </listitem>
-
-                        </varlistentry>
-
-                        <varlistentry>
-
-                            <term>box</term>
-
-                            <listitem>
-
-                                <para>整数 (プロットの周囲のフレーム).</para>
-
-                                <variablelist>
-
-                                    <varlistentry>
-
-                                        <term>box=0</term>
-
-                                        <listitem>
-
-                                            <para>プロットの周囲に何も描画されませ.</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=1</term>
-
-                                        <listitem>
-
-                                            <para>実装されていません (box=0と同様).</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=2</term>
-
-                                        <listitem>
-
-                                            <para>曲面の背後の軸のみが描画されます.</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=3</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                曲面を囲うボックスが描画され,キャプションが追加されます.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=4</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                曲面を囲うボックスが描画され,キャプションと軸が追加されます.
-
-                                                軸のアスペクトもaxesエンティティのプロパティによりカスタマイズ
-
-                                                できることに注意してください (<link linkend="axes_properties">axes_properties</link>参照).
-
-                                                <emphasis>これがデフォルト値です.</emphasis>
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                </variablelist>
-
-                            </listitem>
-
-                        </varlistentry>
-
-                    </variablelist>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>ebox</term>
-
-                <listitem>
-
-                    <para>
-
-                        プロットの境界をベクトル
-
-                        <literal>[xmin,xmax,ymin,ymax,zmin,zmax]</literal>で指定します.
-
-
-
-                        この引数は,<literal>flag</literal>の<literal>type</literal>が<literal>1</literal>,
-
-                        <literal>3</literal> または <literal>5</literal>に設定された場合,
-
-                        使用されます (対応する動作については上記参照).
-
-                        <literal>flag</literal> が指定されない場合
-
-                        <literal>ebox</literal> は無視されます.
-
-                        指定された場合, <literal>ebox</literal>引数は,
-
-                        <literal>data_bounds</literal>に基づいて動作し,
-
-                        axesエンティティのプロパティによりリセットすることも可能であることに
-
-                        注意してください(<link linkend="axes_properties">axes_properties</link>参照).
-
-                        ebox のデフォルト値は[0,1,0,1,0,1]です.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            <literal>param3d</literal> はその座標<literal>x</literal>,
-
-            <literal>y</literal> および<literal>z</literal>により定義される
-
-            3次元曲線をプロットするために使用されます.
-
-            データは surface エンティティのプロパティにより取得または修正できることに
-
-            注意してください (<link linkend="surface_properties">surface_properties</link>を参照ください).
-
-        </para>
-
-        <para>プロットされる曲線の
-
-            <literal>rotation angles</literal>,
-
-            <literal>colors</literal> および <literal>thickness</literal> のような
-
-            プロパティも polyline エンティティプロパティにより取得または修正することが
-
-            できます
-
-            (<link linkend="polyline_properties">polyline_properties</link>参照).
-
-        </para>
-
-        <para>
-
-            複数のプロットを行うには<literal>param3d1</literal> を使用してください.
-
-        </para>
-
-        <para>
-
-            コマンド <literal>param3d()</literal> を入力するとデモを参照できます.
-
-        </para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>例</title>
-
-        <programlisting role="example"><![CDATA[
-
-t=0:0.1:5*%pi;
-
-param3d(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,3])
-
-
-
-e=gce() //3次元ポリラインのハンドル
-
-
-
-e.foreground=color('red');
-
-
-
-a=gca(); //軸のハンドル
-
-a.rotation_angles=[10 70];
-
- ]]></programlisting>
-
-        <scilab:image>
-
-            t=0:0.1:5*%pi;
-
-            param3d(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,3])
-
-
-
-            e=gce() //the handle on the 3D polyline
-
-
-
-            e.foreground=color('red');
-
-
-
-            a=gca(); //the handle on the axes
-
-            a.rotation_angles=[10 70];
-
-        </scilab:image>
-
-    </refsection>
-
-    <refsection role="see also">
-
-        <title>参照</title>
-
-        <simplelist type="inline">
-
-            <member>
-
-                <link linkend="param3d1">param3d1</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="plot3d">plot3d</link>
-
-            </member>
-
-        </simplelist>
-
-    </refsection>
-
-</refentry>
-
diff --git a/scilab/modules/graphics/help/ja_JP/3d_plot/param3d1.xml b/scilab/modules/graphics/help/ja_JP/3d_plot/param3d1.xml
deleted file mode 100644 (file)
index 021d21f..0000000
+++ /dev/null
@@ -1,590 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) ENPC - Jean-Philippe Chancelier
-
- *
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
- *
-
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:id="param3d1" xml:lang="ja">
-
-    <refnamediv>
-
-        <refname>param3d1</refname>
-
-        <refpurpose>パラメータ表現の曲線の3次元プロット</refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>param3d1(x,y,z,[theta,alpha,leg,flag,ebox])
-
-            param3d1(x,y,list(z,colors),[theta,alpha,leg,flag,ebox])
-
-        </synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>引数</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>x,y,z</term>
-
-                <listitem>
-
-                    <para>同じ大きさ (nl,nc)の曲線.</para>
-
-                    <para>
-
-                        行列のi列目はi番目の曲線の座標に対応します.
-
-                        <literal>z</literal>の代わりに
-
-                        <literal>list(z,colors)</literal>により各曲線の色を
-
-                        指定することができます.
-
-                        ただし,<literal>colors</literal> は大きさ <literal>nc</literal> のベクトルです.
-
-                        <literal>color(i)</literal>が負の場合,曲線はID
-
-                        <literal>abs(style(i))</literal>のマーカを用いてプロットされます;
-
-                        <literal>style(i)</literal> が正の場合,
-
-                        色ID <literal>style(i)</literal> の実線または破線ID
-
-                        <literal>style(i)</literal>の破線が使用されます.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>theta,alpha</term>
-
-                <listitem>
-
-                    <para>観測点の球座標を指定する実数値(単位:度).
-
-                        <emphasis>デフォルト値はT 35 度および 45度です.</emphasis>
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>leg</term>
-
-                <listitem>
-
-                    <para>各軸のラベルを定義する文字列. @ をフィールドセパレータとし,
-
-                        "X@Y@Z"のようになります.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>flag=[type,box]</term>
-
-                <listitem>
-
-                    <para>
-
-                        <literal>type</literal> および <literal>box</literal> は
-
-                        <literal>plot3d</literal>における意味と同じになります:
-
-                    </para>
-
-                    <variablelist>
-
-                        <varlistentry>
-
-                            <term>type</term>
-
-                            <listitem>
-
-                                <para>整数 (スケール).</para>
-
-                                <variablelist>
-
-                                    <varlistentry>
-
-                                        <term>type=0</term>
-
-                                        <listitem>
-
-                                            <para>プロットは
-
-                                                (前の<literal>param3d</literal>,
-
-                                                <literal>plot3d</literal>, <literal>contour</literal> または
-
-                                                <literal>plot3d1</literal>のコールで設定された)
-
-                                                カレントの3次元スケールで行われます.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=1</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                3次元ボックスのスケールがアスペクト比の最大値に基づき
-
-                                                自動的に調整され,
-
-                                                境界はオプションの引数<literal>ebox</literal>の値で
-
-                                                指定されます.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=2 </term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                3次元ボックスのスケールがアスペクト比の最大値に基づき
-
-                                                自動的に調整され,
-
-                                                境界は指令したデータにより計算されます.
-
-                                                <emphasis>これがデフォルト値です.</emphasis>
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=3</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                オプション<literal>ebox</literal>で指定したボックス境界を有する
-
-                                                3次元等軸プロットで,<literal>type=1</literal>に似ています.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=4</term>
-
-                                        <listitem>
-
-                                            <para>データで定義された境界に基づく3次元等軸プロットで,
-
-                                                <literal>type=2</literal>に似ています.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=5</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                オプション<literal>ebox</literal>で指定されたボックス境界で
-
-                                                定義された境界に基づく3次元拡張等軸プロットで,
-
-                                                <literal>type=1</literal>に似ています.
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>type=6</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                データで定義された境界に基づく3次元拡張等軸プロットで,
-
-                                                <literal>type=2</literal>に似ています.
-
-                                                軸の境界は axes エンティティプロパティによりカスタマイズできる
-
-                                                ことに注意してください(<link linkend="axes_properties">axes_properties</link>参照).
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                </variablelist>
-
-                            </listitem>
-
-                        </varlistentry>
-
-                        <varlistentry>
-
-                            <term>box</term>
-
-                            <listitem>
-
-                                <para>整数 (プロットの周囲のフレーム).</para>
-
-                                <variablelist>
-
-                                    <varlistentry>
-
-                                        <term>box=0</term>
-
-                                        <listitem>
-
-                                            <para>プロットの周囲に何も描画されませ.</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=1</term>
-
-                                        <listitem>
-
-                                            <para>実装されていません (box=0と同様).</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=2</term>
-
-                                        <listitem>
-
-                                            <para>曲面の背後の軸のみが描画されます.</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=3</term>
-
-                                        <listitem>
-
-                                            <para>曲面を囲うボックスが描画され,キャプションが追加されます.</para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                    <varlistentry>
-
-                                        <term>box=4</term>
-
-                                        <listitem>
-
-                                            <para>
-
-                                                曲面を囲うボックスが描画され,キャプションと軸が追加されます.
-
-                                                軸のアスペクトもaxesエンティティのプロパティによりカスタマイズ
-
-                                                できることに注意してください (<link linkend="axes_properties">axes_properties</link>参照).
-
-                                                <emphasis>これがデフォルト値です.</emphasis>
-
-                                            </para>
-
-                                        </listitem>
-
-                                    </varlistentry>
-
-                                </variablelist>
-
-                            </listitem>
-
-                        </varlistentry>
-
-                    </variablelist>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>ebox</term>
-
-                <listitem>
-
-                    <para>
-
-                        プロットの境界をベクトル
-
-                        <literal>[xmin,xmax,ymin,ymax,zmin,zmax]</literal>で指定します.
-
-                        この引数は,<literal>flag</literal>の<literal>type</literal>が<literal>1</literal>,
-
-                        <literal>3</literal> または <literal>5</literal>に設定された場合,
-
-                        使用されます (対応する動作については上記参照).
-
-                        <literal>flag</literal> が指定されない場合
-
-                        <literal>ebox</literal> は無視されます.
-
-                        指定された場合, <literal>ebox</literal>引数は,
-
-                        <literal>data_bounds</literal>に基づいて動作し,
-
-                        axesエンティティのプロパティ
-
-                        (<link linkend="axes_properties">axes_properties</link>参照)
-
-                        によりリセットすることも可能であることに
-
-                        注意してください. <literal>ebox</literal>のデフォルト値は
-
-                        <literal>[0,1,0,1,0,1]</literal>です.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            <literal>param3d1</literal> は座標
-
-            <literal>x</literal>, <literal>y</literal> および
-
-            <literal>z</literal>で定義される3次元曲線をプロットする際に使用されます.
-
-            データは surface エンティティのプロパティにより取得または修正できることに
-
-            注意してください (<link linkend="surface_properties">surface_properties</link>を参照ください).
-
-        </para>
-
-        <para>プロットされる曲線の
-
-            <literal>rotation angles</literal>,
-
-            <literal>colors</literal> および <literal>thickness</literal> のような
-
-            プロパティも polyline エンティティプロパティにより取得または修正することが
-
-            できます
-
-            (<link linkend="polyline_properties">polyline_properties</link>参照).
-
-        </para>
-
-        <para>
-
-            コマンド <literal>param3d1()</literal> を入力するとデモを参照できます.
-
-        </para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>例</title>
-
-        <programlisting role="example"><![CDATA[
-
-scf(20); // ウインドウ番号 20を作成
-
-t=[0:0.1:5*%pi]';
-
-param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],..
-
-         list([t/10,sin(t)],[3,2]),35,45,"X@Y@Z",[2,3])
-
-
-
-xdel(20);
-
-a=gca();//新規に作成された軸のハンドルを取得
-
-t=[0:0.1:5*%pi]';
-
-param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],[t/10,sin(t)])
-
-a.rotation_angles=[65,75];
-
-a.data_bounds=[-1,-1,-1;1,1,2]; //data_boundsにより指定された境界
-
-a.thickness = 2;
-
-h=a.children //param3dエンティティのハンドルを取得: 2つの曲線からなるCompound
-
-h.children(1).foreground = 3 // 最初の曲線
-
-curve2 = h.children(2);
-
-curve2.foreground = 6;
-
-curve2.mark_style = 2;
-
- ]]></programlisting>
-
-        <scilab:image>
-
-            a=gca();
-
-            t=[0:0.1:5*%pi]';
-
-            param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],[t/10,sin(t)]);
-
-            a.rotation_angles=[65,75];
-
-            a.data_bounds=[-1,-1,-1;1,1,2];
-
-            a.thickness = 2;
-
-            h=a.children;
-
-            h.children(1).foreground = 3;
-
-            curve2 = h.children(2);
-
-            curve2.foreground = 6;
-
-            curve2.mark_style = 2;
-
-        </scilab:image>
-
-    </refsection>
-
-    <refsection role="see also">
-
-        <title>参照</title>
-
-        <simplelist type="inline">
-
-            <member>
-
-                <link linkend="param3d">param3d</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="plot3d">plot3d</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="plot2d">plot2d</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="gca">gca</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="xdel">xdel</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="delete">delete</link>
-
-            </member>
-
-        </simplelist>
-
-    </refsection>
-
-</refentry>
-
diff --git a/scilab/modules/graphics/help/pt_BR/3d_plot/param3d.xml b/scilab/modules/graphics/help/pt_BR/3d_plot/param3d.xml
deleted file mode 100644 (file)
index f6acd08..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) ENPC - Jean-Philippe Chancelier
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="param3d" xml:lang="pt">
-    <refnamediv>
-        <refname>param3d</refname>
-        <refpurpose>esboço 3d de uma curva parametrizada</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>param3d(x,y,z,[theta,alpha,leg,flag,ebox])</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y,z</term>
-                <listitem>
-                    <para>três vetores de mesmo tamanho (pontos da curva
-                        parametrizada).
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>theta, alpha</term>
-                <listitem>
-                    <para>valores reais fornecendo em graus as coordenadas esféricas do
-                        ponto de observação. <emphasis>os valores padrões são 35 e 45
-                            graus.
-                        </emphasis>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>leg</term>
-                <listitem>
-                    <para>string definindo rótulos para cada eixo com @ como separador
-                        de campo, por exemplo"X@Y@Z".
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flag=[type,box]</term>
-                <listitem>
-                    <para>
-                        <literal>type</literal> e <literal>box</literal> possuem o
-                        mesmo significado que em <literal>plot3d</literal>:
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>type</term>
-                            <listitem>
-                                <para>um inteiro (tipo de escala).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>type=0</term>
-                                        <listitem>
-                                            <para>o esboço é feito utilizando-se a escala 3d
-                                                corrente (definida por uma chamada anterior a
-                                                <literal>param3d</literal>, <literal>plot3d</literal>,
-                                                <literal>contour</literal> ou
-                                                <literal>plot3d1</literal>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=1</term>
-                                        <listitem>
-                                            <para>re-escala automaticamente caixas 3d com relação de
-                                                aspecto extrema, as fronteiras são especificadas pelo
-                                                valor do argumento opcional
-                                                <literal>ebox</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=2</term>
-                                        <listitem>
-                                            <para>re-escala automaticamente caixas 3d com relação de
-                                                aspecto extrema, as fronteiras são computadas
-                                                utilizando-se dados fornecidos. <emphasis>Este é o valor
-                                                    padrão
-                                                </emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=3</term>
-                                        <listitem>
-                                            <para>fronteiras 3d isométricas com fronteiras da caixa
-                                                dadas por <literal>ebox</literal>, de modo semelhante a
-                                                <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=4</term>
-                                        <listitem>
-                                            <para>fronteiras 3d isométricas derivadas dos dados, de
-                                                modo semelhante a<literal> type=2</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=5</term>
-                                        <listitem>
-                                            <para>fronteiras 3d isométricas expandidas com
-                                                fronteiras fornecidas por <literal>ebox</literal>, de
-                                                modo semelhante a <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=6</term>
-                                        <listitem>
-                                            <para>fronteiras 3d isométricas expandidas derivadas dos
-                                                dados, de modo semelhante a
-                                                <literal>type=2</literal>.Note que as fronteiras dos
-                                                eixos podem ser customizadas através das propriedades da
-                                                entidade de eixos (ver <link linkend="axes_properties">axes_properties</link>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>box</term>
-                            <listitem>
-                                <para>um inteiro (moldura ao redor do esboço).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>box=0</term>
-                                        <listitem>
-                                            <para>nada é desenhado ao redor do esboço.</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=1</term>
-                                        <listitem>
-                                            <para>não implementado (é como box=0).</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=2</term>
-                                        <listitem>
-                                            <para>apenas os eixos atrás da superfície são
-                                                desenhados.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=3</term>
-                                        <listitem>
-                                            <para>uma caixa cercando a superfície é desenhada e
-                                                legendas são adicionadas.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=4</term>
-                                        <listitem>
-                                            <para>uma caixa cercando a superfície é desenhada e
-                                                legendas e eixos são adicionados. Note que o aspecto dos
-                                                eixos também pode ser customizado através das
-                                                propriedades da entidade Axes (ver <link linkend="axes_properties">axes_properties</link>).
-                                                <emphasis>Este é o padrão</emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ebox</term>
-                <listitem>
-                    <para>especifica as fronteiras do esboço através do vetor
-                        <literal>[xmin,xmax,ymin,ymax,zmin,zmax]</literal>. Este argumento é
-                        utilizado junto com <literal>type</literal> em
-                        <literal>flag</literal> se este for ajustado para
-                        <literal>1</literal>, <literal>3</literal> ou <literal>5</literal>
-                        (volte acima para ver o comportamento correspondente). Se
-                        <literal>flag</literal> estiver faltando, <literal>ebox</literal>
-                        não é levado em conta. Note que, quando especificado, o argumento
-                        <literal>ebox</literal> age no campo <literal>data_bounds</literal>
-                        field que também pode ser ajustado através das propriedades da
-                        entidade de eixos (ver <link linkend="axes_properties">axes_properties</link>). O valor padrão de
-                        ebox é [0,1,0,1,0,1].
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            <literal>param3d</literal> é usado para esboçar uma curva 3d
-            definida por suas coordenadas <literal>x</literal>, <literal>y</literal> e
-            <literal>z</literal>. Note que os dados também podem ser ajustados ou
-            recebidos através das propriedades da entidade superfície (ver <link linkend="surface_properties">surface_properties</link>).
-        </para>
-        <para>
-            Note que propriedades como <literal>rotation angles</literal>,
-            <literal>colors</literal> e <literal>thickness</literal> da superfície
-            esboçada também podem ser ajustadas através das propriedades de param3d
-            (ver <link linkend="param3d_properties">param3d_properties</link>).
-        </para>
-        <para>
-            Use <literal>param3d1</literal> para realizar esboços
-            múltiplos.
-        </para>
-        <para>
-            Entre com o comando <literal>param3d()</literal> para visualizar uma
-            demonstração.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-t=0:0.1:5*%pi;
-param3d(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,3])
-
-e=gce() //o manipulador para a poligonal 3d
-
-e.foreground=color('red');
-
-a=gca(); //o manipulador para os eixos
-a.rotation_angles=[10 70];
- ]]></programlisting>
-    </refsection>
-    <refsection>
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="param3d1">param3d1</link>
-            </member>
-            <member>
-                <link linkend="plot3d">plot3d</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/pt_BR/3d_plot/param3d1.xml b/scilab/modules/graphics/help/pt_BR/3d_plot/param3d1.xml
deleted file mode 100644 (file)
index 4ec0654..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) ENPC - Jean-Philippe Chancelier
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="param3d1" xml:lang="pt">
-    <refnamediv>
-        <refname>param3d1</refname>
-        <refpurpose>esboço 3d de curvas parametrizadas</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>param3d1(x,y,z,[theta,alpha,leg,flag,ebox])
-            param3d1(x,y,list(z,colors),[theta,alpha,leg,flag,ebox])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>x,y,z</term>
-                <listitem>
-                    <para>matrizes de mesmo tamanho (nl,nc). </para>
-                    <para>Cada coluna i das matrizes corresponde às coordenadas da
-                        i-ésima curva. Você pode fornecer uma cor específica para cada curva
-                        utilizando <literal>list(z,colors)</literal> ao invés de
-                        <literal>z</literal>, onde <literal>colors</literal> é um vetor de
-                        tamanho <literal>nc</literal>. Se <literal>color(i)</literal> for
-                        negativo, a curva é esboçada utilizando-se a marca com identificador
-                        <literal>abs(style(i))</literal>; se <literal>style(i)</literal> for
-                        estritamente positivo, uma linha simples com idenficador de cor
-                        <literal>style(i)</literal> ou uma linha tracejada com identificador
-                        de tipo de tracejado <literal>style(i)</literal> é utilizada.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>theta,alpha</term>
-                <listitem>
-                    <para>valores reais fornecendo em graus as coordenadas esféricas do
-                        ponto de observação. <emphasis>Os valores padrões são 35 e 45
-                            graus.
-                        </emphasis>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>leg</term>
-                <listitem>
-                    <para>string definindo rótulos para cada eixo com @ como separador
-                        de campo, por exemplo " X@Y@Z" .
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flag=[type,box]</term>
-                <listitem>
-                    <para>
-                        <literal>type</literal> e <literal>box</literal> possuem o
-                        mesmo significado que em <literal>plot3d</literal>:
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>type</term>
-                            <listitem>
-                                <para>um inteiro (tipo de escala).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>type=0</term>
-                                        <listitem>
-                                            <para>o esboço é feito utilizando-se a escala 3d
-                                                corrente (definida por uma chamada anterior a
-                                                <literal>param3d</literal>, <literal>plot3d</literal>,
-                                                <literal>contour</literal> ou
-                                                <literal>plot3d1</literal>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=1</term>
-                                        <listitem>
-                                            <para>re-escala automaticamente caixas 3d com relação de
-                                                aspecto extrema, as fronteiras são especificadas pelo
-                                                valor do argumento opcional
-                                                <literal>ebox</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=2</term>
-                                        <listitem>
-                                            <para> re-escala automaticamente caixas 3d com relação
-                                                de aspecto extrema, as fronteiras são computadas
-                                                utilizando-se dados fornecidos. <emphasis>Este é o valor
-                                                    padrão
-                                                </emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=3</term>
-                                        <listitem>
-                                            <para> fronteiras 3d isométricas com fronteiras da caixa
-                                                dadas por <literal>ebox</literal>, de modo semelhante a
-                                                <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=4</term>
-                                        <listitem>
-                                            <para> fronteiras 3d isométricas derivadas dos dados, de
-                                                modo semelhante a<literal> type=2</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=5</term>
-                                        <listitem>
-                                            <para> fronteiras 3d isométricas expandidas com
-                                                fronteiras fornecidas por <literal>ebox</literal>, de
-                                                modo semelhante a <literal>type=1</literal>.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>type=6</term>
-                                        <listitem>
-                                            <para>fronteiras 3d isométricas expandidas derivadas dos
-                                                dados, de modo semelhante a <literal>type=2</literal>.
-                                                Note que as fronteiras dos eixos podem ser customizadas
-                                                através das propriedades da entidade de eixos (ver <link linkend="axes_properties">axes_properties</link>).
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>box</term>
-                            <listitem>
-                                <para>um inteiro (moldura ao redor do esboço).</para>
-                                <variablelist>
-                                    <varlistentry>
-                                        <term>box=0</term>
-                                        <listitem>
-                                            <para>nada é desenhado ao redor do esboço.</para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=1</term>
-                                        <listitem>
-                                            <para>não implementado (é como box=0). </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=2</term>
-                                        <listitem>
-                                            <para> apenas os eixos atrás da superfície são
-                                                desenhados.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=3</term>
-                                        <listitem>
-                                            <para>uma caixa cercando a superfície é desenhada e
-                                                legendas são adicionadas.
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                    <varlistentry>
-                                        <term>box=4</term>
-                                        <listitem>
-                                            <para>uma caixa cercando a superfície é desenhada e
-                                                legendas e eixos são adicionados. Note que o aspecto dos
-                                                eixos também pode ser customizado através das
-                                                propriedades da entidade Axes (ver <link linkend="axes_properties">axes_properties</link>).
-                                                <emphasis>Este é o valor padrão.</emphasis>
-                                            </para>
-                                        </listitem>
-                                    </varlistentry>
-                                </variablelist>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ebox</term>
-                <listitem>
-                    <para>especifica as fronteiras do esboço através do vetor
-                        <literal>[xmin,xmax,ymin,ymax,zmin,zmax]</literal>. Este argumento é
-                        utilizado junto com <literal>type</literal> em
-                        <literal>flag</literal> se este estiver ajustado para
-                        <literal>1</literal>, <literal>3</literal> ou <literal>5</literal>
-                        (volte acima para ver o comportamento correspondente). Se
-                        <literal>flag</literal> estiver faltando, <literal>ebox</literal>
-                        não é levado em conta. Note que, quando especificado, o argumento
-                        <literal>ebox</literal> age no campo <literal>data_bounds</literal>
-                        fque também pode ser ajustado através das propriedades da entidade
-                        de eixos (ver <link linkend="axes_properties">axes_properties</link>). O valor padrão de
-                        <literal>ebox</literal> é <literal>[0,1,0,1,0,1]</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            <literal>param3d1</literal> usado para esboçar curvas 3d definidas
-            por suas coordenadas <literal>x</literal>, <literal>y</literal> e
-            <literal>z</literal>. Note que os dados também podem ser ajustados ou
-            recebidos através das propriedades da entidade Surface (ver <link linkend="surface_properties">surface_properties</link>).
-        </para>
-        <para>
-            Note que propriedades como <literal>rotation angles</literal>,
-            <literal>colors</literal> e <literal>thickness</literal> das curvas
-            esboçadas também podem ser ajustadas através das propriedades de param3d
-            (ver <link linkend="param3d_properties">param3d_properties</link>).
-        </para>
-        <para>
-            Entre com o comando <literal>param3d1()</literal> para visualizar
-            uma demonstração.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-scf(20); // criando janela de número 20
-t=[0:0.1:5*%pi]';
-param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],..
-         list([t/10,sin(t)],[3,2]),35,45,"X@Y@Z",[2,3])
-
-xdel(20);
-a=gca();//obtendo manipulador dos novos eixos criados
-t=[0:0.1:5*%pi]';
-param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],[t/10,sin(t)])
-a.rotation_angles=[65,75];
-a.data_bounds=[-1,-1,-1;1,1,2]; //limites fornecidos por data_bounds
-a.thickness = 2;
-h=a.children //obtendo o manipulador para a entidade Param3d: um Compound composto de duas curvas
-h.children(1).foreground = 3 // primeira curva
-curve2 = h.children(2);
-curve2.foreground = 6;
-curve2.mark_style = 2;
- ]]></programlisting>
-        <scilab:image>
-            a=gca();
-            t=[0:0.1:5*%pi]';
-            param3d1([sin(t),sin(2*t)],[cos(t),cos(2*t)],[t/10,sin(t)]);
-            a.rotation_angles=[65,75];
-            a.data_bounds=[-1,-1,-1;1,1,2];
-            a.thickness = 2;
-            h=a.children;
-            h.children(1).foreground = 3;
-            curve2 = h.children(2);
-            curve2.foreground = 6;
-            curve2.mark_style = 2;
-        </scilab:image>
-    </refsection>
-    <refsection>
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="param3d">param3d</link>
-            </member>
-            <member>
-                <link linkend="plot3d">plot3d</link>
-            </member>
-            <member>
-                <link linkend="plot2d">plot2d</link>
-            </member>
-            <member>
-                <link linkend="gca">gca</link>
-            </member>
-            <member>
-                <link linkend="xdel">xdel</link>
-            </member>
-            <member>
-                <link linkend="delete">delete</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 76df36d..ac74f37 100644 (file)
@@ -1,6 +1,5 @@
-//
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO - Jean-Baptiste Silvy
+// Copyright (C) 2018 - Samuel GOUGEON
 //
 // Copyright (C) 2012 - 2016 - Scilab Enterprises
 //
 // For more information, see the COPYING file which you should have received
 // along with this program.
 //
-//
 
-//
 // This is the demonstration script of param3d
 // used when calling param3d without any parameter.
-//
 
 function [] = %_param3d()
-    t=0:0.1:5*%pi;
-    param3d(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,4]);
+    t = (0:0.1:5*%pi)';
+    r = (max(t)-t)/10;
+    clf
+    param3d1(r.*sin(t), r.*cos(t), list(t/10, -10), 28, 61,"axis X@axis Y@axis Z",[4,4])
+    gce().mark_foreground = color("magenta")
+    gce().line_mode = "on";
+
+    gca().foreground = color("grey60");
+    gca().sub_ticks = [4 4 4];
+    xgrid(color("grey80"),[1 1 1],[8 8 8]);
 endfunction
index c101bde..60e9591 100644 (file)
@@ -1,6 +1,5 @@
-//
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2009 - DIGITEO - Jean-Baptiste Silvy
+// Copyright (C) 2018 - Samuel GOUGEON
 //
 // Copyright (C) 2012 - 2016 - Scilab Enterprises
 //
 // For more information, see the COPYING file which you should have received
 // along with this program.
 //
-//
 
-//
 // This is the demonstration script of param3d1
 // used when calling param3d1 without any parameter.
-//
 
 function [] = %_param3d1()
-    t=0:0.1:5*%pi;
-    param3d1(sin(t),cos(t),t/10,35,45,"X@Y@Z",[2,4]);
+    [X, Y] = ndgrid(-11:0.5:9);
+    R = sqrt(X.*X + Y.*Y) + %eps;
+    Z = sin(R)./R;
+    
+    clf
+    drawlater
+    subplot(1,3,1)
+    param3d1(X, Y, Z, 150, 85, flag=[2,4])
+    
+    subplot(1,3,2)
+    param3d1(X, Y, Z, 150, 85, flag=[2,4])
+    gce().children.foreground = color("green");
+    
+    subplot(1,3,3)
+    param3d1(X, Y, Z, 150, 85, flag=[2,4])
+    curves = gce().children;
+    curves(1:2:$).foreground = color("orange");
+    gca().box = "back_half";
+    
+    gcf().children.foreground = color("grey70"); // box & ticks color for the 3 figures
+    gcf().children.sub_ticks = [4 4 4];
+    gcf().axes_size = [1000 370];
+    drawnow
 endfunction
index 811b4be..e8b57e5 100644 (file)
@@ -1145,8 +1145,10 @@ ordmmd_ja_JP_1.png=65695a27c9eaf674ba4eac782ec20eba
 ordmmd_pt_BR_1.png=65695a27c9eaf674ba4eac782ec20eba
 ordmmd_ru_RU_1.png=65695a27c9eaf674ba4eac782ec20eba
 orthProj_1.png=ce22c81dda75863eb40a717f11c88011
-param3d1_1.png=8f23378bea1aa88c53ebe32990958db7
-param3d_1.png=9160991c6c607c8531dff4fe9096a3e2
+param3d_1.png=a13e8ee1973383456316f059e1527b10
+param3d_2.png=7c101a361b575bb927013e52b76cb3ea
+param3d_3.png=b0f376ac390de56c3c2cba61456e75db
+param3d_4.png=d2aca1e05df03e8bee45d115c6668285
 parulacolormap_1.png=6d19dadbcf270d0bd89aeda86573f45e
 percentasn_1.png=2c864619bcf4876ed395f49798f0f283
 percentsn_1.png=64ebf9395ff1337fe97136c4b989e264
diff --git a/scilab/modules/helptools/images/param3d1_1.png b/scilab/modules/helptools/images/param3d1_1.png
deleted file mode 100644 (file)
index 5387957..0000000
Binary files a/scilab/modules/helptools/images/param3d1_1.png and /dev/null differ
index ab60dea..642e6ee 100644 (file)
Binary files a/scilab/modules/helptools/images/param3d_1.png and b/scilab/modules/helptools/images/param3d_1.png differ
diff --git a/scilab/modules/helptools/images/param3d_2.png b/scilab/modules/helptools/images/param3d_2.png
new file mode 100644 (file)
index 0000000..73416c6
Binary files /dev/null and b/scilab/modules/helptools/images/param3d_2.png differ
diff --git a/scilab/modules/helptools/images/param3d_3.png b/scilab/modules/helptools/images/param3d_3.png
new file mode 100644 (file)
index 0000000..09ff910
Binary files /dev/null and b/scilab/modules/helptools/images/param3d_3.png differ
diff --git a/scilab/modules/helptools/images/param3d_4.png b/scilab/modules/helptools/images/param3d_4.png
new file mode 100644 (file)
index 0000000..bead468
Binary files /dev/null and b/scilab/modules/helptools/images/param3d_4.png differ