* Bug 14738 fixed: hist3d() should be renamed bar3d() 01/19701/10
Samuel GOUGEON [Fri, 26 Jan 2018 19:44:50 +0000 (20:44 +0100)]
  http://bugzilla.scilab.org/14738

Change-Id: Icbc2b9ecdc6000c993c16afdd3e261e67f1b42d5

67 files changed:
scilab/CHANGES.md
scilab/modules/elementary_functions/help/en_US/elementarymatrices/random/grand.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/random/grand.xml
scilab/modules/elementary_functions/help/ru_RU/elementarymatrices/random/grand.xml
scilab/modules/graphics/demos/hist_bar_stem/bar3d.dem.sce [moved from scilab/modules/graphics/demos/hist_bar_stem/hist3d.dem.sce with 69% similarity]
scilab/modules/graphics/demos/hist_bar_stem/histBarStem.dem.gateway.sce
scilab/modules/graphics/help/en_US/2d_plot/histplot.xml
scilab/modules/graphics/help/en_US/3d_plot/bar3d.xml [new file with mode: 0644]
scilab/modules/graphics/help/en_US/3d_plot/hist3d.xml
scilab/modules/graphics/help/en_US/Graphics.xml
scilab/modules/graphics/help/en_US/axes_operations/subplot.xml
scilab/modules/graphics/help/en_US/bar_histogram/bar.xml
scilab/modules/graphics/help/fr_FR/2d_plot/histplot.xml
scilab/modules/graphics/help/fr_FR/3d_plot/bar3d.xml [new file with mode: 0644]
scilab/modules/graphics/help/fr_FR/3d_plot/hist3d.xml
scilab/modules/graphics/help/fr_FR/Graphics.xml
scilab/modules/graphics/help/fr_FR/axes_operations/subplot.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/bar.xml
scilab/modules/graphics/help/ja_JP/2d_plot/histplot.xml
scilab/modules/graphics/help/ja_JP/3d_plot/bar3d.xml [new file with mode: 0644]
scilab/modules/graphics/help/ja_JP/3d_plot/hist3d.xml
scilab/modules/graphics/help/ja_JP/Graphics.xml
scilab/modules/graphics/help/ja_JP/axes_operations/subplot.xml
scilab/modules/graphics/help/ja_JP/bar_histogram/bar.xml
scilab/modules/graphics/help/pt_BR/2d_plot/histplot.xml
scilab/modules/graphics/help/pt_BR/3d_plot/bar3d.xml [new file with mode: 0644]
scilab/modules/graphics/help/pt_BR/3d_plot/hist3d.xml
scilab/modules/graphics/help/pt_BR/Graphics.xml
scilab/modules/graphics/help/pt_BR/axes_operations/subplot.xml
scilab/modules/graphics/help/pt_BR/bar_histogram/bar.xml
scilab/modules/graphics/help/ru_RU/Graphics.xml
scilab/modules/graphics/help/ru_RU/axes_operations/subplot.xml
scilab/modules/graphics/macros/bar3d.sci [new file with mode: 0644]
scilab/modules/graphics/macros/hist3d.sci
scilab/modules/graphics/tests/nonreg_tests/bug_2179.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_2179.tst
scilab/modules/graphics/tests/nonreg_tests/bug_4539.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_4539.tst
scilab/modules/graphics/tests/nonreg_tests/bug_6641.tst
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/Graphics_23.png
scilab/modules/helptools/images/Graphics_30.png
scilab/modules/helptools/images/bar3d_2.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_3.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_4.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_5.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_en_US_1.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_fr_FR_1.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_ja_JP_1.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_pt_BR_1.png [new file with mode: 0644]
scilab/modules/helptools/images/bar3d_ru_RU_1.png [new file with mode: 0644]
scilab/modules/helptools/images/grand_en_US_6.png
scilab/modules/helptools/images/grand_fr_FR_6.png
scilab/modules/helptools/images/grand_pt_BR_6.png
scilab/modules/helptools/images/grand_ru_RU_6.png
scilab/modules/helptools/images/subplot_1.png
scilab/modules/helptools/images/tree_show_2x2.png [new file with mode: 0644]
scilab/modules/helptools/images/tree_show_list.png [new file with mode: 0644]
scilab/modules/helptools/images/tree_show_styling.png [new file with mode: 0644]
scilab/modules/helptools/images/xload_70p.png [new file with mode: 0644]
scilab/modules/io/help/en_US/load.xml
scilab/modules/io/help/en_US/save.xml
scilab/modules/statistics/help/en_US/4_distribution_empirical_shape/histc.xml
scilab/modules/string/tests/unit_tests/ascii.dia.ref
scilab/modules/string/tests/unit_tests/ascii.tst
scilab/modules/string/tests/unit_tests/text.txt

index 68e1128..ba8aa8b 100644 (file)
@@ -230,6 +230,7 @@ Obsolete functions or features
 * `ric_desc` is obsolete and will be removed from Scilab 6.1.x. Please use `riccati` instead.
 * `noisegen` will be removed from Scilab 6.1.x. Please use `grand` instead.
 * `get_figure_handle(n)` is obsolete. Please use `findobj('figure_id',n)` instead.
+* `hist3d` is renamed `bar3d`. The former `hist3d` function is declared obsolete and will be replaced by an actual 3D histogram function in Scilab 6.2.
 
 Removed Functions
 -----------------
@@ -307,6 +308,7 @@ Bug Fixes
 * [#14642](https://bugzilla.scilab.org/14642): No more "\r" carriage return with printf.
 * [#14655](https://bugzilla.scilab.org/14655): `bitset` worked only element-wise, without accepting mixed scalar and array inputs.
 * [#14735](https://bugzilla.scilab.org/14735): The `genetic_algorithms` module was out of the `optimization` one.
+* [#14738](https://bugzilla.scilab.org14738): `hist3d` was not actually an histogram function. It is renamed `bar3d`.
 * [#14741](https://bugzilla.scilab.org/14741): The syntax `[m,e]=log2(x)` was not documented. As public function `frexp` was in duplicate with `[m,e]=log2(x)`.
 * [#14742](https://bugzilla.scilab.org/14742): `mprintf`, `msprintf` a non finite number displayed nothing.
 * [#14746](https://bugzilla.scilab.org/14746): Tiny numbers were sometimes displayed as 0.
index 9ac5ea1..ce2a945 100644 (file)
@@ -912,19 +912,19 @@ grand(12,"prm",(1:7)')
 // Showing the first and last layers.
 R = grand(10,10,10,"nor",0,1);
 subplot(1,2,1)
-hist3d(R(:,:,1));
+bar3d(R(:,:,1));
 xtitle("Layer 1");
 subplot(1,2,2)
-hist3d(R(:,:,10));
+bar3d(R(:,:,10));
 xtitle("Layer 10");
  ]]></programlisting>
         <scilab:image localized="true">
             R = grand(10,10,10,"nor",0,1);
             subplot(1,2,1)
-            hist3d(R(:,:,1));
+            bar3d(R(:,:,1));
             xtitle("Layer 1");
             subplot(1,2,2)
-            hist3d(R(:,:,10));
+            bar3d(R(:,:,10));
             xtitle("Layer 10");
         </scilab:image>
     </refsection>
index 77c5959..23c8c5a 100644 (file)
@@ -879,19 +879,19 @@ grand(12, "prm", (1:7)')
 // Affichage de la première et dernière couches.
 R = grand(10,10,10,"nor",0,1);
 subplot(1,2,1)
-hist3d(R(:,:,1));
+bar3d(R(:,:,1));
 xtitle("Couche 1");
 subplot(1,2,2)
-hist3d(R(:,:,10));
+bar3d(R(:,:,10));
 xtitle("Couche 10");
  ]]></programlisting>
         <scilab:image localized="true">
             R = grand(10,10,10,"nor",0,1);
             subplot(1,2,1)
-            hist3d(R(:,:,1));
+            bar3d(R(:,:,1));
             xtitle("Couche 1");
             subplot(1,2,2)
-            hist3d(R(:,:,10));
+            bar3d(R(:,:,10));
             xtitle("Couche 10");
         </scilab:image>
     </refsection>
index 565a9ee..c71930d 100644 (file)
@@ -915,19 +915,19 @@ grand(12,"prm",(1:7)')
 // Показаны только первый и последний слои.
 R = grand(10,10,10,"nor",0,1);
 subplot(1,2,1)
-hist3d(R(:,:,1));
+bar3d(R(:,:,1));
 xtitle("Слой 1");
 subplot(1,2,2)
-hist3d(R(:,:,10));
+bar3d(R(:,:,10));
 xtitle("Слой 10");
  ]]></programlisting>
         <scilab:image localized="true">
             R = grand(10,10,10,"nor",0,1);
             subplot(1,2,1)
-            hist3d(R(:,:,1));
+            bar3d(R(:,:,1));
             xtitle("Слой 1");
             subplot(1,2,2)
-            hist3d(R(:,:,10));
+            bar3d(R(:,:,10));
             xtitle("Слой 10");
         </scilab:image>
     </refsection>
@@ -4,24 +4,24 @@
 //
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
-function demo_hist3d()
+function demo_bar3d()
 
     my_handle             = scf(100001);
     clf(my_handle,"reset");
-    demo_viewCode("hist3d.dem.sce");
+    demo_viewCode("bar3d.dem.sce");
 
     // DEMO START
-    my_plot_desc          = "hist3d: Average monthly temperatures in french cities";
+    my_plot_desc = "bar3d: Average monthly temperatures in french cities";
     my_handle.figure_name = my_plot_desc;
 
-    hist3d();
+    bar3d();
     xtitle(my_plot_desc," "," "," ");
     // DEMO END
 
 endfunction
 
-demo_hist3d();
-clear demo_hist3d;
+demo_bar3d();
+clear demo_bar3d;
 
 
 
index 1aab866..a9fac22 100644 (file)
@@ -15,7 +15,7 @@ subdemolist=[
     _("Bars (custom)")       , "bars_custom.dem.sce"
     _("Bars (grouped)")      , "bar.dem.sce"
     _("histplot")            , "histplot.dem.sce"
-    _("hist3d")              , "hist3d.dem.sce"
+    _("bar3d")               , "bar3d.dem.sce"
     ];
 
 
index 607fc25..f9c2083 100644 (file)
@@ -226,13 +226,13 @@ legend(["normalized histogram" "frequency polygon chart"],"lower_caption");
                 <link linkend="histc">histc</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
             <member>
-                <link linkend="plot2d">plot2d</link>
+                <link linkend="bar">bar</link>
             </member>
             <member>
-                <link linkend="bar">bar</link>
+                <link linkend="plot2d">plot2d</link>
             </member>
             <member>
                 <link linkend="dsearch">dsearch</link>
diff --git a/scilab/modules/graphics/help/en_US/3d_plot/bar3d.xml b/scilab/modules/graphics/help/en_US/3d_plot/bar3d.xml
new file mode 100644 (file)
index 0000000..22297cc
--- /dev/null
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Serge Steer
+ * 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:ns4="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="bar3d" xml:lang="en">
+    <refnamediv>
+        <refname>bar3d</refname>
+        <refpurpose>3D representation of a histogram</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Syntax</title>
+        <synopsis>bar3d(mtx,[theta,alpha,leg,flag,ebox])
+            bar3d(mtx,&lt;opt_args&gt;)
+            bar3d(list(mtx,x,y),[theta,alpha,leg,flag,ebox])
+            bar3d(list(mtx,x,y),&lt;opt_args&gt;)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>mtx</term>
+                <listitem>
+                    <para>matrix of size (m,n) defining the histogram
+                        <literal>mtx(i,j)=F(x(i),y(j))</literal>, where <literal>x</literal>
+                        and <literal>y</literal> are taken as <literal>0:m</literal> and
+                        <literal>0:n</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>list(mtx,x,y)</term>
+                <listitem>
+                    <para>where mtx is a matrix of size (m,n)defining the histogram
+                        <literal>mtx(i,j)=F(x(i),y(j))</literal>, with <literal>x</literal>
+                        and <literal>y</literal> vectors of size (1,m+1) and (1,n+1).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;opt_args&gt;</term>
+                <listitem>
+                    <para>
+                        This represents a sequence of statements <literal>key1=value1,
+                            key2=value2
+                        </literal>
+                        ,... where <literal>key1</literal>,
+                        <literal>key2,...</literal> can be one of the following: theta,
+                        alpha,leg,flag,ebox. See <link linkend="plot3d">plot3d</link>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>theta,alpha,leg,flag,ebox</term>
+                <listitem>
+                    <para>
+                        see <link linkend="plot3d">plot3d</link>.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            <literal>bar3d</literal> represents a 2d histogram as a 3D plot.
+            The values are associated to the intervals <literal>[x(i) x(i+1)[ X [y(i)
+                y(i+1)[
+            </literal>
+            .
+        </para>
+        <para>
+            Enter the command <literal>bar3d()</literal> to see a demo.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Examples</title>
+        <programlisting role="example"><![CDATA[
+        bar3d();
+ ]]></programlisting>
+
+        <scilab:image localized="true">bar3d();</scilab:image>
+        <programlisting role="example"><![CDATA[
+bar3d(10*rand(10,10));
+ ]]></programlisting>
+        <scilab:image>bar3d(10*rand(10,10));</scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+Index = find(Z==0);
+Z(Index) = %nan;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            Index = find(Z==0);
+            Z(Index) = %nan;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+A = abs(rand(10,5));
+Z(91:100,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            A = abs(rand(10,5));
+            Z(91:100,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+    </refsection>
+    <refsection role="see also">
+        <title>See also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="hist3d">hist3d</link>
+            </member>
+            <member>
+                <link linkend="histplot">histplot</link>
+            </member>
+            <member>
+                <link linkend="plot3d">plot3d</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <title>履歴</title>
+        <title>Histórico</title>
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                  <para>bar3d() introduced, equal to the current hist3d() to be redefined.</para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 0b7d475..2805eb0 100644 (file)
           xmlns:scilab="http://www.scilab.org"  xml:id="hist3d" xml:lang="en">
     <refnamediv>
         <refname>hist3d</refname>
-        <refpurpose>3D representation of a histogram</refpurpose>
+      <refpurpose>3D representation of a histogram  (<emphasis role="bold">obsolete</emphasis>)
+        </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>hist3d(mtx,[theta,alpha,leg,flag,ebox])
+        <synopsis>
+            hist3d(mtx,[theta,alpha,leg,flag,ebox])
             hist3d(mtx,&lt;opt_args&gt;)
             hist3d(list(mtx,x,y),[theta,alpha,leg,flag,ebox])
             hist3d(list(mtx,x,y),&lt;opt_args&gt;)
     </refsection>
     <refsection>
         <title>Description</title>
+        <warning>
+           Up to Scilab 6.0, <literal>hist3d()</literal> features are actually some
+           <literal>bar3d()</literal> ones. In Scilab 6.1.0, <literal>bar3d()</literal> is
+           introduced as a clone of <literal>hist3d()</literal>. From now on, please use
+           <literal>bar3d()</literal> in replacement of the former <literal>hist3d()</literal>.
+           <literal>hist3d()</literal> will be redefined in Scilab 6.2.0 to actually support 3D
+            histogram features.
+        </warning>
         <para>
             <literal>hist3d</literal> represents a 2d histogram as a 3D plot.
             The values are associated to the intervals <literal>[x(i) x(i+1)[ X [y(i)
@@ -167,4 +177,17 @@ isoview off
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                   <para>
+                     The current implementation of hist3d() is declared obsolete. Use bar3d() instead.
+                  </para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index d7a56a9..0ecaf73 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="hist3d">hist3d</link>
+                    <link linkend="bar3d">bar3d</link>
                 </term>
                 <listitem>
-                    <para>3D representation of a histogram</para>
+                    <para>3D representation of a bar diagram</para>
                     <para>
                         <emphasis role="bold">Example:</emphasis>
                     </para>
                     <para>
-                        <scilab:image>hist3d();</scilab:image>
+                        <scilab:image>bar3d();</scilab:image>
                     </para>
                 </listitem>
             </varlistentry>
index 4bd3cc4..31647a7 100644 (file)
@@ -82,7 +82,7 @@
             param3d()
 
             subplot(2,2,4)
-            hist3d()
+            bar3d()
  ]]></programlisting>
         <scilab:image>
             subplot(221)
@@ -92,7 +92,7 @@
             subplot(2,2,3)
             param3d()
             subplot(2,2,4)
-            hist3d()
+            bar3d()
         </scilab:image>
         <para/>
         <para>
index dd88c1d..fda82db 100644 (file)
@@ -210,7 +210,7 @@ bar(x,y,0.2,'green');
                 <link linkend="polyline_properties">polyline_properties</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
         </simplelist>
     </refsection>
index 9aeaf25..e8d1f84 100644 (file)
@@ -208,13 +208,13 @@ legend(["Histogramme normalisé" "Courbe des fréquences"],"lower_caption");
                 <link linkend="histc">histc</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
             <member>
-                <link linkend="plot2d">plot2d</link>
+                <link linkend="bar">bar</link>
             </member>
             <member>
-                <link linkend="bar">bar</link>
+                <link linkend="plot2d">plot2d</link>
             </member>
             <member>
                 <link linkend="dsearch">dsearch</link>
diff --git a/scilab/modules/graphics/help/fr_FR/3d_plot/bar3d.xml b/scilab/modules/graphics/help/fr_FR/3d_plot/bar3d.xml
new file mode 100644 (file)
index 0000000..5349225
--- /dev/null
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Serge Steer
+ * 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:ns4="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="bar3d" xml:lang="fr">
+    <refnamediv>
+        <refname>bar3d</refname>
+        <refpurpose>représentation 3D d'un histogramme</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Séquence d'appel</title>
+        <synopsis>bar3d(mtx,[theta,alpha,leg,flag,ebox])
+            bar3d(mtx,&lt;opt_args&gt;)
+            bar3d(list(mtx,x,y),[theta,alpha,leg,flag,ebox])
+            bar3d(list(mtx,x,y),&lt;opt_args&gt;)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Paramètres</title>
+        <variablelist>
+            <varlistentry>
+                <term>mtx</term>
+                <listitem>
+                    <para>matrice de taille (m,n) définissant l'histogramme
+                        <literal>mtx(i,j)=F(x(i),y(j))</literal>, où <literal>x</literal> et
+                        <literal>y</literal> sont considérés égaux à <literal>0:m</literal>
+                        et <literal>0:n</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>list(mtx,x,y)</term>
+                <listitem>
+                    <para>où mtx est une matrice de taille (m,n) définissant
+                        l'histogramme <literal>mtx(i,j)=F(x(i),y(j))</literal>, avec
+                        <literal>x</literal> et <literal>y</literal> deux vecteurs de
+                        tailles respectives (1,m+1) et (1,n+1).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;opt_args&gt;</term>
+                <listitem>
+                    <para>
+                        Représente une séquence de la forme <literal>clé1=valeur1,
+                            clé2=valeur2
+                        </literal>
+                        ,... où <literal>clé1,
+                            clé2,...
+                        </literal>
+                        peut être n'importe quel paramètre optionnel de <link linkend="plot3d">plot3d</link>
+                        (<literal>theta,alpha,leg,flag,ebox</literal>).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>theta,alpha,leg,flag,ebox</term>
+                <listitem>
+                    <para>
+                        voir <link linkend="plot3d">plot3d</link>.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            <literal>bar3d</literal> représente un histogramme 2D dans
+            l'espace. Les valeurs sont associées aux intervalles <literal>[x(i)
+                x(i+1)[ X [y(i) y(i+1)[
+            </literal>
+            .
+        </para>
+        <para>
+            Taper <literal>bar3d()</literal> pour voir une démonstration de la
+            fonction.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Exemples</title>
+        <programlisting role="example"><![CDATA[
+        bar3d();
+ ]]></programlisting>
+        <scilab:image localized="true">bar3d();</scilab:image>
+        <programlisting role="example"><![CDATA[
+bar3d(10*rand(10,10));
+ ]]></programlisting>
+        <scilab:image>bar3d(10*rand(10,10));</scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+Index = find(Z==0);
+Z(Index) = %nan;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            Index = find(Z==0);
+            Z(Index) = %nan;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+A = abs(rand(10,5));
+Z(91:100,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            A = abs(rand(10,5));
+            Z(91:100,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+    </refsection>
+    <refsection role="see also">
+        <title>Voir aussi</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="hist3d">hist3d</link>
+            </member>
+            <member>
+                <link linkend="histplot">histplot</link>
+            </member>
+            <member>
+                <link linkend="plot3d">plot3d</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                  <para>Introduction de bar3d(), égal à l'actuel hist3d() à redéfinir.</para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 051518c..087dcc9 100644 (file)
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Serge Steer
+ * 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:ns4="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="hist3d" xml:lang="fr">
     <refnamediv>
         <refname>hist3d</refname>
-        <refpurpose>représentation 3D d'un histogramme</refpurpose>
+        <refpurpose>représentation 3D d'un histogramme  (<emphasis role="bold">obsolète</emphasis>)
+        </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
     </refsection>
     <refsection>
         <title>Description</title>
+        <warning>
+           Jusqu'à Scilab 6.0 inclus, les fonctionnalités de <literal>hist3d()</literal> sont en
+           réalité celles d'une fonction <literal>bar3d()</literal>. <literal>bar3d()</literal> est
+           introduite dans Scilab 6.1.0 comme un clone de <literal>hist3d()</literal> et doit
+           désormais être utilisée à l'identique à sa place. <literal>hist3d()</literal> sera
+           redéfinie dans Scilab 6.2.0 pour réellement proposer les fonctionnalités
+           d'histogrammisation 3D à deux variables.
+        </warning>
         <para>
             <literal>hist3d</literal> représente un histogramme 2D dans
             l'espace. Les valeurs sont associées aux intervalles <literal>[x(i)
@@ -156,4 +180,18 @@ isoview off
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Historique</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                   <para>
+                     L'actuelle implémentation de hist3d() est déclarée obsolète. Utiliser bar3d()
+                     à l'identique à la place.
+                  </para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index a430b2f..4107e85 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="hist3d">hist3d</link>
+                    <link linkend="bar3d">bar3d</link>
                 </term>
                 <listitem>
-                    <para>représentation d'un histogramme en 3D</para>
+                    <para>représentation d'un diagramme à barres en 3D</para>
                     <para>
                         <emphasis role="bold">Exemple:</emphasis>
                     </para>
                     <para>
-                        <scilab:image>hist3d();</scilab:image>
+                        <scilab:image>bar3d();</scilab:image>
                     </para>
                 </listitem>
             </varlistentry>
index 67cc8b3..ca30f5e 100644 (file)
@@ -88,7 +88,7 @@
             param3d()
 
             subplot(2,2,4)
-            hist3d()
+            bar3d()
  ]]></programlisting>
         <scilab:image>
             subplot(221)
@@ -98,7 +98,7 @@
             subplot(2,2,3)
             param3d()
             subplot(2,2,4)
-            hist3d()
+            bar3d()
         </scilab:image>
         <para/>
         <para>
index 5627d57..3737a9a 100644 (file)
@@ -204,7 +204,7 @@ bar(x,y,0.2,'green');
                 <link linkend="polyline_properties">polyline_properties</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
         </simplelist>
     </refsection>
index 040e729..ff431b7 100644 (file)
@@ -242,13 +242,13 @@ legend(["normalized histogram" "frequency polygon chart"],"lower_caption");
                 <link linkend="histc">histc</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
             <member>
-                <link linkend="plot2d">plot2d</link>
+                <link linkend="bar">bar</link>
             </member>
             <member>
-                <link linkend="bar">bar</link>
+                <link linkend="plot2d">plot2d</link>
             </member>
             <member>
                 <link linkend="dsearch">dsearch</link>
diff --git a/scilab/modules/graphics/help/ja_JP/3d_plot/bar3d.xml b/scilab/modules/graphics/help/ja_JP/3d_plot/bar3d.xml
new file mode 100644 (file)
index 0000000..8aab9c6
--- /dev/null
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Serge Steer
+ * 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:ns4="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="bar3d" xml:lang="ja">
+    <refnamediv>
+        <refname>bar3d</refname>
+        <refpurpose>3次元ヒストグラム</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>呼び出し手順</title>
+        <synopsis>
+            bar3d(mtx,[theta,alpha,leg,flag,ebox])
+            bar3d(mtx,&lt;opt_args&gt;)
+            bar3d(list(mtx,x,y),[theta,alpha,leg,flag,ebox])
+            bar3d(list(mtx,x,y),&lt;opt_args&gt;)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>引数</title>
+        <variablelist>
+            <varlistentry>
+                <term>mtx</term>
+                <listitem>
+                    <para>大きさ (m,n) の行列で, ヒストグラム
+                        <literal>mtx(i,j)=F(x(i),y(j))</literal>を定義します. ただし, <literal>x</literal>
+                        および <literal>y</literal> は <literal>0:m</literal> および
+                        <literal>0:n</literal>の範囲とします.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>list(mtx,x,y)</term>
+                <listitem>
+                    <para>
+                        mtxは大きさ(m,n)の行列で,ヒストグラム<literal>mtx(i,j)=F(x(i),y(j))</literal>
+                        を定義します.<literal>x</literal>
+                        および <literal>y</literal> は, 大きさ (1,m+1) および (1,n+1)のベクトルです.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>&lt;opt_args&gt;</term>
+                <listitem>
+                    <para>
+                        一連の命令<literal>key1=value1,
+                            key2=value2
+                        </literal>
+                        ,...を定義します.ただし, <literal>key1</literal>,
+                        <literal>key2,...</literal> には以下のどれかを指定できます: theta,
+                        alpha,leg,flag,ebox.  <link linkend="plot3d">plot3d</link>を参照ください.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>theta,alpha,leg,flag,ebox</term>
+                <listitem>
+                    <para>
+                        <link linkend="plot3d">plot3d</link>を参照くださ.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>説明</title>
+        <para>
+            <literal>bar3d</literal> は2次元ヒストグラムを3次元プロットとして
+            表します.この値は,間隔<literal>[x(i) x(i+1)[ X [y(i)
+                y(i+1)[
+            </literal>
+            に関連します.
+        </para>
+        <para>
+            コマンド <literal>bar3d()</literal> を入力するとデモを参照できます.
+        </para>
+    </refsection>
+    <refsection>
+        <title>例</title>
+        <programlisting role="example"><![CDATA[
+        bar3d();
+ ]]></programlisting>
+        <scilab:image localized="true">bar3d();</scilab:image>
+        <programlisting role="example"><![CDATA[
+bar3d(10*rand(10,10));
+ ]]></programlisting>
+        <scilab:image>bar3d(10*rand(10,10));</scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+Index = find(Z==0);
+Z(Index) = %nan;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            Index = find(Z==0);
+            Z(Index) = %nan;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+A = abs(rand(10,5));
+Z(91:100,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            A = abs(rand(10,5));
+            Z(91:100,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+    </refsection>
+    <refsection role="see also">
+        <title>参照</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="hist3d">hist3d</link>
+            </member>
+            <member>
+                <link linkend="histplot">histplot</link>
+            </member>
+            <member>
+                <link linkend="plot3d">plot3d</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                  <para>bar3d() introduced, equal to the current hist3d() to be redefined.</para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 4a25af8..fb0ed5e 100644 (file)
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) INRIA - Serge Steer
-
  * 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,
  * 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:ns4="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="hist3d" xml:lang="ja">
-
     <refnamediv>
-
         <refname>hist3d</refname>
-
-        <refpurpose>3次元ヒストグラム</refpurpose>
-
+        <refpurpose>3次元ヒストグラム  (<emphasis role="bold">obsolete</emphasis>)
+        </refpurpose>
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>
-
             hist3d(mtx,[theta,alpha,leg,flag,ebox])
-
             hist3d(mtx,&lt;opt_args&gt;)
-
             hist3d(list(mtx,x,y),[theta,alpha,leg,flag,ebox])
-
             hist3d(list(mtx,x,y),&lt;opt_args&gt;)
-
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>mtx</term>
-
                 <listitem>
-
                     <para>大きさ (m,n) の行列で, ヒストグラム
-
                         <literal>mtx(i,j)=F(x(i),y(j))</literal>を定義します. ただし, <literal>x</literal>
-
                         および <literal>y</literal> は <literal>0:m</literal> および
-
                         <literal>0:n</literal>の範囲とします.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>list(mtx,x,y)</term>
-
                 <listitem>
-
                     <para>
-
                         mtxは大きさ(m,n)の行列で,ヒストグラム<literal>mtx(i,j)=F(x(i),y(j))</literal>
-
                         を定義します.<literal>x</literal>
-
                         および <literal>y</literal> は, 大きさ (1,m+1) および (1,n+1)のベクトルです.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>&lt;opt_args&gt;</term>
-
                 <listitem>
-
                     <para>
-
                         一連の命令<literal>key1=value1,
-
                             key2=value2
-
                         </literal>
-
                         ,...を定義します.ただし, <literal>key1</literal>,
-
                         <literal>key2,...</literal> には以下のどれかを指定できます: theta,
-
                         alpha,leg,flag,ebox.  <link linkend="plot3d">plot3d</link>を参照ください.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>theta,alpha,leg,flag,ebox</term>
-
                 <listitem>
-
                     <para>
-
                         <link linkend="plot3d">plot3d</link>を参照くださ.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
+        <warning>
+           Up to Scilab 6.0, <literal>hist3d()</literal> features are actually some
+           <literal>bar3d()</literal> ones. In Scilab 6.1.0, <literal>bar3d()</literal> is
+           introduced as a clone of <literal>hist3d()</literal>. From now on, please use
+           <literal>bar3d()</literal> in replacement of the former <literal>hist3d()</literal>.
+           <literal>hist3d()</literal> will be redefined in Scilab 6.2.0 to actually support 3D
+            histogram features.
+        </warning>
         <para>
-
             <literal>hist3d</literal> は2次元ヒストグラムを3次元プロットとして
-
             表します.この値は,間隔<literal>[x(i) x(i+1)[ X [y(i)
-
                 y(i+1)[
-
             </literal>
-
             に関連します.
-
         </para>
-
         <para>
-
             コマンド <literal>hist3d()</literal> を入力するとデモを参照できます.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-
         hist3d();
-
  ]]></programlisting>
-
         <scilab:image localized="true">hist3d();</scilab:image>
-
         <programlisting role="example"><![CDATA[
-
 hist3d(10*rand(10,10));
-
  ]]></programlisting>
-
         <scilab:image>hist3d(10*rand(10,10));</scilab:image>
-
         <programlisting role="example"><![CDATA[
-
 Z = zeros(100,5);
-
 A = abs(rand(40,5));
-
 Z(1:40,:) = A;
-
 scf();
-
 hist3d(Z);
 isoview off
-
  ]]></programlisting>
-
         <scilab:image>
-
             Z = zeros(100,5);
-
             A = abs(rand(40,5));
-
             Z(1:40,:) = A;
-
             scf();
-
             hist3d(Z);
             isoview off
         </scilab:image>
-
         <programlisting role="example"><![CDATA[
-
 Z = zeros(100,5);
-
 A = abs(rand(40,5));
-
 Z(1:40,:) = A;
-
 Index = find(Z==0);
-
 Z(Index) = %nan;
-
 scf();
-
 hist3d(Z);
 isoview off
-
  ]]></programlisting>
-
         <scilab:image>
-
             Z = zeros(100,5);
-
             A = abs(rand(40,5));
-
             Z(1:40,:) = A;
-
             Index = find(Z==0);
-
             Z(Index) = %nan;
-
             scf();
-
             hist3d(Z);
             isoview off
-
         </scilab:image>
-
         <programlisting role="example"><![CDATA[
-
 Z = zeros(100,5);
-
 A = abs(rand(40,5));
-
 Z(1:40,:) = A;
-
 A = abs(rand(10,5));
-
 Z(91:100,:) = A;
-
 scf();
-
 hist3d(Z);
 isoview off
  ]]></programlisting>
-
         <scilab:image>
-
             Z = zeros(100,5);
-
             A = abs(rand(40,5));
-
             Z(1:40,:) = A;
-
             A = abs(rand(10,5));
-
             Z(91:100,:) = A;
-
             scf();
-
             hist3d(Z);
             isoview off
             gca().rotation_angles = [30 50];
         </scilab:image>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="histplot">histplot</link>
-
             </member>
-
             <member>
-
                 <link linkend="plot3d">plot3d</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                   <para>
+                     The current implementation of hist3d() is declared obsolete. Use bar3d() instead.
+                  </para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
\ No newline at end of file
index 9c2f93d..65fc855 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="hist3d">hist3d</link>
+                    <link linkend="bar3d">bar3d</link>
                 </term>
                 <listitem>
-                    <para>ヒストグラムの3次元表現3</para>
+                    <para>棒グラフの3D表現</para>
                     <para>
                         <emphasis role="bold">例:</emphasis>
                     </para>
                     <para>
-                        <scilab:image>hist3d();</scilab:image>
+                        <scilab:image>bar3d();</scilab:image>
                     </para>
                 </listitem>
             </varlistentry>
index e06e24a..57f7562 100644 (file)
@@ -79,7 +79,7 @@
             param3d()
 
             subplot(2,2,4)
-            hist3d()
+            bar3d()
  ]]></programlisting>
         <scilab:image>
             subplot(221)
@@ -89,7 +89,7 @@
             subplot(2,2,3)
             param3d()
             subplot(2,2,4)
-            hist3d()
+            bar3d()
         </scilab:image>
         <para/>
         <para>
index b78e239..162cc5f 100644 (file)
@@ -358,7 +358,7 @@ bar(x,y,0.2,'green');
                 <link linkend="polyline_properties">polyline_properties</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
         </simplelist>
     </refsection>
index 516dfcf..f363b40 100644 (file)
@@ -140,7 +140,7 @@ clf(); histplot(20, d, leg='rand(1,10000,''normal'')', style=16, rect=[-3,0,3,0.
                 <emphasis role="bold">Exemplo #2</emphasis> :
                 histograma de uma amsostra binomial (B(6,0.5)) aleatória
             </para>
-                <programlisting role="example"><![CDATA[
+            <programlisting role="example"><![CDATA[
 d = grand(1000,1,"bin", 6, 0.5);
 c = linspace(-0.5,6.5,8);
 
@@ -158,7 +158,7 @@ xtitle("histograma não normalizado")
                 <emphasis role="bold">Exemplo #3</emphasis> :
                 histograma de uma amostra exponencial aleatória
             </para>
-                <programlisting role="example"><![CDATA[
+            <programlisting role="example"><![CDATA[
 lambda = 2;
 X = grand(100000,1,"exp", 1/lambda);
 Xmax = max(X);
@@ -168,7 +168,7 @@ histplot(40, X, style=2);
 x = linspace(0,max(Xmax),100)';
 plot2d(x,lambda*exp(-lambda*x),strf="000",style=5)
 legend(["histograma de amostra exponencial aleatória" "curva de densidade exata"]);
-]]></programlisting>
+        ]]></programlisting>
             <para/>
             <para>
                 <emphasis role="bold">Exemplo #4</emphasis>:
@@ -186,15 +186,18 @@ legend(["histograma normalizado" "frequency polygon chart"],"lower_caption");
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="histc">histc</link>
             </member>
             <member>
-                <link linkend="plot2d">plot2d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
             <member>
                 <link linkend="bar">bar</link>
             </member>
             <member>
+                <link linkend="plot2d">plot2d</link>
+            </member>
+            <member>
                 <link linkend="dsearch">dsearch</link>
             </member>
         </simplelist>
diff --git a/scilab/modules/graphics/help/pt_BR/3d_plot/bar3d.xml b/scilab/modules/graphics/help/pt_BR/3d_plot/bar3d.xml
new file mode 100644 (file)
index 0000000..c8e439e
--- /dev/null
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Serge Steer
+ * 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:ns4="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="bar3d" xml:lang="pt">
+    <refnamediv>
+        <refname>bar3d</refname>
+        <refpurpose>representação 3d de um histograma</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Seqüência de Chamamento</title>
+        <synopsis>bar3d(mtx,[theta,alpha,leg,flag,ebox])
+            bar3d(mtx,&lt;opt_args&gt;)
+            bar3d(list(mtx,x,y),[theta,alpha,leg,flag,ebox])
+            bar3d(list(mtx,x,y),&lt;opt_args&gt;)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Parâmetros</title>
+        <variablelist>
+            <varlistentry>
+                <term>mtx</term>
+                <listitem>
+                    <para>matriz de tamanho (m,n) definindo o histograma
+                        <literal>mtx(i,j)=F(x(i),y(j))</literal>, onde <literal>x</literal>
+                        e <literal>y</literal> asão tomados como <literal>0:m</literal> e
+                        <literal>0:n</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>list(mtx,x,y)</term>
+                <listitem>
+                    <para>onde f é uma matriz de tamanho (m,n) definindo o histograma
+                        <literal>mtx(i,j)=F(x(i),y(j))</literal>, com vetores
+                        <literal>x</literal> e <literal>y</literal> de tamanho (1,n+1) e
+                        (1,m+1).
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>theta,alpha,leg,flag,ebox</term>
+                <listitem>
+                    <para>
+                        ver <literal>plot3d</literal>.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Descrição</title>
+        <para>
+            <literal>bar3d</literal> representa um histograma 2d como um esboço
+            3d. Os valores são associados aos intervalos <literal>[x(i) x(i+1)[ X
+                [y(i) y(i+1)[
+            </literal>
+            .
+        </para>
+        <para>
+            Entre com o comando <literal>bar3d()</literal> para visualizar uma
+            demonstração.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+        bar3d();
+ ]]></programlisting>
+        <scilab:image localized="true">bar3d();</scilab:image>
+        <programlisting role="example"><![CDATA[
+bar3d(10*rand(10,10));
+ ]]></programlisting>
+        <scilab:image>bar3d(10*rand(10,10));</scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+Index = find(Z==0);
+Z(Index) = %nan;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            Index = find(Z==0);
+            Z(Index) = %nan;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
+Z = zeros(100,5);
+A = abs(rand(40,5));
+Z(1:40,:) = A;
+A = abs(rand(10,5));
+Z(91:100,:) = A;
+scf();
+bar3d(Z);
+ ]]></programlisting>
+        <scilab:image>
+            Z = zeros(100,5);
+            A = abs(rand(40,5));
+            Z(1:40,:) = A;
+            A = abs(rand(10,5));
+            Z(91:100,:) = A;
+            scf();
+            bar3d(Z);
+        </scilab:image>
+    </refsection>
+    <refsection>
+        <title>Ver Também</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="hist3d">hist3d</link>
+            </member>
+            <member>
+                <link linkend="histplot">histplot</link>
+            </member>
+            <member>
+                <link linkend="plot3d">plot3d</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                  <para>bar3d() introduced, equal to the current hist3d() to be redefined.</para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 941f903..470c505 100644 (file)
@@ -20,7 +20,8 @@
           xmlns:scilab="http://www.scilab.org" xml:id="hist3d" xml:lang="pt">
     <refnamediv>
         <refname>hist3d</refname>
-        <refpurpose>representação 3d de um histograma</refpurpose>
+        <refpurpose>representação 3d de um histograma   (<emphasis role="bold">obsoleto</emphasis>)
+        </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
     </refsection>
     <refsection>
         <title>Descrição</title>
+        <warning>
+           Up to Scilab 6.0, <literal>hist3d()</literal> features are actually some
+           <literal>bar3d()</literal> ones. In Scilab 6.1.0, <literal>bar3d()</literal> is
+           introduced as a clone of <literal>hist3d()</literal>. From now on, please use
+           <literal>bar3d()</literal> in replacement of the former <literal>hist3d()</literal>.
+           <literal>hist3d()</literal> will be redefined in Scilab 6.2.0 to actually support 3D
+            histogram features.
+        </warning>
         <para>
             <literal>hist3d</literal> representa um histograma 2d como um esboço
             3d. Os valores são associados aos intervalos <literal>[x(i) x(i+1)[ X
@@ -156,4 +165,17 @@ isoview off
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.1.0</revnumber>
+                <revdescription>
+                   <para>
+                     The current implementation of hist3d() is declared obsolete. Use bar3d() instead.
+                  </para>
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index de6d208..62a8615 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>hist3d</term>
+                <term>bar3d</term>
                 <listitem>
-                    <para>representação 3d de um histograma</para>
+                    <para>representação 3D do diagrama de barras</para>
+                    <para>
+                        <scilab:image>bar3d();</scilab:image>
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
index 9176bdf..19b91b6 100644 (file)
         <programlisting role="example"><![CDATA[
 subplot(221)
 plot2d()
+
 subplot(222)
 plot3d()
+
 subplot(2,2,3)
 param3d()
+
 subplot(2,2,4)
-hist3d()
+bar3d()
  ]]></programlisting>
+        <scilab:image>
+            subplot(221)
+            plot2d()
+            subplot(222)
+            plot3d()
+            subplot(2,2,3)
+            param3d()
+            subplot(2,2,4)
+            bar3d()
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
index fe9c0b0..72f0ea0 100644 (file)
@@ -178,7 +178,7 @@ bar(x,y,0.2,'green');
                 <link linkend="polyline_properties">polyline_properties</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
         </simplelist>
     </refsection>
index fedc712..1f63877 100644 (file)
         </variablelist>
     </refsection>
     <refsection>
-        <title>3d plotting</title>
+        <title>Трёхмерные графики</title>
         <variablelist>
             <varlistentry>
                 <term>
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="hist3d">hist3d</link>
+                    <link linkend="bar3d">bar3d</link>
                 </term>
                 <listitem>
                     <para>
-                        Трёхмерное представление гистограммы
+                        Трёхмерное представление столбчатой диаграммы
                     </para>
                     <para>
                         <emphasis role="bold">Пример:</emphasis>
                     </para>
                     <para>
-                        <scilab:image>hist3d();</scilab:image>
+                        <scilab:image>bar3d();</scilab:image>
                     </para>
                 </listitem>
             </varlistentry>
                     <para>
                         <scilab:image>deff("[z]=surface(x,y)","z=sin(x)*cos(y)")
                             t=%pi*(-10:10)/10;
-                            // 3D plot of the surface
+                            // трёхмерный график поверхности
                             fplot3d(t,t,surface,35,45,"X@Y@Z")
-                            // now (t,t,sin(t).*cos(t)) is a curve on the surface
-                            // which can be drawn using geom3d and xpoly
+                            // теперь (t,t,sin(t).*cos(t)) является кривой на поверхности,
+                            // которая может быть нарисована используя geom3d и xpoly
                             [x,y]=geom3d(%pi/2,0,surface(%pi/2,0))
                         </scilab:image>
                     </para>
                             h1=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
                             h2=syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
                             clf();gainplot([h1;h2],0.01,100,['h1';'h2'])
-                            title('Gainplot');
+                            title('График коэффициента усиления');
                         </scilab:image>
                     </para>
                 </listitem>
index 66c221c..c8f5ad2 100644 (file)
@@ -85,7 +85,7 @@
             param3d()
 
             subplot(2,2,4)
-            hist3d()
+            bar3d()
  ]]></programlisting>
         <scilab:image>
             subplot(221)
@@ -95,7 +95,7 @@
             subplot(2,2,3)
             param3d()
             subplot(2,2,4)
-            hist3d()
+            bar3d()
         </scilab:image>
         <para/>
         <para>
diff --git a/scilab/modules/graphics/macros/bar3d.sci b/scilab/modules/graphics/macros/bar3d.sci
new file mode 100644 (file)
index 0000000..fcd3336
--- /dev/null
@@ -0,0 +1,98 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) INRIA
+// Copyright (C) 2012 - Scilab Enterprises - Adeline CARNIS
+//
+// 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.
+
+
+function bar3d(f,theta,alpha,leg,flags,ebox)
+    //!
+    nep=8
+
+    if ~isdef("theta","local") then theta = 35; end;
+    if ~isdef("alpha","local") then alpha = 45; end;
+    if ~isdef("leg","local") then leg = "X@Y@Z"; end;
+    if ~isdef("flags","local") then flags = [2 1 4]; end;
+
+    def=list(theta,alpha,leg,flags);
+    [lhs,rhs]=argn(0)
+    if rhs<=0 then  //demo
+        towns = ["Agen" "Bastia" "Chamonix" "Cognac" "Hyères" "Le Mans" "Le Puy" ..
+        "Lille" "Lorient" "Mende" ]
+        months = [_("January") _("Febuary") _("March") _("April") _("May") _("June")..
+        _("July") _("August") _("September") _("October") _("November") ..
+        _("December") _("Average") ]
+        months = "$\scalebox{1.3}{\rotatebox{90}{\mbox{" + months + "}}}$"
+
+        T = [5.7 5.9 9.8 12.1 16.0 19.4 21.8 21.5 18.4 14.7 9.3 5.2 13.5
+        9.4 9.4 11.2 13.3 17.3 21.0 24.1 24.5 21.2 17.6 13.3 10.4 16.1
+        -2.3 -0.8 3.0 6.6 11.2 14.4 15.5 15.9 12.5 8.6 2.7 -1.6 7.2
+        6.1 5.9 9.7 11.9 15.8 19.0 21.1 20.9 17.9 14.4 9.3 5.6 13.3
+        8.7 8.9 11.0 13.1 16.7 20.3 23.2 23.3 20.2 16.8 12.6 9.8 15.4
+        5.0 5.5 8.3 10.7 14.5 17.8 19.9 19.7 18.5 12.8 8.1 5.4 12.8
+        1.0 1.3 4.8 7.2 11.3 14.3 17.6 17.1 13.5 9.9 4.6 1.8 8.8
+        3.7 4.1 7.1 9.8 13.5 16.2 18.6 18.5 15.5 11.7 7.2 4.2 10.8
+        6.6 6.7 8.6 10.3 13.6 16.2 18.1 18.0 16.0 13.0 9.4 7.0 12.0
+        0.6 1.3 3.7 5.5 9.6 13.1 16.2 16.0 12.8 8.8 3.8 1.8 7.8
+        ];
+        bar3d(T)
+        ax = gca()
+        ax.y_ticks = tlist(["ticks" "locations" "labels"], (0:12)+0.5, months)
+        ax.x_ticks = tlist(["ticks" "locations" "labels"], (0:9)+0.5, towns)
+        zlabel("T [°C]")
+        xtitle(_("Average monthly temperatures in french cities"),"","")
+        ax.title.font_size = 3
+        ax.rotation_angles = [28 19]
+        return;
+    end
+    if typeof(f)=="list" then
+        [f,x,y]=f(1:3);
+        sx=prod(size(x));
+        sy=prod(size(y));
+        if [sx-1,sy-1]<>size(f) then
+            write(%io(2),"f: Incompatible length ");
+            return;
+        end
+        dx=(x(2)-x(1))/nep;
+        dy=(y(2)-y(1))/nep;
+        bnds=[x(1) x($), y(1) y($),min(0,min(f)) max(0,max(f))]
+        x=(x(1:sx-1)+x(2:sx))/2;
+        y=(y(1:sy-1)+y(2:sy))/2;
+        [nl,nc]=size(f);
+    else
+        [nl,nc]=size(f);
+        x=(1:nl)-(0.5)*ones(1,nl);
+        y=(1:nc)-(0.5)*ones(1,nc);
+        dx=1/nep; dy=1/nep;
+        bnds=[0 nl,0 nc,min(0,min(f)) max(0,max(f))]
+    end
+    x=x.*.[1,1] + dx*ones(x).*.[0,1] - dx*ones(x).*.[1,0];
+    y=y.*.[1,1] + dy*ones(y).*.[0,1] - dy*ones(y).*.[1,0];
+    a=[0;0;1;1]
+    b=[0;1;1;0]
+    c=[0;0;0;0]
+    d=[1;1;1;1]
+    ix=[b,b,a,a,c,d];
+    iy=[a,a,c,d,b,b];
+    indx=ones(1,nc) .*. (ones(1,nl).*.ix +(1:2:2*nl-1).*.ones(ix));
+    iy=matrix(iy,24,1);
+    //indy=(ones(1,nl).*.iy+(1:2:2*nl-1).*.ones(iy)) .*. ones(1,nc);
+    indy=(ones(1,nc).*.iy+(1:2:2*nc-1).*.ones(iy)) .*. ones(1,nl);
+    indy=matrix(indy,4,6*nc*nl);
+    [nnl,nnc]=size(indx);
+
+    xx=matrix(x(matrix(indx,1,nnl*nnc)),nnl,nnc);
+    yy=matrix(y(matrix(indy,1,nnl*nnc)),nnl,nnc);
+    zz=matrix(f,1,nl*nc).*.[c,d,b,b,a,a];
+
+    if ~isdef("ebox","local") then ebox = bnds; else "ebox = ebox"; end;
+    plot3d(xx,yy,zz,def(1),def(2),def(3),def(4),ebox)
+
+endfunction
index 43c9e7a..05bb93a 100644 (file)
 
 function hist3d(f,theta,alpha,leg,flags,ebox)
     //!
-    nep=8   // bars half widths = 1/nep
+    nep = 8   // bars half widths = 1/nep
 
     if ~isdef("theta","local") then theta = 35; end;
     if ~isdef("alpha","local") then alpha = 45; end;
     if ~isdef("leg","local") then leg = "X@Y@Z"; end;
     if ~isdef("flags","local") then flags = [2 1 4]; end;
 
-    def=list(theta,alpha,leg,flags);
+    def = list(theta,alpha,leg,flags);
     [lhs,rhs]=argn(0)
     if rhs<=0 then  //demo
         towns = ["Agen" "Bastia" "Chamonix" "Cognac" "Hyères" "Le Mans" "Le Puy" ..
@@ -58,6 +58,9 @@ function hist3d(f,theta,alpha,leg,flags,ebox)
         gcf().immediate_drawing = initDrawingMode;
         return
     end
+
+    warnobsolete("bar3d()","6.2.0")
+
     if typeof(f)=="list" then
         [f,x,y]=f(1:3);
         sx=prod(size(x));
index 8075779..690373d 100644 (file)
 // http://bugzilla.scilab.org/show_bug.cgi?id=2179
 //
 // <-- Short Description -->
-// Problem with hist3d and %nan. Create blank Screen or crash.
+// Problem with bar3d and %nan. Create blank Screen or crash.
 Z = zeros(100,5);
 A = abs(rand(40,5));
 Z(1:40,:) = A;
 scf();
-hist3d(Z);
+bar3d(Z);
 Index = find(Z==0);
 Z(Index) = %nan;
 scf();
-hist3d(Z);
+bar3d(Z);
 A = abs(rand(10,5));
 Z(91:100,:) = A;
 scf();
-hist3d(Z);
+bar3d(Z);
 // all the 3 created figures should display something
index 42ed66c..daddeb1 100644 (file)
 // http://bugzilla.scilab.org/show_bug.cgi?id=2179
 //
 // <-- Short Description -->
-// Problem with hist3d and %nan. Create blank Screen or crash.
+// Problem with bar3d and %nan. Create blank Screen or crash.
 
 Z = zeros(100,5);
 A = abs(rand(40,5));
 Z(1:40,:) = A;
 scf();
-hist3d(Z);
+bar3d(Z);
 Index = find(Z==0);
 Z(Index) = %nan;
 scf();
-hist3d(Z);
+bar3d(Z);
 A = abs(rand(10,5));
 Z(91:100,:) = A;
 scf();
-hist3d(Z); 
+bar3d(Z); 
 
 // all the 3 created figures should display something
 
index ece4c91..bb59537 100644 (file)
@@ -16,5 +16,5 @@
 A=rand(10,10);
 b=[linspace(1,10,11)];
 c=[linspace(10,20,11)];
-hist3d(list(A,b,c),leg="A@b@c");
+bar3d(list(A,b,c),leg="A@b@c");
 // should not display any warning or error
index f234130..6bf8b39 100644 (file)
@@ -19,7 +19,7 @@
 A=rand(10,10);
 b=[linspace(1,10,11)];
 c=[linspace(10,20,11)];
-hist3d(list(A,b,c),leg="A@b@c");
+bar3d(list(A,b,c),leg="A@b@c");
 
 // should not display any warning or error
 
index e1c8631..2d020d5 100644 (file)
 // http://bugzilla.scilab.org/show_bug.cgi?id=6641
 //
 // <-- Short Description -->
-// hist3d did not handle correctly optionals arguments.
+// bar3d did not handle correctly optionals arguments.
 //
 // run this :
 
-hist3d(10*rand(10,10),5,5,"x@u@p",[1,1,4],[-10,10,-10,10,-10,10]);
+bar3d(10*rand(10,10),5,5,"x@u@p",[1,1,4],[-10,10,-10,10,-10,10]);
 
 
 // legends should be "x", "u" and "p", and the bounding box [-10, 10] ^ 3
index afb5d06..a2481da 100644 (file)
@@ -57,15 +57,15 @@ Graphics_2.png=ca7d6e343da4cb84c5550b19b5111a5e
 Graphics_20.png=3039a9134c31453b49ff23776a4e6abf
 Graphics_21.png=e95387c52bc0f1f2bfc674b62c9bb537
 Graphics_22.png=1769acb58167f96070f6c71dcd54cbf2
-Graphics_23.png=9031d249fda1aeea0a14f05417e56bd7
+Graphics_23.png=c6b390df4f9b9e5ff3db3f891f1e5dce
 Graphics_24.png=90067203ae72d8ba7f61061a17f7d016
 Graphics_25.png=02e80dc6ec334a5caf5b2c918e68bad3
-Graphics_26.png=4bc6636c30fd29609f4bd77bfeaea661
+Graphics_26.png=066b94090d46cf054a92b56d45271b59
 Graphics_27.png=f81c4cf83b99442956c35722e86ec478
 Graphics_28.png=7fe04f65bcbeb65eef5f90b3759be02e
 Graphics_29.png=87ec396c51a7cc6aafb148e1aa5f9256
 Graphics_3.png=9d4c072a9f27f8f0e07f7d098ee533ec
-Graphics_30.png=67f6ae9c0d36df93eb50e514746aac13
+Graphics_30.png=340da0d425ed4d7cfd9edce7510846db
 Graphics_31.png=26826b399f567100ed0118a54c896b5a
 Graphics_32.png=26826b399f567100ed0118a54c896b5a
 Graphics_36.png=76950c3a78d543018ca046b7e5709d88
@@ -491,6 +491,15 @@ axes_properties_fr_FR_5.png=2906656fb92aaac4ad891cfa0347f142
 axes_properties_ja_JP_5.png=4969e3dd46c4d3d557cae0944088f2c3
 axes_properties_pt_BR_5.png=4969e3dd46c4d3d557cae0944088f2c3
 axes_properties_ru_RU_5.png=2906656fb92aaac4ad891cfa0347f142
+bar3d_2.png=0caa84acfe61437a06c48db9a08d103f
+bar3d_3.png=35310d7b9cd156c3aefa9ca750e9559f
+bar3d_4.png=05201cbc4ea6928c0b71ccccaef37f5a
+bar3d_5.png=c3b14b752909c9a660bd344ea2a9d4f7
+bar3d_en_US_1.png=c6b390df4f9b9e5ff3db3f891f1e5dce
+bar3d_fr_FR_1.png=c6b390df4f9b9e5ff3db3f891f1e5dce
+bar3d_ja_JP_1.png=c6b390df4f9b9e5ff3db3f891f1e5dce
+bar3d_pt_BR_1.png=c6b390df4f9b9e5ff3db3f891f1e5dce
+bar3d_ru_RU_1.png=c6b390df4f9b9e5ff3db3f891f1e5dce
 bar_1.png=968aa7a4f076bc4bd450f5ad25845434
 bar_2.png=f4c4662565d146bc03ba40b0344897aa
 bar_3.png=e658d6bd8080ca95d71ef70c5431f7c8
@@ -721,25 +730,25 @@ grand_en_US_2.png=24523563e0ae758b711cc2fd9d2ab0c6
 grand_en_US_3.png=50f697dbff8e5b6d2f7e9cbb87748bb5
 grand_en_US_4.png=91a301dc2bc17fd8e3c7c0ba58218e68
 grand_en_US_5.png=c97d5ef0523d9e1945db0e2c96f163f7
-grand_en_US_6.png=d997f508519a0d385bceb1f1a08a465d
+grand_en_US_6.png=374e805706f6315deb09329c0dc4ee9d
 grand_fr_FR_1.png=b244998d7d604f60de6e1a52a9556a02
 grand_fr_FR_2.png=35ddd9091d63685a8825fcbb0c97ec61
 grand_fr_FR_3.png=281fca0a3e29c4465904cf2d05ca8a65
 grand_fr_FR_4.png=15156b1094e0e9e6c6e0ffd06f253a78
 grand_fr_FR_5.png=1443d8a14b6726a33f86fa9700761ce8
-grand_fr_FR_6.png=d985091252a3f6a98631840bd47f127c
+grand_fr_FR_6.png=6eb71a42904c95ada35afd10d33103f1
 grand_pt_BR_1.png=23e73400616e24df73d92d49ae136ca8
 grand_pt_BR_2.png=24523563e0ae758b711cc2fd9d2ab0c6
 grand_pt_BR_3.png=50f697dbff8e5b6d2f7e9cbb87748bb5
 grand_pt_BR_4.png=91a301dc2bc17fd8e3c7c0ba58218e68
 grand_pt_BR_5.png=c97d5ef0523d9e1945db0e2c96f163f7
-grand_pt_BR_6.png=d997f508519a0d385bceb1f1a08a465d
+grand_pt_BR_6.png=374e805706f6315deb09329c0dc4ee9d
 grand_ru_RU_1.png=7476fe4532159919ef6fb083cab09542
 grand_ru_RU_2.png=85ab7a8d545ed270c78ac0867a5d640f
 grand_ru_RU_3.png=5a2fb0595561f307c034c883e13624a2
 grand_ru_RU_4.png=170b2f4f673f1fac9046f3d2fd7c5c2e
 grand_ru_RU_5.png=7878888671f2fa747c5a9a07399110b3
-grand_ru_RU_6.png=84813cf152d7ec12a8f01a8e3b92c1dd
+grand_ru_RU_6.png=ed08a1918cab6b83b153ade49a353a7c
 graycolormap_1.png=d833922c17d3d671dd79cee1e14578d8
 grayplot_1.png=a24a994d92924535d660c5655aaa2089
 grayplot_2.png=a9e3251523550c0c43869fdf37c7f127
index 8dc9d65..603667a 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_23.png and b/scilab/modules/helptools/images/Graphics_23.png differ
index 1497ca7..b2e2101 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_30.png and b/scilab/modules/helptools/images/Graphics_30.png differ
diff --git a/scilab/modules/helptools/images/bar3d_2.png b/scilab/modules/helptools/images/bar3d_2.png
new file mode 100644 (file)
index 0000000..10f7a79
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_2.png differ
diff --git a/scilab/modules/helptools/images/bar3d_3.png b/scilab/modules/helptools/images/bar3d_3.png
new file mode 100644 (file)
index 0000000..59b06ff
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_3.png differ
diff --git a/scilab/modules/helptools/images/bar3d_4.png b/scilab/modules/helptools/images/bar3d_4.png
new file mode 100644 (file)
index 0000000..8e6beda
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_4.png differ
diff --git a/scilab/modules/helptools/images/bar3d_5.png b/scilab/modules/helptools/images/bar3d_5.png
new file mode 100644 (file)
index 0000000..77b544c
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_5.png differ
diff --git a/scilab/modules/helptools/images/bar3d_en_US_1.png b/scilab/modules/helptools/images/bar3d_en_US_1.png
new file mode 100644 (file)
index 0000000..603667a
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_en_US_1.png differ
diff --git a/scilab/modules/helptools/images/bar3d_fr_FR_1.png b/scilab/modules/helptools/images/bar3d_fr_FR_1.png
new file mode 100644 (file)
index 0000000..63ec791
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_fr_FR_1.png differ
diff --git a/scilab/modules/helptools/images/bar3d_ja_JP_1.png b/scilab/modules/helptools/images/bar3d_ja_JP_1.png
new file mode 100644 (file)
index 0000000..50e86da
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_ja_JP_1.png differ
diff --git a/scilab/modules/helptools/images/bar3d_pt_BR_1.png b/scilab/modules/helptools/images/bar3d_pt_BR_1.png
new file mode 100644 (file)
index 0000000..5667bfb
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_pt_BR_1.png differ
diff --git a/scilab/modules/helptools/images/bar3d_ru_RU_1.png b/scilab/modules/helptools/images/bar3d_ru_RU_1.png
new file mode 100644 (file)
index 0000000..65bbd99
Binary files /dev/null and b/scilab/modules/helptools/images/bar3d_ru_RU_1.png differ
index cacb51d..61a7ea0 100644 (file)
Binary files a/scilab/modules/helptools/images/grand_en_US_6.png and b/scilab/modules/helptools/images/grand_en_US_6.png differ
index b5b7640..da47db9 100644 (file)
Binary files a/scilab/modules/helptools/images/grand_fr_FR_6.png and b/scilab/modules/helptools/images/grand_fr_FR_6.png differ
index cacb51d..61a7ea0 100644 (file)
Binary files a/scilab/modules/helptools/images/grand_pt_BR_6.png and b/scilab/modules/helptools/images/grand_pt_BR_6.png differ
index 0212b27..34039ab 100644 (file)
Binary files a/scilab/modules/helptools/images/grand_ru_RU_6.png and b/scilab/modules/helptools/images/grand_ru_RU_6.png differ
index c83836d..48a8671 100644 (file)
Binary files a/scilab/modules/helptools/images/subplot_1.png and b/scilab/modules/helptools/images/subplot_1.png differ
diff --git a/scilab/modules/helptools/images/tree_show_2x2.png b/scilab/modules/helptools/images/tree_show_2x2.png
new file mode 100644 (file)
index 0000000..f9a2d99
Binary files /dev/null and b/scilab/modules/helptools/images/tree_show_2x2.png differ
diff --git a/scilab/modules/helptools/images/tree_show_list.png b/scilab/modules/helptools/images/tree_show_list.png
new file mode 100644 (file)
index 0000000..f4d2af5
Binary files /dev/null and b/scilab/modules/helptools/images/tree_show_list.png differ
diff --git a/scilab/modules/helptools/images/tree_show_styling.png b/scilab/modules/helptools/images/tree_show_styling.png
new file mode 100644 (file)
index 0000000..4c9fb88
Binary files /dev/null and b/scilab/modules/helptools/images/tree_show_styling.png differ
diff --git a/scilab/modules/helptools/images/xload_70p.png b/scilab/modules/helptools/images/xload_70p.png
new file mode 100644 (file)
index 0000000..a84a59e
Binary files /dev/null and b/scilab/modules/helptools/images/xload_70p.png differ
index d92e1a3..3432ca4 100644 (file)
@@ -202,7 +202,7 @@ Redefining permanent variable.
         <programlisting role="example"><![CDATA[
 clf reset
 subplot(1,3,1), plot2d(), a1 = gca();
-subplot(1,3,2), hist3d()
+subplot(1,3,2), bar3d()
 subplot(1,3,3), plot3d(), a3 = gca();
 save(TMPDIR+"/test.scg", "a3", "a1")
 clf reset
index ae60987..8167f7e 100644 (file)
@@ -264,7 +264,7 @@ gcf().axes_size = [700 300];
             subplot(1,2,1), param3d()
             subplot(1,2,2), plot2d4(), xtitle("plot2d4()"); a = gca();
             path = TMPDIR + "/test.dat";
-            save(path, "a");       // We save only the right axes (hist3d)
+            save(path, "a");       // We save only the right axes (bar3d)
             clf reset, clear a
             xload(path);           // The right axes is restored and rendered
             gcf().axes_size = [700 300];
index 0a2960e..4472878 100644 (file)
@@ -1029,7 +1029,7 @@ histc([2+%z %z %z ]) == [1 2]
                 <link linkend="histplot">histplot</link>
             </member>
             <member>
-                <link linkend="hist3d">hist3d</link>
+                <link linkend="bar3d">bar3d</link>
             </member>
             <member>
                 <link linkend="bar">bar</link>
index 5e33af9..4e30946 100644 (file)
@@ -26,7 +26,7 @@ txt = mgetl( fd );
 mclose( fd );
 ASCII_TXT           = ascii(txt);
 TXT_FROM_ASCII_CODE = ascii(ASCII_TXT);
-if (length(TXT_FROM_ASCII_CODE) <> 27455) then bugmes();quit;end
+if (length(TXT_FROM_ASCII_CODE) <> 27453) then bugmes();quit;end
 // == TEST 5 ===================================================================
 if ascii("!") <> 33 then bugmes();quit;end
 if ascii("""")<> 34 then bugmes();quit;end
index 5bed8ec..77e9a4e 100644 (file)
@@ -37,7 +37,7 @@ mclose( fd );
 ASCII_TXT           = ascii(txt);
 TXT_FROM_ASCII_CODE = ascii(ASCII_TXT);
 
-if (length(TXT_FROM_ASCII_CODE) <> 27455) then pause,end
+if (length(TXT_FROM_ASCII_CODE) <> 27453) then pause,end
 
 // == TEST 5 ===================================================================
 
index 12cfca5..c5c76d0 100644 (file)
@@ -298,7 +298,7 @@ plot3d(x, y, z, theta, alpha, ebox=[xmin, xmax, ymin, ymax, zmin, zmax])
  Représentation de données statistiques  [modifier]
 Si x est un vecteur, la fonction histplot(n, x), n étant un entier, va découper l’intervalle de valeurs prises par les coefficients de x en n tranches d’égale largeur, et tracer l’histogramme de répartition des valeurs selon ces tranches. Si n est un vecteur dont les coefficients sont strictement croissants, les valeurs des coefficients de n servent à déterminer les tranches.
 
-Si x est une matrice, hist3d(x) trace un histogramme 3D tel que le parallélépipède situé en (i, j) a pour hauteur x(i, j). Comme pour toutes les fonctions de tracé en trois dimensions, on peut définir l’angle de vue avec ? et a.
+Si x est une matrice, bar3d(x) trace un diagramme en barres 3D tel que la barre située en (i, j) a pour hauteur x(i, j). Comme pour toutes les fonctions de tracé en trois dimensions, on peut définir l’angle de vue avec ? et a.
 
 
  Dessin  [modifier]