Removed xset as obsolete function (inserted set function).

Change-Id: I991903c414cfdd327ea96f3d32c55b6f671a137e

diff --git a/scilab/modules/graphics/help/en_US/2d_plot/Sfgrayplot.xml b/scilab/modules/graphics/help/en_US/2d_plot/Sfgrayplot.xml
index 010255a..11f7d9b 100644 (file)
--- a/scilab/modules/graphics/help/en_US/2d_plot/Sfgrayplot.xml
+++ b/scilab/modules/graphics/help/en_US/2d_plot/Sfgrayplot.xml
@@ -113,7 +113,7 @@ function z=surf2(x,y), z=x^2-y^2, endfunction
 function z=surf3(x,y), z=x^3+y^2, endfunction
 function z=surf4(x,y), z=x^2+y^2, endfunction
 clf()
-xset("colormap",[jetcolormap(64);hotcolormap(64)])
+set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
 drawlater() ;
@@ -142,7 +142,7 @@ show_window()
             function z=surf3(x,y), z=x^3+y^2, endfunction
             function z=surf4(x,y), z=x^2+y^2, endfunction
             clf()
-            xset("colormap",[jetcolormap(64);hotcolormap(64)])
+            set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
             x = linspace(-1,1,60);
             y = linspace(-1,1,60);
             drawlater() ;
@@ -171,7 +171,7 @@ function z=surf3(x,y), z=x^3+y^2, endfunction
 clf()
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
-xset("colormap",hotcolormap(128))
+set(gcf(),"color_map",hotcolormap(128))
 drawlater() ;
 colorbar(-1,2)
 Sfgrayplot(x,y,surf3,strf="041")
@@ -185,7 +185,7 @@ show_window()
             clf()
             x = linspace(-1,1,60);
             y = linspace(-1,1,60);
-            xset("colormap",hotcolormap(128))
+            set(gcf(),"color_map",hotcolormap(128))
             drawlater() ;
             colorbar(-1,2)
             Sfgrayplot(x,y,surf3,strf="041")
@@ -201,7 +201,7 @@ function z=surf3(x,y), z=x^3+y^2, endfunction
 clf()
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
-xset("colormap",jetcolormap(128))
+set(gcf(),"color_map",jetcolormap(128))
 drawlater() ;
 zminmax = [-0.5 1]; colors=[32 96];
 colorbar(zminmax(1),zminmax(2),colors)
@@ -216,7 +216,7 @@ show_window()
             clf()
             x = linspace(-1,1,60);
             y = linspace(-1,1,60);
-            xset("colormap",jetcolormap(128))
+            set(gcf(),"color_map",jetcolormap(128))
             drawlater() ;
             zminmax = [-0.5 1]; colors=[32 96];
             colorbar(zminmax(1),zminmax(2),colors)

diff --git a/scilab/modules/graphics/help/ja_JP/2d_plot/Sfgrayplot.xml b/scilab/modules/graphics/help/ja_JP/2d_plot/Sfgrayplot.xml
index 3ed386c..dd415ef 100644 (file)
--- a/scilab/modules/graphics/help/ja_JP/2d_plot/Sfgrayplot.xml
+++ b/scilab/modules/graphics/help/ja_JP/2d_plot/Sfgrayplot.xml
@@ -113,7 +113,7 @@ function z=surf2(x,y), z=x^2-y^2, endfunction
 function z=surf3(x,y), z=x^3+y^2, endfunction
 function z=surf4(x,y), z=x^2+y^2, endfunction
 clf()
-xset("colormap",[jetcolormap(64);hotcolormap(64)])
+set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
 drawlater() ;
@@ -135,13 +135,43 @@ subplot(2,2,4)
   xtitle("f(x,y) = x^2+y^2")
 drawnow() ;
 show_window()
-
+ ]]></programlisting>
+        <scilab:image>
+            function z=surf1(x,y), z=x*y, endfunction
+            function z=surf2(x,y), z=x^2-y^2, endfunction
+            function z=surf3(x,y), z=x^3+y^2, endfunction
+            function z=surf4(x,y), z=x^2+y^2, endfunction
+            clf()
+            set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
+            x = linspace(-1,1,60);
+            y = linspace(-1,1,60);
+            drawlater() ;
+            subplot(2,2,1)
+            colorbar(-1,1,[1,64])
+            Sfgrayplot(x,y,surf1,strf="041",colminmax=[1,64])
+            xtitle("f(x,y) = x*y")
+            subplot(2,2,2)
+            colorbar(-1,1,[65,128])
+            Sfgrayplot(x,y,surf2,strf="041",colminmax=[65,128])
+            xtitle("f(x,y) = x^2-y^2")
+            subplot(2,2,3)
+            colorbar(-1,2,[65,128])
+            Sfgrayplot(x,y,surf3,strf="041",colminmax=[65,128])
+            xtitle("f(x,y) = x^3+y^2")
+            subplot(2,2,4)
+            colorbar(0,2,[1,64])
+            Sfgrayplot(x,y,surf4,strf="041",colminmax=[1,64])
+            xtitle("f(x,y) = x^2+y^2")
+            drawnow() ;
+            show_window()
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
 // 例 #2: surf3 をプロットしいくつかの等高線を追加
 function z=surf3(x,y), z=x^3+y^2, endfunction
 clf()
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
-xset("colormap",hotcolormap(128))
+set(gcf(),"color_map",hotcolormap(128))
 drawlater() ;
 colorbar(-1,2)
 Sfgrayplot(x,y,surf3,strf="041")
@@ -149,14 +179,29 @@ fcontour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
 xtitle("f(x,y) = x^3+y^2")
 drawnow() ;
 show_window()
-
+ ]]></programlisting>
+        <scilab:image>
+            function z=surf3(x,y), z=x^3+y^2, endfunction
+            clf()
+            x = linspace(-1,1,60);
+            y = linspace(-1,1,60);
+            set(gcf(),"color_map",hotcolormap(128))
+            drawlater() ;
+            colorbar(-1,2)
+            Sfgrayplot(x,y,surf3,strf="041")
+            contour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
+            xtitle("f(x,y) = x^3+y^2")
+            drawnow() ;
+            show_window()
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
 // 例 #3: surf3 をプロットし,プロットを -0.5<= z <= 1に制限するために
 // オプションの引数 zminmax および colout を使用
 function z=surf3(x,y), z=x^3+y^2, endfunction
 clf()
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
-xset("colormap",jetcolormap(128))
+set(gcf(),"color_map",jetcolormap(128))
 drawlater() ;
 zminmax = [-0.5 1]; colors=[32 96];
 colorbar(zminmax(1),zminmax(2),colors)
@@ -166,6 +211,21 @@ xtitle("f(x,y) = x^3+y^2, with parts under z = -0.5 and upper z = 1 removed")
 drawnow() ;
 show_window()
  ]]></programlisting>
+        <scilab:image>
+            function z=surf3(x,y), z=x^3+y^2, endfunction
+            clf()
+            x = linspace(-1,1,60);
+            y = linspace(-1,1,60);
+            set(gcf(),"color_map",jetcolormap(128))
+            drawlater() ;
+            zminmax = [-0.5 1]; colors=[32 96];
+            colorbar(zminmax(1),zminmax(2),colors)
+            Sfgrayplot(x, y, surf3, strf="041", zminmax=zminmax, colout=[0 0], colminmax=colors)
+            contour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
+            xtitle("f(x,y) = x^3+y^2, with parts under z = -0.5 and upper z = 1 removed")
+            drawnow() ;
+            show_window()
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>参照</title>

diff --git a/scilab/modules/graphics/help/pt_BR/2d_plot/Sfgrayplot.xml b/scilab/modules/graphics/help/pt_BR/2d_plot/Sfgrayplot.xml
index 02f90d7..47a6dd6 100644 (file)
--- a/scilab/modules/graphics/help/pt_BR/2d_plot/Sfgrayplot.xml
+++ b/scilab/modules/graphics/help/pt_BR/2d_plot/Sfgrayplot.xml
@@ -108,7 +108,7 @@ function z=surf2(x,y), z=x^2-y^2, endfunction
 function z=surf3(x,y), z=x^3+y^2, endfunction
 function z=surf4(x,y), z=x^2+y^2, endfunction
 clf()
-xset("colormap",[jetcolormap(64);hotcolormap(64)])
+set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
 drawlater() ;
@@ -130,13 +130,43 @@ subplot(2,2,4)
    xtitle("f(x,y) = x^2+y^2")
 drawnow() ;
 show_window()
-
+ ]]></programlisting>
+        <scilab:image>
+            function z=surf1(x,y), z=x*y, endfunction
+            function z=surf2(x,y), z=x^2-y^2, endfunction
+            function z=surf3(x,y), z=x^3+y^2, endfunction
+            function z=surf4(x,y), z=x^2+y^2, endfunction
+            clf()
+            set(gcf(),"color_map",[jetcolormap(64);hotcolormap(64)])
+            x = linspace(-1,1,60);
+            y = linspace(-1,1,60);
+            drawlater() ;
+            subplot(2,2,1)
+            colorbar(-1,1,[1,64])
+            Sfgrayplot(x,y,surf1,strf="041",colminmax=[1,64])
+            xtitle("f(x,y) = x*y")
+            subplot(2,2,2)
+            colorbar(-1,1,[65,128])
+            Sfgrayplot(x,y,surf2,strf="041",colminmax=[65,128])
+            xtitle("f(x,y) = x^2-y^2")
+            subplot(2,2,3)
+            colorbar(-1,2,[65,128])
+            Sfgrayplot(x,y,surf3,strf="041",colminmax=[65,128])
+            xtitle("f(x,y) = x^3+y^2")
+            subplot(2,2,4)
+            colorbar(0,2,[1,64])
+            Sfgrayplot(x,y,surf4,strf="041",colminmax=[1,64])
+            xtitle("f(x,y) = x^2+y^2")
+            drawnow() ;
+            show_window()
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
 // exemplo #2: esboço de surf3 e adição de algumas linhas de contorno
 function z=surf3(x,y), z=x^3+y^2, endfunction
 clf()
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
-xset("colormap",hotcolormap(128))
+set(gcf(),"color_map",hotcolormap(128))
 drawlater() ;
 colorbar(-1,2)
 Sfgrayplot(x,y,surf3,strf="041")
@@ -144,14 +174,29 @@ fcontour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
 xtitle("f(x,y) = x^3+y^2")
 drawnow() ;
 show_window()
-
+ ]]></programlisting>
+        <scilab:image>
+            function z=surf3(x,y), z=x^3+y^2, endfunction
+            clf()
+            x = linspace(-1,1,60);
+            y = linspace(-1,1,60);
+            set(gcf(),"color_map",hotcolormap(128))
+            drawlater() ;
+            colorbar(-1,2)
+            Sfgrayplot(x,y,surf3,strf="041")
+            contour2d(x,y,surf3,[-0.1, 0.025, 0.4],style=[1 1 1],strf="000")
+            xtitle("f(x,y) = x^3+y^2")
+            drawnow() ;
+            show_window()
+        </scilab:image>
+        <programlisting role="example"><![CDATA[
 // exemplo #3: esboço de surf3 e uso dos argumentos opcionais zminmax e colout
 //             para restringir o esboço em -0.5&lt;= z &lt;= 1
 function z=surf3(x,y), z=x^3+y^2, endfunction
 clf()
 x = linspace(-1,1,60);
 y = linspace(-1,1,60);
-xset("colormap",jetcolormap(128))
+set(gcf(),"color_map",jetcolormap(128))
 drawlater() ;
 zminmax = [-0.5 1]; colors=[32 96];
 colorbar(zminmax(1),zminmax(2),colors)
@@ -161,6 +206,21 @@ xtitle("f(x,y) = x^3+y^2, com partes abaixo de z = -0.5 e acima de z = 1 removid
 drawnow() ;
 show_window()
  ]]></programlisting>
+        <scilab:image>
+            function z=surf3(x,y), z=x^3+y^2, endfunction
+            clf()
+            x = linspace(-1,1,60);
+            y = linspace(-1,1,60);
+            set(gcf(),"color_map",jetcolormap(128))
+            drawlater() ;
+            zminmax = [-0.5 1]; colors=[32 96];
+            colorbar(zminmax(1),zminmax(2),colors)
+            Sfgrayplot(x, y, surf3, strf="041", zminmax=zminmax, colout=[0 0], colminmax=colors)
+            contour2d(x,y,surf3,[-0.5, 1],style=[1 1 1],strf="000")
+            xtitle("f(x,y) = x^3+y^2, com partes abaixo de z = -0.5 e acima de z = 1 removidas")
+            drawnow() ;
+            show_window()
+        </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>Ver Também</title>