correct an old use of plot2d - nonreg test 313 2918 3353 and 4964 corrected

Change-Id: I213e267ec5d5e98c4709de1ca25e361abbe69276

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2918.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2918.dia.ref
index a05f5a1..03b39dd 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2918.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2918.dia.ref
@@ -14,4 +14,4 @@
 // In the demo of contourf, some black points are drawn near the X-axis and Y-axis intersection.
 // often use in old scripts
 // should not display black dots on the edges of the axes
-plot2d([0;1],[0;1],0,"121"," ",[0, 0, 1, 1],[1,10,1,10]);
+plot2d([0;1],[0;1],0,strf="121",leg=" ",rect=[0, 0, 1, 1],nax=[1,10,1,10]);

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2918.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_2918.tst
index d836114..eafd7b9 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2918.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2918.tst
@@ -17,5 +17,5 @@
 
 // often use in old scripts
 // should not display black dots on the edges of the axes
-plot2d([0;1],[0;1],0,"121"," ",[0, 0, 1, 1],[1,10,1,10]);
+plot2d([0;1],[0;1],0,strf="121",leg=" ",rect=[0, 0, 1, 1],nax=[1,10,1,10]);
 

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_313.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_313.dia.ref
index f44bdb5..d3af8db 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_313.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_313.dia.ref
@@ -18,11 +18,11 @@ x=0:0.2:2*%pi;
 x1=[sin(x);100*sin(x)];
 y1=[cos(x);100*cos(x)];
 y1=y1+20*ones(y1);
-// No clip
-plot2d([-100,500],[-100,600],[-1,-1],"022");
+// No clip 
+plot2d([-100,500],[-100,600],[-1,-1],strf="022");
 xsegs(10*x1+200*ones(x1),10*y1+200*ones(y1));
-// rectangle clipping zone
-clf(); plot2d([-100,500],[-100,600],[-1,-1],"022")
+// rectangle clipping zone 
+clf(); plot2d([-100,500],[-100,600],[-1,-1],strf="022")
 xrect(clipBox(1), clipBox(2), clipBox(3), clipBox(4));
 axes = gca();
 axes.clip_box = clipBox;

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_313.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_313.tst
index 5e0ba23..a20d0e4 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_313.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_313.tst
@@ -23,10 +23,10 @@ x1=[sin(x);100*sin(x)];
 y1=[cos(x);100*cos(x)];
 y1=y1+20*ones(y1);
 // No clip 
-plot2d([-100,500],[-100,600],[-1,-1],"022");
+plot2d([-100,500],[-100,600],[-1,-1],strf="022");
 xsegs(10*x1+200*ones(x1),10*y1+200*ones(y1));
 // rectangle clipping zone 
-clf(); plot2d([-100,500],[-100,600],[-1,-1],"022")
+clf(); plot2d([-100,500],[-100,600],[-1,-1],strf="022")
 xrect(clipBox(1), clipBox(2), clipBox(3), clipBox(4));
 axes = gca();
 axes.clip_box = clipBox;

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3353.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3353.dia.ref
index 054c0a9..c561d96 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3353.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3353.dia.ref
@@ -13,7 +13,7 @@
 // <-- Short Description -->
 // some colors are not present on pie chart
 // should draw a white rectangle (draw a yellow one in Scilab 4).
-plot2d(0,0,[0],'032','leg',[-1.5,-1.5 ,1.5,1.5]);
+plot2d(0,0,[0],strf='032',leg='leg',rect=[-1.5,-1.5 ,1.5,1.5]);
 a=gca(); t=a.title;
 t.text="pie chart"; t.font_size=3;
 a.clip_state = 'clipgrf';

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3353.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_3353.tst
index 11718d3..bf731da 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3353.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3353.tst
@@ -16,7 +16,7 @@
 // some colors are not present on pie chart
 
 // should draw a white rectangle (draw a yellow one in Scilab 4).
-plot2d(0,0,[0],'032','leg',[-1.5,-1.5 ,1.5,1.5]);
+plot2d(0,0,[0],strf='032',leg='leg',rect=[-1.5,-1.5 ,1.5,1.5]);
 a=gca(); t=a.title;
 t.text="pie chart"; t.font_size=3;
 a.clip_state = 'clipgrf';

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4964.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_4964.dia.ref
index f99d5dd..e1b0e1b 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4964.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4964.dia.ref
@@ -13,7 +13,7 @@
 //
 // <-- Short Description -->
 //   set or get 'format_n' property from an axes crash scilab.
-plot2d(1:10,1:10,1,"020")
+plot2d(1:10,1:10,1,strf="020")
 drawaxis(x=2:7,y=4,dir='u',tics='v')
 e=gce();
 e.format_n

diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4964.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_4964.tst
index 5a7bfbe..4b6c13a 100644 (file)
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4964.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4964.tst
@@ -16,7 +16,7 @@
 //   set or get 'format_n' property from an axes crash scilab.
 
 
-plot2d(1:10,1:10,1,"020")
+plot2d(1:10,1:10,1,strf="020")
 drawaxis(x=2:7,y=4,dir='u',tics='v')
 e=gce();
 e.format_n