summaryrefslogtreecommitdiff
path: root/js/Sinks
diff options
context:
space:
mode:
authorSunil Shetye2018-06-18 23:41:23 +0530
committerSunil Shetye2018-06-19 10:31:46 +0530
commit1170404c7650cb531534b308f103c9b6abd50d14 (patch)
treea6a61ae2a9a3592440483906ce6c7254b3243553 /js/Sinks
parentcd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (diff)
downloadsci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.gz
sci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.bz2
sci2js-1170404c7650cb531534b308f103c9b6abd50d14.zip
handle multiple rows
Diffstat (limited to 'js/Sinks')
-rw-r--r--js/Sinks/AFFICH_m.js26
-rw-r--r--js/Sinks/BARXY.js16
-rw-r--r--js/Sinks/CANIMXY.js42
-rw-r--r--js/Sinks/CANIMXY3D.js60
-rw-r--r--js/Sinks/CEVENTSCOPE.js32
-rw-r--r--js/Sinks/CFSCOPE.js38
-rw-r--r--js/Sinks/CLKOUTV_f.js2
-rw-r--r--js/Sinks/CMAT3D.js18
-rw-r--r--js/Sinks/CMATVIEW.js18
-rw-r--r--js/Sinks/CMSCOPE.js62
-rw-r--r--js/Sinks/CSCOPE.js38
-rw-r--r--js/Sinks/CSCOPXY.js42
-rw-r--r--js/Sinks/CSCOPXY3D.js58
-rw-r--r--js/Sinks/OUTIMPL_f.js2
-rw-r--r--js/Sinks/OUT_f.js2
-rw-r--r--js/Sinks/TOWS_c.js10
-rw-r--r--js/Sinks/WFILE_f.js12
-rw-r--r--js/Sinks/WRITEAU_f.js10
-rw-r--r--js/Sinks/WRITEC_f.js12
19 files changed, 250 insertions, 250 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 6dc38e69..451d916d 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -12,13 +12,13 @@ model.sim=list("affich2",4);
model.in1=in1(1,1);
model.in2=in1(1,2);
model.evtin=1;
-model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
-model.ipar=[font,fontsize,colr,1000,nt,nd,in1(1,1)];
+model.dstate=[[-1],[0],[0],[1],[1],[0],[zeros(in1(1,1)*in1(1,2),1)]];
+model.ipar=[[font],[fontsize],[colr],[1000],[nt],[nd],[in1(1,1)]];
model.blocktype="c";
model.firing=[];
model.dep_ut=[true,false];
model.label="";
-exprs=[sci2exp([model.in1,model.in2]),string(font),string(fontsize),string(colr),string(nt),string(nd),string(0)];
+exprs=[[sci2exp([model.in1,model.in2])],[string(font)],[string(fontsize)],[string(colr)],[string(nt)],[string(nd)],[string(0)]];
gr_i=[];
x=standard_define([3,2],model,exprs,gr_i);
}
@@ -32,43 +32,43 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,in1,font,fontsize,colr,nt,nd,herit,exprs]=scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,in1,font,fontsize,colr,nt,nd,herit,exprs]=scicos_getvalue("Set parameters",[["Input Size","Font number"],["Font size"],["Color"],["Total number of digits"],["Number of rational part digits"],["Block inherits (1) or not (0)"]],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (font<=0) {
-mess=[mess,"Font number must be positive"," "];
+mess=[[mess],["Font number must be positive"],[" "]];
ok=false;
}
if (fontsize<=0) {
-mess=[mess,"Font size must be positive"," "];
+mess=[[mess],["Font size must be positive"],[" "]];
ok=false;
}
if (nt<=3) {
-mess=[mess,"Total number of digits must be greater than 3"," "];
+mess=[[mess],["Total number of digits must be greater than 3"],[" "]];
ok=false;
}
if (nd<0) {
-mess=[mess,"Number of rational part digits must be ","greater or equal 0"," "];
+mess=[[mess],["Number of rational part digits must be ","greater or equal 0"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (!or(herit==[0,1])) {
-mess=[mess,"Accept inherited values are 0 and 1"," "];
+mess=[[mess],["Accept inherited values are 0 and 1"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
[model,graphics,ok]=set_io(model,graphics,list(in1,1),list(),ones(1-herit,1),[]);
}
if (ok) {
-model.ipar=[font,fontsize,colr,nt,nd,in1(1,1)];
-model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
+model.ipar=[[font],[fontsize],[colr],[nt],[nd],[in1(1,1)]];
+model.dstate=[[-1],[0],[0],[1],[1],[0],[zeros(in1(1,1)*in1(1,2),1)]];
model.evtin=ones(1-herit,1);
graphics.exprs=exprs;
x.graphics=graphics;
diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js
index 53fb30a8..7dbe2954 100644
--- a/js/Sinks/BARXY.js
+++ b/js/Sinks/BARXY.js
@@ -9,16 +9,16 @@ ymax=15;
model.sim=list("BARXY_sim",5);
model.blocktype="d";
model.dep_ut=[true,false];
-model.in1=[-1,-1];
+model.in1=[[-1],[-1]];
model.intyp=[1];
model.out=[];
model.evtin=[1];
-model.rpar=[xmin,xmax,ymin,ymax];
+model.rpar=[[xmin],[xmax],[ymin],[ymax]];
model.ipar=1;
x=standard_define([2,2],model,[],[]);
x.graphics.in_implicit=["E","E"];
x.graphics.out_implicit=[];
-x.graphics.exprs=["-15","15","-15","15","1"];
+x.graphics.exprs=[["-15"],["15"],["-15"],["15"],["1"]];
}
BARXY.prototype.details = function BARXY() {
}
@@ -30,27 +30,27 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,xmin,xmax,ymin,ymax,thickness,exprs]=scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,xmin,xmax,ymin,ymax,thickness,exprs]=scicos_getvalue("Set Scope parameters",[["Xmin"],["Xmax"],["Ymin"],["Ymax"],["Segs Thickness"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
ok=false;
}
if (xmin>=xmax) {
-mess=[mess,"Xmax must be greater than Xmin"," "];
+mess=[[mess],["Xmax must be greater than Xmin"],[" "]];
ok=false;
}
if (thickness<=0) {
-mess=[mess,"Thickness must be strictly positive."];
+mess=[[mess],["Thickness must be strictly positive."]];
ok=false;
}
if (!ok) {
message(mess);
} else {
-model.rpar=[xmin,xmax,ymin,ymax];
+model.rpar=[[xmin],[xmax],[ymin],[ymax]];
model.ipar=thickness;
graphics.exprs=exprs;
x.graphics=graphics;
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index 28954f06..462c840b 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -5,8 +5,8 @@ win=-1;
clrs=-4;
N=2;
siz=1;
-wpos=[-1,-1];
-wdim=[-1,-1];
+wpos=[[-1],[-1]];
+wdim=[[-1],[-1]];
xmin=-15;
xmax=15;
ymin=-15;
@@ -14,16 +14,16 @@ ymax=+15;
nbr_curves=1;
model=scicos_model();
model.sim=list("canimxy",4);
-model.in1=[1,1];
-model.in2=[1,1];
-model.intyp=[1,1];
+model.in1=[[1],[1]];
+model.in2=[[1],[1]];
+model.intyp=[[1],[1]];
model.evtin=1;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,1,N,clrs,siz,0,wpos.slice(),wdim.slice(),nbr_curves];
+model.rpar=[[xmin],[xmax],[ymin],[ymax]];
+model.ipar=[[win],[1],[N],[clrs],[siz],[0],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.blocktype="d";
model.firing=[];
model.dep_ut=[false,false];
-exprs=[string(nbr_curves),string(clrs),string(siz),string(win),"[]","[]",string(xmin),string(xmax),string(ymin),string(ymax),string(N)];
+exprs=[[string(nbr_curves)],[string(clrs)],[string(siz)],[string(win)],["[]"],["[]"],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -37,41 +37,41 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,nbr_curves,clrs,siz,win,wpos,wdim,xmin,xmax,ymin,ymax,N,exprs]=scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,nbr_curves,clrs,siz,win,wpos,wdim,xmin,xmax,ymin,ymax,N,exprs]=scicos_getvalue("Set Scope parameters",[["Number of Curves"],["color (>0) or mark (<0)"],["line or mark size"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Xmin"],["Xmax"],["Ymin"],["Ymax"],["Buffer size"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
ok=false;
}
if (nbr_curves<=0) {
-mess=[mess,"Number of curves cannot be negative or null"," "];
+mess=[[mess],["Number of curves cannot be negative or null"],[" "]];
ok=false;
}
if (N<1) {
-mess=[mess,"Buffer size must be at least 1"," "];
+mess=[[mess],["Buffer size must be at least 1"],[" "]];
ok=false;
}
if (N==1&&clrs>0) {
-mess=[mess,"Buffer size must be at least 2"," "];
+mess=[[mess],["Buffer size must be at least 2"],[" "]];
ok=false;
}
if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
ok=false;
}
if (xmin>=xmax) {
-mess=[mess,"Xmax must be greater than Xmin"," "];
+mess=[[mess],["Xmax must be greater than Xmin"],[" "]];
ok=false;
}
if (!ok) {
@@ -81,13 +81,13 @@ in1=nbr_curves*ones(2,1);
in2=ones(2,1);
[model,graphics,ok]=set_io(model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
-rpar=[xmin,xmax,ymin,ymax];
-ipar=[win,1,N,clrs,siz,0,wpos.slice(),wdim.slice(),nbr_curves];
+rpar=[[xmin],[xmax],[ymin],[ymax]];
+ipar=[[win],[1],[N],[clrs],[siz],[0],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.rpar=rpar;
model.ipar=ipar;
graphics.exprs=exprs;
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index de59d499..5c939e03 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -3,27 +3,27 @@ function CANIMXY3D() {
CANIMXY3D.prototype.define = function CANIMXY3D() {
win=-1;
N=2;
-clrs=[1,2,3,4,5,6,7,13];
-siz=[1,1,1,1,1,1,1,1];
-wpos=[-1,-1];
-wdim=[-1,-1];
-param3ds=[50,280];
-vec_x=[-15,15];
-vec_y=[-15,15];
-vec_z=[-15,15];
+clrs=[[1],[2],[3],[4],[5],[6],[7],[13]];
+siz=[[1],[1],[1],[1],[1],[1],[1],[1]];
+wpos=[[-1],[-1]];
+wdim=[[-1],[-1]];
+param3ds=[[50],[280]];
+vec_x=[[-15],[15]];
+vec_y=[[-15],[15]];
+vec_z=[[-15],[15]];
nbr_curves=1;
model=scicos_model();
model.sim=list("canimxy3d",4);
-model.in1=[1,1,1];
+model.in1=[[1],[1],[1]];
model.evtin=1;
-model.in2=[1,1,1];
-model.intyp=[1,1,1];
-model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
-model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves];
+model.in2=[[1],[1],[1]];
+model.intyp=[[1],[1],[1]];
+model.rpar=[[vec_x.slice()],[vec_y.slice()],[vec_z.slice()],[param3ds.slice()]];
+model.ipar=[[win],[8],[N],[clrs.slice()],[siz.slice()],[8],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.blocktype="d";
model.firing=[];
model.dep_ut=[false,false];
-exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),"[]","[]",strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)];
+exprs=[[string(nbr_curves)],[strcat(string(clrs)," ")],[strcat(string(siz)," ")],[string(win)],["[]"],["[]"],[strcat(string(vec_x)," ")],[strcat(string(vec_y)," ")],[strcat(string(vec_z)," ")],[strcat(string(param3ds)," ")],[string(N)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -37,57 +37,57 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,nbr_curves,clrs,siz,win,wpos,wdim,vec_x,vec_y,vec_z,param3ds,N,exprs]=scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs);
+[ok,nbr_curves,clrs,siz,win,wpos,wdim,vec_x,vec_y,vec_z,param3ds,N,exprs]=scicos_getvalue("Set Scope parameters",[["Number of curves"],["color (>0) or mark (<0)"],["line or mark size"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Xmin and Xmax"],["Ymin and Ymax"],["Zmin and Zmax"],["Alpha and Theta"],["Buffer size"]],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
ok=false;
}
if (size(clrs,"*")!=size(siz,"*")) {
-mess=[mess,"Colors and Size must have same size"," "];
+mess=[[mess],["Colors and Size must have same size"],[" "]];
ok=false;
}
if (nbr_curves<=0) {
-mess=[mess,"Number of curves cannot be negative or null"," "];
+mess=[[mess],["Number of curves cannot be negative or null"],[" "]];
ok=false;
}
if (size(clrs,"*")<nbr_curves) {
-mess=[mess,"You must have at least same size for clrs and the number of curves"," "];
+mess=[[mess],["You must have at least same size for clrs and the number of curves"],[" "]];
ok=false;
}
if (N<1) {
-mess=[mess,"Buffer size must be at least 1"," "];
+mess=[[mess],["Buffer size must be at least 1"],[" "]];
ok=false;
}
if (N<2) {
for (i=1;i<=nbr_curves;i+=1) {
if (clrs(i)>0) {
-mess=[mess,"Buffer size must be at least 2 or Change a color (must be <0)"," "];
+mess=[[mess],["Buffer size must be at least 2 or Change a color (must be <0)"],[" "]];
ok=false;
}
}
}
if (vec_y(1)>=vec_y(2)) {
-mess=[mess,"Ymax must be higher than Ymin"," "];
+mess=[[mess],["Ymax must be higher than Ymin"],[" "]];
ok=false;
}
if (vec_x(1)>=vec_x(2)) {
-mess=[mess,"Xmax must be higher than Xmin"," "];
+mess=[[mess],["Xmax must be higher than Xmin"],[" "]];
ok=false;
}
if (vec_z(1)>=vec_z(2)) {
-mess=[mess,"Zmax must be higher than Zmin"," "];
+mess=[[mess],["Zmax must be higher than Zmin"],[" "]];
ok=false;
}
if (!ok) {
@@ -97,14 +97,14 @@ in1=nbr_curves*ones(3,1);
in2=ones(3,1);
[model,graphics,ok]=set_io(model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]);
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
-rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
+rpar=[[vec_x.slice()],[vec_y.slice()],[vec_z.slice()],[param3ds.slice()]];
size_siz=size(siz,"*");
-ipar=[win,size_siz,N,clrs.slice(),siz.slice(),1,wpos.slice(),wdim.slice(),nbr_curves];
+ipar=[[win],[size_siz],[N],[clrs.slice()],[siz.slice()],[1],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.rpar=rpar;
model.ipar=ipar;
graphics.exprs=exprs;
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index 40452815..d992f039 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -3,18 +3,18 @@ function CEVENTSCOPE() {
CEVENTSCOPE.prototype.define = function CEVENTSCOPE() {
nclock=1;
win=-1;
-clrs=[1,3,5,7,9,11,13,15];
-wdim=[600,400];
-wpos=[-1,-1];
+clrs=[[1],[3],[5],[7],[9],[11],[13],[15]];
+wdim=[[600],[400]];
+wpos=[[-1],[-1]];
per=30;
model=scicos_model();
model.sim=list("cevscpe",4);
model.evtin=1;
model.rpar=per;
-model.ipar=[win,1,clrs[nclock-1],wpos.slice(),wdim.slice()];
+model.ipar=[[win],[1],[clrs[nclock-1]],[wpos.slice()],[wdim.slice()]];
model.blocktype="d";
model.dep_ut=[false,false];
-exprs=[sci2exp(nclock),strcat(sci2exp(clrs[nclock-1])," "),string(win),sci2exp([]),sci2exp(wdim),string(per)];
+exprs=[[sci2exp(nclock)],[strcat(sci2exp(clrs[nclock-1])," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(per)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -28,7 +28,7 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,nclock,clrs,win,wpos,wdim,per,exprs]=scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),exprs);
+[ok,nclock,clrs,win,wpos,wdim,per,exprs]=scicos_getvalue("Set Scope parameters",[["Number of event inputs"],["colors c (>0) or mark (<0)"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Refresh period"]],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),exprs);
nclock=int(nclock);
clrs=int(clrs);
win=int(win);
@@ -37,43 +37,43 @@ break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (nclock<=0) {
-mess=[mess,"Block must have at least one input event"," "];
+mess=[[mess],["Block must have at least one input event"],[" "]];
ok=false;
}
if (size(clrs,"*")!=nclock) {
-mess=[mess,"Inputs color c size must be equal to Number of inputs"," "];
+mess=[[mess],["Inputs color c size must be equal to Number of inputs"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
ok=false;
}
if (per<=0) {
-mess=[mess,"Refresh period must be positive"," "];
+mess=[[mess],["Refresh period must be positive"],[" "]];
ok=false;
}
if (ok) {
[model,graphics,ok]=set_io(model,graphics,list(),list(),ones(nclock,1),[]);
} else {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
rpar=per;
-ipar=[win,1,clrs.slice(),wpos.slice(),wdim.slice()];
+ipar=[[win],[1],[clrs.slice()],[wpos.slice()],[wdim.slice()]];
model.rpar=rpar;
model.ipar=ipar;
graphics.exprs=exprs;
diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js
index 43fedf68..1ddfb03f 100644
--- a/js/Sinks/CFSCOPE.js
+++ b/js/Sinks/CFSCOPE.js
@@ -2,9 +2,9 @@
function CFSCOPE() {
CFSCOPE.prototype.define = function CFSCOPE() {
win=-1;
-wdim=[600,400];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
+wdim=[[600],[400]];
+wpos=[[-1],[-1]];
+clrs=[[1],[3],[5],[7],[9],[11],[13],[15]];
N=2;
ymin=-15;
ymax=+15;
@@ -12,11 +12,11 @@ per=30;
model=scicos_model();
model.sim=list("cfscope",4);
model.evtin=1;
-model.rpar=[0,ymin,ymax,per];
-model.ipar=[win,1,N,clrs,wpos,wdim,1,1];
+model.rpar=[[0],[ymin],[ymax],[per]];
+model.ipar=[[win],[1],[N],[clrs],[wpos],[wdim],[1],[1]];
model.blocktype="c";
model.dep_ut=[true,false];
-exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),string([1])];
+exprs=[[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[string([1])]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -30,57 +30,57 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,clrs,win,wpos,wdim,ymin,ymax,per,N,wu,exprs]=scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),exprs);
+[ok,clrs,win,wpos,wdim,ymin,ymax,per,N,wu,exprs]=scicos_getvalue("Set Scope parameters",[["Color (>0) or mark (<0) vector (8 entries)"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Ymin"],["Ymax"],["Refresh period"],["Buffer size","Links to view"]],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
ok=false;
}
if (per<=0) {
-mess=[mess,"Refresh period must be positive"," "];
+mess=[[mess],["Refresh period must be positive"],[" "]];
ok=false;
}
if (N<2) {
-mess=[mess,"Buffer size must be at least 2"," "];
+mess=[[mess],["Buffer size must be at least 2"],[" "]];
ok=false;
}
if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
ok=false;
}
if (wu<0) {
-mess=[mess,"Link to view must be positive"," "];
+mess=[[mess],["Link to view must be positive"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
-rpar=[0,ymin,ymax,per];
+rpar=[[0],[ymin],[ymax],[per]];
if (size(clrs,"*")>8) {
clrs=clrs.slice(1-1,8);
}
if (size(clrs,"*")<8) {
clrs[8-1]=0;
}
-ipar=[win,1,N,clrs.slice(),wpos.slice(),wdim.slice(),size(wu,"*"),wu.slice()];
+ipar=[[win],[1],[N],[clrs.slice()],[wpos.slice()],[wdim.slice()],[size(wu,"*")],[wu.slice()]];
model.rpar=rpar;
model.ipar=ipar;
model.firing=[];
diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js
index d8b46847..dad99a07 100644
--- a/js/Sinks/CLKOUTV_f.js
+++ b/js/Sinks/CLKOUTV_f.js
@@ -22,7 +22,7 @@ graphics=arg1.graphics;
model=arg1.model;
exprs=graphics.exprs;
while (true) {
-[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLKOUTV_f")," ",gettext("Event output port")],gettext("Port number"),list("vec",1),exprs);
+[ok,prt,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"CLKOUTV_f")],[" "],[gettext("Event output port")]],gettext("Port number"),list("vec",1),exprs);
if (!ok) {
break;
}
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 1ee7d493..22352caa 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -15,11 +15,11 @@ model.in1=-1;
model.in2=-2;
model.intyp=1;
model.evtin=1;
-model.ipar=[cmin,cmax,size_c,size_x,size_y];
-model.rpar=[colormap.slice(),x,y];
+model.ipar=[[cmin],[cmax],[size_c],[size_x],[size_y]];
+model.rpar=[[colormap.slice()],[x],[y]];
model.blocktype="c";
model.dep_ut=[true,false];
-exprs=[strcat(string(x)," "),strcat(string(y)," "),string("jetcolormap(25)"),string(cmin),string(cmax)];
+exprs=[[strcat(string(x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -33,27 +33,27 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,vec_x,vec_y,colormap,cmin,cmax,exprs]=scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
+[ok,vec_x,vec_y,colormap,cmin,cmax,exprs]=scicos_getvalue("Set Scope parameters",[["Bounds Vector X (-1 for standard)"],["Bounds Vector Y (-1 for standard)"],["ColorMap"],["Zmin"],["Zmax"]],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(vec_x,"*")!=size(vec_y,"*")) {
-mess=[mess,"Vector X and Vector Y must have the same size"," "];
+mess=[[mess],["Vector X and Vector Y must have the same size"],[" "]];
ok=false;
}
if (cmax<=cmin) {
-mess=[mess,"Error with minimum and maximum value"," "];
+mess=[[mess],["Error with minimum and maximum value"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
size_x=size(vec_x,"*");
size_c=size(colormap.slice(),1);
-ipar=[cmin,cmax,size_c,size_x];
-rpar=[colormap.slice(),vec_x.slice(),vec_y.slice()];
+ipar=[[cmin],[cmax],[size_c],[size_x]];
+rpar=[[colormap.slice()],[vec_x.slice()],[vec_y.slice()]];
model.ipar=ipar;
model.rpar=rpar;
graphics.exprs=exprs;
diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js
index 4d4b8254..35a204ec 100644
--- a/js/Sinks/CMATVIEW.js
+++ b/js/Sinks/CMATVIEW.js
@@ -13,11 +13,11 @@ model.in1=-1;
model.in2=-2;
model.intyp=1;
model.evtin=1;
-model.ipar=[cmin,cmax,size_c];
-model.rpar=[alpha_c,beta_c,colormap.slice()];
+model.ipar=[[cmin],[cmax],[size_c]];
+model.rpar=[[alpha_c],[beta_c],[colormap.slice()]];
model.blocktype="c";
model.dep_ut=[true,false];
-exprs=[string("jetcolormap(25)"),string(cmin),string(cmax)];
+exprs=[[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -31,25 +31,25 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,colormap,cmin,cmax,exprs]=scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),exprs);
+[ok,colormap,cmin,cmax,exprs]=scicos_getvalue("Set Scope parameters",[["ColorMap"],["Minimum level range"],["Maximum level range"]],list("vec",-1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (cmax<=cmin) {
-mess=[mess,"Error with minimum and maximum value"," "];
+mess=[[mess],["Error with minimum and maximum value"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
size_c=size(colormap.slice(),1);
-sol=inv([cmin,1,cmax,1])*[1,size_c/3];
+sol=inv([[cmin,1],[cmax,1]])*[[1],[size_c/3]];
alpha_c=sol(1);
beta_c=sol(2);
-ipar=[cmin,cmax,size_c];
-rpar=[alpha_c,beta_c,colormap.slice()];
+ipar=[[cmin],[cmax],[size_c]];
+rpar=[[alpha_c],[beta_c],[colormap.slice()]];
model.ipar=ipar;
model.rpar=rpar;
graphics.exprs=exprs;
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index 95f8d6ad..40ba209b 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -2,27 +2,27 @@
function CMSCOPE() {
CMSCOPE.prototype.define = function CMSCOPE() {
win=-1;
-in1=[1,1];
-wdim=[-1,-1];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
+in1=[[1],[1]];
+wdim=[[-1],[-1]];
+wpos=[[-1],[-1]];
+clrs=[[1],[3],[5],[7],[9],[11],[13],[15]];
N=20;
-ymin=[-1,-5];
-ymax=[1,5];
-per=[30,30];
-yy=[transpose(ymin.slice()),transpose(ymax.slice())];
+ymin=[[-1],[-5]];
+ymax=[[1],[5]];
+per=[[30],[30]];
+yy=[[transpose(ymin.slice())],[transpose(ymax.slice())]];
period=transpose(per.slice());
model=scicos_model();
model.sim=list("cmscope",4);
model.in1=in1;
-model.in2=[1,1];
-model.intyp=[1,1];
+model.in2=[[1],[1]];
+model.intyp=[[1],[1]];
model.evtin=1;
-model.rpar=[0,period.slice(),yy.slice()];
-model.ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(1-1,sum(in1))];
+model.rpar=[[0],[period.slice()],[yy.slice()]];
+model.ipar=[[win],[size(in1,"*")],[N],[wpos.slice()],[wdim.slice()],[in1.slice()],[clrs.slice(1-1,sum(in1))]];
model.blocktype="c";
model.dep_ut=[true,false];
-exprs=[strcat(string(in1)," "),strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp([]),strcat(string(ymin)," "),strcat(string(ymax)," "),strcat(string(per)," "),string(N),string(0),emptystr()];
+exprs=[[strcat(string(in1)," ")],[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp([])],[strcat(string(ymin)," ")],[strcat(string(ymax)," ")],[strcat(string(per)," ")],[string(N)],[string(0)],[emptystr()]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -36,59 +36,59 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,in1,clrs,win,wpos,wdim,ymin,ymax,per,N,heritance,nom,exprs]=scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),exprs);
+[ok,in1,clrs,win,wpos,wdim,ymin,ymax,per,N,heritance,nom,exprs]=scicos_getvalue("Set Scope parameters",[["Input ports sizes"],["Drawing colors (>0) or mark (<0)"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Ymin vector"],["Ymax vector"],["Refresh period"],["Buffer size"],["Accept herited events 0/1","Name of Scope (label&Id)"]],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(in1,"*")<=0) {
-mess=[mess,"Block must have at least one input port"," "];
+mess=[[mess],["Block must have at least one input port"],[" "]];
ok=false;
}
if (min(in1)<=0) {
-mess=[mess,"Port sizes must be positive"," "];
+mess=[[mess],["Port sizes must be positive"],[" "]];
ok=false;
}
if (size(clrs,"*")<sum(in1)) {
-mess=[mess,"Not enough colors defined (at least "+string(sum(in1))+")"," "];
+mess=[[mess],["Not enough colors defined (at least "+string(sum(in1))+")"],[" "]];
ok=false;
}
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number can\'t be < -1"," "];
+mess=[[mess],["Window number can\'t be < -1"],[" "]];
ok=false;
}
if (size(per,"*")!=size(ymin,"*")) {
-mess=[mess,"Size of Refresh Period must equal size of Ymin/Ymax vector"," "];
+mess=[[mess],["Size of Refresh Period must equal size of Ymin/Ymax vector"],[" "]];
ok=false;
}
for (i=1;i<=size(per,"*");i+=1) {
if ((per(i)<=0)) {
-mess=[mess,"Refresh Period must be positive"," "];
+mess=[[mess],["Refresh Period must be positive"],[" "]];
ok=false;
}
}
if (N<2) {
-mess=[mess,"Buffer size must be at least 2"," "];
+mess=[[mess],["Buffer size must be at least 2"],[" "]];
ok=false;
}
if (or(ymin>=ymax)) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
ok=false;
}
if (!or(heritance==[0,1])) {
-mess=[mess,"Accept herited events must be 0 or 1"," "];
+mess=[[mess],["Accept herited events must be 0 or 1"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
in1=in1.slice();
@@ -98,17 +98,17 @@ in2=ones(a,1);
}
if (ok) {
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
if (ok) {
period=transpose(per.slice());
-yy=[transpose(ymin.slice()),transpose(ymax.slice())];
-rpar=[0,period.slice(),yy.slice()];
+yy=[[transpose(ymin.slice())],[transpose(ymax.slice())]];
+rpar=[[0],[period.slice()],[yy.slice()]];
clrs=clrs.slice(1-1,sum(in1));
-ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(),heritance];
+ipar=[[win],[size(in1,"*")],[N],[wpos.slice()],[wdim.slice()],[in1.slice()],[clrs.slice()],[heritance]];
model.evtin=ones(1-heritance,1);
model.dstate=[];
model.rpar=rpar;
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 290cf30f..7e126fe5 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -2,9 +2,9 @@
function CSCOPE() {
CSCOPE.prototype.define = function CSCOPE() {
win=-1;
-wdim=[600,400];
-wpos=[-1,-1];
-clrs=[1,3,5,7,9,11,13,15];
+wdim=[[600],[400]];
+wpos=[[-1],[-1]];
+clrs=[[1],[3],[5],[7],[9],[11],[13],[15]];
N=20;
ymin=-15;
ymax=+15;
@@ -14,11 +14,11 @@ model.sim=list("cscope",4);
model.in1=-1;
model.in2=1;
model.evtin=1;
-model.rpar=[0,ymin,ymax,per];
-model.ipar=[win,1,N,clrs,wpos,wdim];
+model.rpar=[[0],[ymin],[ymax],[per]];
+model.ipar=[[win],[1],[N],[clrs],[wpos],[wdim]];
model.blocktype="c";
model.dep_ut=[true,false];
-exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),transpose(string(0)),emptystr()];
+exprs=[[strcat(string(clrs)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(ymin)],[string(ymax)],[string(per)],[string(N)],[transpose(string(0))],[emptystr()]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -32,54 +32,54 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,clrs,win,wpos,wdim,ymin,ymax,per,N,heritance,nom,exprs]=scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),exprs);
+[ok,clrs,win,wpos,wdim,ymin,ymax,per,N,heritance,nom,exprs]=scicos_getvalue("Set Scope parameters",[["Color (>0) or mark (<0) vector (8 entries)"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Ymin"],["Ymax"],["Refresh period"],["Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"]],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number can\'t be < -1"," "];
+mess=[[mess],["Window number can\'t be < -1"],[" "]];
ok=false;
}
if (per<=0) {
-mess=[mess,"Refresh period must be positive"," "];
+mess=[[mess],["Refresh period must be positive"],[" "]];
ok=false;
}
if (N<2) {
-mess=[mess,"Buffer size must be at least 2"," "];
+mess=[[mess],["Buffer size must be at least 2"],[" "]];
ok=false;
}
if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
ok=false;
}
if (!or(heritance==[0,1])) {
-mess=[mess,"Accept herited events must be 0 or 1"," "];
+mess=[[mess],["Accept herited events must be 0 or 1"],[" "]];
ok=false;
}
if (!ok) {
-message(["Some specified values are inconsistent:"," ",mess]);
+message([["Some specified values are inconsistent:"],[" "],[mess]]);
}
if (ok) {
[model,graphics,ok]=set_io(model,graphics,list([-1,1],1),list(),ones(1-heritance,1),[]);
}
if (ok) {
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
-rpar=[0,ymin,ymax,per];
-ipar=[win,1,N,clrs.slice(),wpos.slice(),wdim.slice()];
+rpar=[[0],[ymin],[ymax],[per]];
+ipar=[[win],[1],[N],[clrs.slice()],[wpos.slice()],[wdim.slice()]];
model.rpar=rpar;
model.ipar=ipar;
model.evtin=ones(1-heritance,1);
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index 1182d883..8478a721 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -4,8 +4,8 @@ CSCOPXY.prototype.define = function CSCOPXY() {
win=-1;
clrs=4;
siz=1;
-wdim=[600,400];
-wpos=[-1,-1];
+wdim=[[600],[400]];
+wpos=[[-1],[-1]];
N=2;
xmin=-15;
xmax=15;
@@ -14,15 +14,15 @@ ymax=+15;
nbr_curves=1;
model=scicos_model();
model.sim=list("cscopxy",4);
-model.in1=[1,1];
-model.in2=[1,1];
-model.intyp=[1,1];
+model.in1=[[1],[1]];
+model.in2=[[1],[1]];
+model.intyp=[[1],[1]];
model.evtin=1;
-model.rpar=[xmin,xmax,ymin,ymax];
-model.ipar=[win,1,N,clrs,siz,1,wpos.slice(),wdim.slice(),nbr_curves];
+model.rpar=[[xmin],[xmax],[ymin],[ymax]];
+model.ipar=[[win],[1],[N],[clrs],[siz],[1],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.blocktype="d";
model.dep_ut=[false,false];
-exprs=[string(nbr_curves),sci2exp(clrs),sci2exp(siz),string(win),sci2exp([]),sci2exp(wdim),string(xmin),string(xmax),string(ymin),string(ymax),string(N)];
+exprs=[[string(nbr_curves)],[sci2exp(clrs)],[sci2exp(siz)],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -36,41 +36,41 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,nbr_curves,clrs,siz,win,wpos,wdim,xmin,xmax,ymin,ymax,N,exprs]=scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,nbr_curves,clrs,siz,win,wpos,wdim,xmin,xmax,ymin,ymax,N,exprs]=scicos_getvalue("Set Scope parameters",[["Number of Curves"],["color (>0) or mark (<0)"],["line or mark size"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Xmin"],["Xmax"],["Ymin"],["Ymax"],["Buffer size"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (nbr_curves<=0) {
-mess=[mess,"Number of Curves cannot be negative or null"," "];
+mess=[[mess],["Number of Curves cannot be negative or null"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
ok=false;
}
if (N<1) {
-mess=[mess,"Buffer size must be at least 1"," "];
+mess=[[mess],["Buffer size must be at least 1"],[" "]];
ok=false;
}
if (N==1&&clrs>0) {
-mess=[mess,"Buffer size must be at least 2"," "];
+mess=[[mess],["Buffer size must be at least 2"],[" "]];
ok=false;
}
if (ymin>=ymax) {
-mess=[mess,"Ymax must be greater than Ymin"," "];
+mess=[[mess],["Ymax must be greater than Ymin"],[" "]];
ok=false;
}
if (xmin>=xmax) {
-mess=[mess,"Xmax must be greater than Xmin"," "];
+mess=[[mess],["Xmax must be greater than Xmin"],[" "]];
ok=false;
}
if (!ok) {
@@ -80,13 +80,13 @@ in1=nbr_curves*ones(2,1);
in2=ones(2,1);
[model,graphics,ok]=set_io(model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
-rpar=[xmin,xmax,ymin,ymax];
-ipar=[win,1,N,clrs,siz,1,wpos.slice(),wdim.slice(),nbr_curves];
+rpar=[[xmin],[xmax],[ymin],[ymax]];
+ipar=[[win],[1],[N],[clrs],[siz],[1],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.rpar=rpar;
model.ipar=ipar;
graphics.exprs=exprs;
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 9d6b7d67..0f79bba5 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -2,27 +2,27 @@
function CSCOPXY3D() {
CSCOPXY3D.prototype.define = function CSCOPXY3D() {
win=-1;
-clrs=[1,2,3,4,5,6,7,13];
-siz=[1,1,1,1,1,1,1,1];
-wdim=[600,400];
-wpos=[-1,-1];
+clrs=[[1],[2],[3],[4],[5],[6],[7],[13]];
+siz=[[1],[1],[1],[1],[1],[1],[1],[1]];
+wdim=[[600],[400]];
+wpos=[[-1],[-1]];
N=2;
-param3ds=[50,280];
-vec_x=[-15,15];
-vec_y=[-15,15];
-vec_z=[-15,15];
+param3ds=[[50],[280]];
+vec_x=[[-15],[15]];
+vec_y=[[-15],[15]];
+vec_z=[[-15],[15]];
nbr_curves=1;
model=scicos_model();
model.sim=list("cscopxy3d",4);
-model.in1=[1,1,1];
-model.in2=[1,1,1];
-model.intyp=[1,1,1];
+model.in1=[[1],[1],[1]];
+model.in2=[[1],[1],[1]];
+model.intyp=[[1],[1],[1]];
model.evtin=1;
-model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
-model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves];
+model.rpar=[[vec_x.slice()],[vec_y.slice()],[vec_z.slice()],[param3ds.slice()]];
+model.ipar=[[win],[8],[N],[clrs.slice()],[siz.slice()],[8],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.blocktype="d";
model.dep_ut=[false,false];
-exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),sci2exp([]),sci2exp(wdim),strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)];
+exprs=[[string(nbr_curves)],[strcat(string(clrs)," ")],[strcat(string(siz)," ")],[string(win)],[sci2exp([])],[sci2exp(wdim)],[strcat(string(vec_x)," ")],[strcat(string(vec_y)," ")],[strcat(string(vec_z)," ")],[strcat(string(param3ds)," ")],[string(N)]];
gr_i=[];
x=standard_define([2,2],model,exprs,gr_i);
}
@@ -36,53 +36,53 @@ graphics=arg1.graphics;
exprs=graphics.exprs;
model=arg1.model;
while (true) {
-[ok,nbr_curves,clrs,siz,win,wpos,wdim,vec_x,vec_y,vec_z,param3ds,N,exprs]=scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),exprs);
+[ok,nbr_curves,clrs,siz,win,wpos,wdim,vec_x,vec_y,vec_z,param3ds,N,exprs]=scicos_getvalue("Set Scope parameters",[["Number of curves"],["color (>0) or mark (<0)"],["Line or Mark Size"],["Output window number (-1 for automatic)"],["Output window position"],["Output window sizes"],["Xmin and Xmax"],["Ymin and Ymax"],["Zmin and Zmax"],["Alpha and Theta"],["Buffer size"]],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),exprs);
if (!ok) {
break;
}
mess=[];
if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
-mess=[mess,"Window position must be [] or a 2 vector"," "];
+mess=[[mess],["Window position must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
-mess=[mess,"Window dim must be [] or a 2 vector"," "];
+mess=[[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok=false;
}
if (size(clrs,"*")!=size(siz,"*")) {
-mess=[mess,"Colors and Size must have same size"," "];
+mess=[[mess],["Colors and Size must have same size"],[" "]];
ok=false;
}
if (nbr_curves<=0) {
-mess=[mess,"Number of curves cannot be negative or null"," "];
+mess=[[mess],["Number of curves cannot be negative or null"],[" "]];
ok=false;
}
if (win<-1) {
-mess=[mess,"Window number cannot be inferior than -1"," "];
+mess=[[mess],["Window number cannot be inferior than -1"],[" "]];
ok=false;
}
if (N<1) {
-mess=[mess,"Buffer size must be at least 1"," "];
+mess=[[mess],["Buffer size must be at least 1"],[" "]];
ok=false;
}
if (N<2) {
for (i=1;i<=size(clrs,"*");i+=1) {
if (clrs(i)>0) {
-mess=[mess,"Buffer size must be at least 2 or Change a color (must be >0)"," "];
+mess=[[mess],["Buffer size must be at least 2 or Change a color (must be >0)"],[" "]];
ok=false;
}
}
}
if (vec_y(1)>=vec_y(2)) {
-mess=[mess,"Ymax must be higher than Ymin"," "];
+mess=[[mess],["Ymax must be higher than Ymin"],[" "]];
ok=false;
}
if (vec_x(1)>=vec_x(2)) {
-mess=[mess,"Xmax must be higher than Xmin"," "];
+mess=[[mess],["Xmax must be higher than Xmin"],[" "]];
ok=false;
}
if (vec_z(1)>=vec_z(2)) {
-mess=[mess,"Zmax must be higher than Zmin"," "];
+mess=[[mess],["Zmax must be higher than Zmin"],[" "]];
ok=false;
}
if (ok) {
@@ -90,14 +90,14 @@ in1=nbr_curves*ones(3,1);
in2=ones(3,1);
[model,graphics,ok]=set_io(model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]);
if (wpos==[]) {
-wpos=[-1,-1];
+wpos=[[-1],[-1]];
}
if (wdim==[]) {
-wdim=[-1,-1];
+wdim=[[-1],[-1]];
}
-rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()];
+rpar=[[vec_x.slice()],[vec_y.slice()],[vec_z.slice()],[param3ds.slice()]];
size_siz=size(siz,"*");
-ipar=[win,size_siz,N,clrs.slice(),siz.slice(),1,wpos.slice(),wdim.slice(),nbr_curves];
+ipar=[[win],[size_siz],[N],[clrs.slice()],[siz.slice()],[1],[wpos.slice()],[wdim.slice()],[nbr_curves]];
model.rpar=rpar;
model.ipar=ipar;
graphics.exprs=exprs;
diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js
index eb8d5d44..fc422586 100644
--- a/js/Sinks/OUTIMPL_f.js
+++ b/js/Sinks/OUTIMPL_f.js
@@ -31,7 +31,7 @@ if (size(exprs,"*")==2) {
exprs=exprs[1-1];
}
while (true) {
-[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"OUTIMPL_f")," ",gettext("Implicit output port")],gettext("Port number"),list("vec",1),exprs);
+[ok,prt,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"OUTIMPL_f")],[" "],[gettext("Implicit output port")]],gettext("Port number"),list("vec",1),exprs);
if (!ok) {
break;
}
diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js
index a4d03ce6..5182de0a 100644
--- a/js/Sinks/OUT_f.js
+++ b/js/Sinks/OUT_f.js
@@ -28,7 +28,7 @@ if (size(exprs,"*")==2) {
exprs=exprs[1-1];
}
while (true) {
-[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"OUT_f")," ",gettext("Regular output port")],gettext("Port number"),list("vec",1),exprs);
+[ok,prt,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"OUT_f")],[" "],[gettext("Regular output port")]],gettext("Port number"),list("vec",1),exprs);
if (!ok) {
break;
}
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 38f030cf..9df07c67 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -14,12 +14,12 @@ model.out=[];
model.evtin=[1];
model.evtout=[];
model.rpar=[];
-model.ipar=[nz,length(varnam),transpose(ascii(varnam))];
+model.ipar=[[nz],[length(varnam)],[transpose(ascii(varnam))]];
model.blocktype="d";
model.firing=[];
model.dep_ut=[false,false];
gr_i=[];
-exprs=[string(nz),string(varnam),string(herit)];
+exprs=[[string(nz)],[string(varnam)],[string(herit)]];
x=standard_define([4,2],model,exprs,gr_i);
}
TOWS_c.prototype.details = function TOWS_c() {
@@ -32,7 +32,7 @@ graphics=arg1.graphics;
model=arg1.model;
exprs=graphics.exprs;
while (true) {
-[ok,nz,varnam,herit,exprs]=scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),exprs);
+[ok,nz,varnam,herit,exprs]=scicos_getvalue("Set Xcos buffer block",[["Size of buffer"],["Scilab variable name"],["Inherit (no:0, yes:1)"]],list("vec",1,"str",1,"vec",1),exprs);
if (!ok) {
break;
}
@@ -43,7 +43,7 @@ ok=false;
r=false;
ierr=execstr("r = validvar(varnam)","errcatch");
if (!r||ierr!=0||length(varnam)>19) {
-message(["Invalid variable name.","Please choose another variable name."]);
+message([["Invalid variable name."],["Please choose another variable name."]]);
ok=false;
}
execstr("if type("+varnam+") <> 17 | or(fieldnames("+varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch");
@@ -54,7 +54,7 @@ model.blocktype="x";
} else {
model.blocktype="d";
}
-model.ipar=[nz,length(varnam),transpose(ascii(varnam))];
+model.ipar=[[nz],[length(varnam)],[transpose(ascii(varnam))]];
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js
index 4724dc79..4c8225b4 100644
--- a/js/Sinks/WFILE_f.js
+++ b/js/Sinks/WFILE_f.js
@@ -11,11 +11,11 @@ model=scicos_model();
model.sim="writef";
model.in1=in1;
model.evtin=1;
-model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
-model.ipar=[length(fname),length(frmt),0,N,_str2code(fname),_str2code(frmt)];
+model.dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]];
+model.ipar=[[length(fname)],[length(frmt)],[0],[N],[_str2code(fname)],[_str2code(frmt)]];
model.blocktype="d";
model.dep_ut=[true,false];
-exprs=[sci2exp(in1),fname,frmt,string(N)];
+exprs=[[sci2exp(in1)],[fname],[frmt],[string(N)]];
gr_i=[];
x=standard_define([3,2],model,exprs,gr_i);
}
@@ -38,7 +38,7 @@ lunit=dstate(2);
fname=exprs[2-1];
frmt=exprs[3-1];
while (true) {
-[ok,in1,fname1,frmt1,N,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"WFILE_f")," ",gettext("Write to output file")," ",gettext("Write is done on:"),gettext("&nbsp; - A binary file if no format given"),gettext("&nbsp; - A formatted text file if a format (Fortran type) is given")],[gettext("Input Size"),gettext("Output File Name"),gettext("Output Format"),gettext("Buffer Size")],list("vec",1,"str",1,"str",1,"vec",1),exprs);
+[ok,in1,fname1,frmt1,N,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"WFILE_f")],[" "],[gettext("Write to output file")],[" "],[gettext("Write is done on:")],[gettext("&nbsp; - A binary file if no format given")],[gettext("&nbsp; - A formatted text file if a format (Fortran type) is given")]],[[gettext("Input Size")],[gettext("Output File Name")],[gettext("Output Format")],[gettext("Buffer Size")]],list("vec",1,"str",1,"str",1,"vec",1),exprs);
if (!ok) {
break;
}
@@ -72,9 +72,9 @@ block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),
ok=false;
}
if (ok) {
-ipar=[length(fname1),length(frmt1),0,N,_str2code(fname1),_str2code(frmt1)];
+ipar=[[length(fname1)],[length(frmt1)],[0],[N],[_str2code(fname1)],[_str2code(frmt1)]];
if (prod(size(dstate))!=(nin+1)*N+2) {
-dstate=[-1,lunit,zeros((nin+1)*N,1)];
+dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]];
}
model.in1=nin;
model.dstate=dstate;
diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js
index 418b46b2..ad34ab59 100644
--- a/js/Sinks/WRITEAU_f.js
+++ b/js/Sinks/WRITEAU_f.js
@@ -12,8 +12,8 @@ model=scicos_model();
model.sim=list("writeau",2);
model.in1=in1;
model.evtin=1;
-model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
-model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
+model.dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]];
+model.ipar=[[length(fname)],[_str2code(frmt)],[N],[swap],[_str2code(fname)]];
model.blocktype="d";
model.dep_ut=[true,false];
exprs=[string(N),string(swap)];
@@ -33,7 +33,7 @@ ipar=model.ipar;
dstate=model.dstate;
lunit=dstate(2);
while (true) {
-[ok,N,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"WRITEAU_f")," ",gettext("Write \'.au\' sound file on audio device")],[gettext("Buffer Size"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",1,"vec",1),exprs);
+[ok,N,swap,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"WRITEAU_f")],[" "],[gettext("Write \'.au\' sound file on audio device")]],[[gettext("Buffer Size")],[gettext("Swap Mode (0:No, 1:Yes)")]],list("vec",1,"vec",1),exprs);
if (!ok) {
break;
}
@@ -52,9 +52,9 @@ block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),
ok=false;
}
if (ok) {
-ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)];
+ipar=[[length(fname1)],[_str2code(frmt1)],[N],[swap],[_str2code(fname1)]];
if (prod(size(dstate))!=(nin+1)*N+2) {
-dstate=[-1,lunit,zeros((nin+1)*N,1)];
+dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]];
}
model.in1=1;
model.dstate=dstate;
diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js
index 99ad1e75..4e01e104 100644
--- a/js/Sinks/WRITEC_f.js
+++ b/js/Sinks/WRITEC_f.js
@@ -12,11 +12,11 @@ model=scicos_model();
model.sim=list("writec",2);
model.in1=in1;
model.evtin=1;
-model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
-model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
+model.dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]];
+model.ipar=[[length(fname)],[_str2code(frmt)],[N],[swap],[_str2code(fname)]];
model.blocktype="d";
model.dep_ut=[true,false];
-exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)];
+exprs=[[sci2exp(in1)],[fname],[frmt],[string(N),string(swap)]];
gr_i=[];
x=standard_define([4,2],model,exprs,gr_i);
}
@@ -35,7 +35,7 @@ lunit=dstate(2);
fname=exprs[2-1];
frmt=exprs[3-1];
while (true) {
-[ok,in1,fname1,frmt1,N,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"WRITEC_f")," ",gettext("Write to C binary file")],[gettext("Input Size"),gettext("Output File Name"),gettext("Output Format"),gettext("Buffer Size"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),exprs);
+[ok,in1,fname1,frmt1,N,swap,exprs]=scicos_getvalue([[msprintf(gettext("Set %s block parameters"),"WRITEC_f")],[" "],[gettext("Write to C binary file")]],[[gettext("Input Size")],[gettext("Output File Name")],[gettext("Output Format")],[gettext("Buffer Size")],[gettext("Swap Mode (0:No, 1:Yes)")]],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),exprs);
if (!ok) {
break;
}
@@ -73,9 +73,9 @@ ok=false;
}
frmt1=part(frmt1,1,3);
if (ok) {
-ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)];
+ipar=[[length(fname1)],[_str2code(frmt1)],[N],[swap],[_str2code(fname1)]];
if (prod(size(dstate))!=(nin+1)*N+2) {
-dstate=[-1,lunit,zeros((nin+1)*N,1)];
+dstate=[[-1],[lunit],[zeros((nin+1)*N,1)]];
}
model.in1=nin;
model.dstate=dstate;