Doc: fix few warnings

Change-Id: Iadba0d062cbd7d65b1482f8c4b0b6fd6aaf4cd1d

diff --git a/scilab/modules/graphics/help/en_US/2d_plot/plot.xml b/scilab/modules/graphics/help/en_US/2d_plot/plot.xml
index af16ead..c71f791 100644 (file)
--- a/scilab/modules/graphics/help/en_US/2d_plot/plot.xml
+++ b/scilab/modules/graphics/help/en_US/2d_plot/plot.xml
@@ -473,9 +473,6 @@ plot(x',t); // idem, x is automatically transposed to match t (here the columns)
             4     5     6     7];
             
             x=[5 6 7 8];
-            warning("off")
-            plot(x,t);
-            warning("on")
             plot(x',t);
         </scilab:image>
         <programlisting role="example"><![CDATA[
@@ -492,7 +489,7 @@ t=[1     1     1     1
 subplot(221);
 plot(x,[t [8;9;10;12]]');
 subplot(222);
-plot(x',[t [8;9;10;12]]');
+plot(x',[t [8;9;10;12]]);
 subplot(223);
 plot(x,[t [8;9;10;12]]');
 subplot(224);
@@ -508,16 +505,14 @@ plot(x',[t [8;9;10;12]]');
             
             // Only one matching possibility case : how to make 4 identical plots in 4 manners...
             // x is 1x4 (vector) and y is 4x5 (non square matrix)
-            warning("off")
             subplot(221);
-            plot(x,[t [8;9;10;12]]');
+            plot(x',[t [8;9;10;12]]);
             subplot(222);
-            plot(x',[t [8;9;10;12]]');
+            plot(x',[t [8;9;10;12]]);
             subplot(223);
-            plot(x,[t [8;9;10;12]]');
+            plot(x',[t [8;9;10;12]]);
             subplot(224);
-            plot(x',[t [8;9;10;12]]');
-            warning("on")
+            plot(x',[t [8;9;10;12]]);
         </scilab:image>
         <programlisting role="example"><![CDATA[
 clf()
@@ -543,9 +538,6 @@ plot(t,[1;2;3;4]') // the same plot, but here Y needs to be transposed
             // Case where only x or y is a square matrix
             //x : matrix (t) and y  : vector ([1 2 3 4])
             plot(t,[1 2 3 4]') // equivalent to plot(t,[1 1 1 1;2 2 2 2;3 3 3 3;4 4 4 4])
-            warning("off")
-            plot(t,[1;2;3;4]') // the same plot, but here Y needs to be transposed
-            warning("on")
         </scilab:image>
         <programlisting role="example"><![CDATA[
 t=[1     1     1     1
@@ -568,9 +560,6 @@ plot(t', cols') // the same plot
             cols = 1:4;
             
             // cols is transposed : notice the priority given to the columns treatment
-            warning("off")
-            plot(t',cols) // equivalent to plot(t',[1 1 1 1;2 2 2 2;3 3 3 3;4 4 4 4])
-            warning("on")
             plot(t',cols') // the same plot
         </scilab:image>
         <programlisting role="example"><![CDATA[

diff --git a/scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml b/scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml
index 0a647d3..8b9896c 100644 (file)
--- a/scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml
+++ b/scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml
@@ -73,9 +73,6 @@
             e=gce();p=e.children(1);//get the handle on the polyline
             datatipCreate(p,50);
             datatipCreate(p,20);
-            warning("off")
-            datatips_struct=datatipGetStruct(p)
-            warning("on")
         </scilab:image>
     </refsection>
     <refsection>

diff --git a/scilab/modules/graphics/help/ja_JP/2d_plot/plot.xml b/scilab/modules/graphics/help/ja_JP/2d_plot/plot.xml
index 4e4fb20..abea213 100644 (file)
--- a/scilab/modules/graphics/help/ja_JP/2d_plot/plot.xml
+++ b/scilab/modules/graphics/help/ja_JP/2d_plot/plot.xml
@@ -484,9 +484,6 @@ plot(x',t); // idem, x はtに一致するように自動的に転置される (
             4     5     6     7];
             
             x=[5 6 7 8];
-            warning("off")
-            plot(x,t);
-            warning("on")
             plot(x',t);
         </scilab:image>
         <programlisting role="example"><![CDATA[ 
@@ -503,7 +500,7 @@ t=[1     1     1     1
 subplot(221);
 plot(x,[t [8;9;10;12]]');
 subplot(222);
-plot(x',[t [8;9;10;12]]');
+plot(x',[t [8;9;10;12]]);
 subplot(223);
 plot(x,[t [8;9;10;12]]');
 subplot(224);
@@ -520,16 +517,14 @@ clf()
             
             // Only one matching possibility case : how to make 4 identical plots in 4 manners...
             // x is 1x4 (vector) and y is 4x5 (non square matrix)
-            warning("off")
             subplot(221);
-            plot(x,[t [8;9;10;12]]');
+            plot(x',[t [8;9;10;12]]);
             subplot(222);
-            plot(x',[t [8;9;10;12]]');
+            plot(x',[t [8;9;10;12]]);
             subplot(223);
-            plot(x,[t [8;9;10;12]]');
+            plot(x',[t [8;9;10;12]]);
             subplot(224);
-            plot(x',[t [8;9;10;12]]');
-            warning("on")
+            plot(x',[t [8;9;10;12]]);
         </scilab:image>
         <programlisting role="example"><![CDATA[ 
 
@@ -555,9 +550,6 @@ clf();
             // Case where only x or y is a square matrix
             //x : matrix (t) and y  : vector ([1 2 3 4])
             plot(t,[1 2 3 4]') // equivalent to plot(t,[1 1 1 1;2 2 2 2;3 3 3 3;4 4 4 4])
-            warning("off")
-            plot(t,[1;2;3;4]') // the same plot, but here Y needs to be transposed
-            warning("on")
         </scilab:image>
         <programlisting role="example"><![CDATA[ 
 t=[1     1     1     1
@@ -580,9 +572,6 @@ plot(t', cols') // the same plot
             cols = 1:4;
             
             // cols is transposed : notice the priority given to the columns treatment
-            warning("off")
-            plot(t',cols) // equivalent to plot(t',[1 1 1 1;2 2 2 2;3 3 3 3;4 4 4 4])
-            warning("on")
             plot(t',cols') // the same plot
         </scilab:image>
         <programlisting role="example"><![CDATA[ 

diff --git a/scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml b/scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml
index 9fdbed5..73bbbdd 100644 (file)
--- a/scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml
+++ b/scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml
@@ -64,6 +64,14 @@
     datatips_struct=datatipGetStruct(p)
     datatips_struct.formatfunction
     ]]></programlisting>
+        <scilab:image>
+            x=linspace(0,1,100)';
+            y=x.^3;
+            plot(x,y);
+            e=gce();p=e.children(1);//get the handle on the polyline
+            datatipCreate(p,50);
+            datatipCreate(p,20);
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>参照</title>

diff --git a/scilab/modules/helptools/etc/images_md5.txt b/scilab/modules/helptools/etc/images_md5.txt
index d1cb9f4..d8f5eac 100644 (file)
--- a/scilab/modules/helptools/etc/images_md5.txt
+++ b/scilab/modules/helptools/etc/images_md5.txt
@@ -816,7 +816,7 @@ datafit_2.png=df0ac6cce3ab8e656471675e248b36d
 datafit_3.png=7b4a378cf730d4e181aa7a6f76448863
 datatipCreate_1.png=8ec8bfcd7f9dfd2a04b65f08309ee8fe
 datatipGetEntities_1.png=71ddeec8bd4accf61d6e6aac4d089514
-datatipGetStruct_1.png=347218e3b573365536cb5d7dcfa0c588
+datatipGetStruct_1.png=b2a89937e8fee4f020fc6aa88de8d065
 datatipRedraw_1.png=972a5bd43dff9d07e38a21f01f38b55
 datatipRedraw_2.png=693e44174e1e2c3b2de740162a2a7c6d
 datatipRemove_1.png=3e6636ded796971426532081bd7c4b7c
@@ -1123,10 +1123,10 @@ plot3d_8.png=d7ca9d9d5dd993d30bc6423a0528ff8e
 plot3d_9.png=c0f93d84e3ccdc76486bd41209b1f76b
 plot_1.png=f1b99772428f58ecb395a0e9d646467c
 plot_10.png=e56bd24f47d06312c9f9f37211674a61
-plot_11.png=c3fbb5e9c78ca6a93db0eae4bf09b60a
-plot_12.png=ab50b7b8dfda41666aed4ae2a07c515a
-plot_13.png=fb3ee6c025d190a7045ebfcf54ee284e
-plot_14.png=bfecac698e9aefeaa8d57ad8a055746f
+plot_11.png=3fbb963b7ebc42b5cf32d0443197c30b
+plot_12.png=59b89f2aa6e520bf84d04f4cc922e51
+plot_13.png=483a01785c6cf3d4e2fd579856fd1ac8
+plot_14.png=7dd661fc751b460aeb4f7f5614ee1e03
 plot_15.png=d60a53ee0d50caf6fae23be0613054e2
 plot_16.png=422149b7b3015c0185857b4a9eb1d966
 plot_2.png=1c9822aea3c0649c26bcd64a65bf39f7

diff --git a/scilab/modules/helptools/images/plot_11.png b/scilab/modules/helptools/images/plot_11.png
index d1474a0..32d12f6 100644 (file)
Binary files a/scilab/modules/helptools/images/plot_11.png and b/scilab/modules/helptools/images/plot_11.png differ

diff --git a/scilab/modules/helptools/images/plot_13.png b/scilab/modules/helptools/images/plot_13.png
index c4bee4c..144c3cc 100644 (file)
Binary files a/scilab/modules/helptools/images/plot_13.png and b/scilab/modules/helptools/images/plot_13.png differ

diff --git a/scilab/modules/helptools/images/plot_14.png b/scilab/modules/helptools/images/plot_14.png
index ccc705f..7286e35 100644 (file)
Binary files a/scilab/modules/helptools/images/plot_14.png and b/scilab/modules/helptools/images/plot_14.png differ