diff options
Diffstat (limited to 'js/Sinks')
-rw-r--r-- | js/Sinks/AFFICH_m.js | 12 | ||||
-rw-r--r-- | js/Sinks/BARXY.js | 8 | ||||
-rw-r--r-- | js/Sinks/CANIMXY.js | 18 | ||||
-rw-r--r-- | js/Sinks/CANIMXY3D.js | 24 | ||||
-rw-r--r-- | js/Sinks/CEVENTSCOPE.js | 14 | ||||
-rw-r--r-- | js/Sinks/CFSCOPE.js | 18 | ||||
-rw-r--r-- | js/Sinks/CLKOUTV_f.js | 2 | ||||
-rw-r--r-- | js/Sinks/CLKOUT_f.js | 2 | ||||
-rw-r--r-- | js/Sinks/CMAT3D.js | 6 | ||||
-rw-r--r-- | js/Sinks/CMATVIEW.js | 4 | ||||
-rw-r--r-- | js/Sinks/CMSCOPE.js | 24 | ||||
-rw-r--r-- | js/Sinks/CSCOPE.js | 16 | ||||
-rw-r--r-- | js/Sinks/CSCOPXY.js | 18 | ||||
-rw-r--r-- | js/Sinks/CSCOPXY3D.js | 22 | ||||
-rw-r--r-- | js/Sinks/OUTIMPL_f.js | 2 | ||||
-rw-r--r-- | js/Sinks/OUT_f.js | 2 | ||||
-rw-r--r-- | js/Sinks/TOWS_c.js | 8 | ||||
-rw-r--r-- | js/Sinks/TRASH_f.js | 2 | ||||
-rw-r--r-- | js/Sinks/WFILE_f.js | 20 | ||||
-rw-r--r-- | js/Sinks/WRITEAU_f.js | 8 | ||||
-rw-r--r-- | js/Sinks/WRITEC_f.js | 18 |
21 files changed, 124 insertions, 124 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index acab657e..972f2c4e 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -15,26 +15,26 @@ break mess=[]; if (font<=0) { mess=[mess,"Font number must be positive"," "]; -ok=None; +ok=false; } if (fontsize<=0) { mess=[mess,"Font size must be positive"," "]; -ok=None; +ok=false; } if (nt<=3) { mess=[mess,"Total number of digits must be greater than 3"," "]; -ok=None; +ok=false; } if (nd<0) { mess=[mess,"Number of rational part digits must be ","greater or equal 0"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); } if (!or(herit==[0,1])) { mess=[mess,"Accept inherited values are 0 and 1"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -69,7 +69,7 @@ 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,None]; +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)]; gr_i=[]; diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 6e8f6e5e..806afce7 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -15,15 +15,15 @@ break mess=[]; if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (thickness<=0) { mess=[mess,"Thickness must be strictly positive."]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -45,7 +45,7 @@ ymin=-15; ymax=15; model.sim=list("BARXY_sim",5); model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.in1=[-1,-1]; model.intyp=[1]; model.out=[]; diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index f74f7a51..4004cbcf 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -15,35 +15,35 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +ok=false; } if (N==1&&clrs>0) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -90,7 +90,7 @@ 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=[None,None]; +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)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 4e31e07b..b7310730 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -15,51 +15,51 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (size(clrs,"*")!=size(siz,"*")) { mess=[mess,"Colors and Size must have same size"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (size(clrs,"*")<nbr_curves) { mess=[mess,"You must have at least same size for clrs and the number of curves"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +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)"," "]; -ok=None; +ok=false; } } } if (vec_y(1)>=vec_y(2)) { mess=[mess,"Ymax must be higher than Ymin"," "]; -ok=None; +ok=false; } if (vec_x(1)>=vec_x(2)) { mess=[mess,"Xmax must be higher than Xmin"," "]; -ok=None; +ok=false; } if (vec_z(1)>=vec_z(2)) { mess=[mess,"Zmax must be higher than Zmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -107,7 +107,7 @@ 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=[None,None]; +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)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 82197c06..1d7fea48 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -18,27 +18,27 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (nclock<=0) { mess=[mess,"Block must have at least one input event"," "]; -ok=None; +ok=false; } if (size(clrs,"*")!=nclock) { mess=[mess,"Inputs color c size must be equal to Number of inputs"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (per<=0) { mess=[mess,"Refresh period must be positive"," "]; -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list(),list(),ones(nclock,1),[]); @@ -76,7 +76,7 @@ model.evtin=1; model.rpar=per; model.ipar=[win,1,clrs(nclock),wpos.slice(),wdim.slice()]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[sci2exp(nclock),strcat(sci2exp(clrs(nclock))," "),string(win),sci2exp([]),sci2exp(wdim),string(per)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index eb0a23d6..45f7fc92 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -15,31 +15,31 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (per<=0) { mess=[mess,"Refresh period must be positive"," "]; -ok=None; +ok=false; } if (N<2) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (wu<0) { mess=[mess,"Link to view must be positive"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -62,7 +62,7 @@ ipar=[win,1,N,clrs.slice(),wpos.slice(),wdim.slice(),size(wu,"*"),wu.slice()]; model.rpar=rpar; model.ipar=ipar; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; graphics.exprs=exprs; x.graphics=graphics; x.model=model; @@ -85,7 +85,7 @@ model.evtin=1; model.rpar=[0,ymin,ymax,per]; model.ipar=[win,1,N,clrs,wpos,wdim,1,1]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; 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); diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index a9ab9144..b8541da3 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -33,7 +33,7 @@ model.evtin=1; model.ipar=prt; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); x=standard_define([1,1],model,exprs," "); } diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index f97d4c48..466461c3 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -35,7 +35,7 @@ model.evtin=1; model.ipar=prt; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); x=standard_define([1,1],model,exprs," "); } diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 0d0d3501..b04ee9f5 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -15,11 +15,11 @@ break mess=[]; if (size(vec_x,"*")!=size(vec_y,"*")) { mess=[mess,"Vector X and Vector Y must have the same size"," "]; -ok=None; +ok=false; } if (cmax<=cmin) { mess=[mess,"Error with minimum and maximum value"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -56,7 +56,7 @@ model.evtin=1; model.ipar=[cmin,cmax,size_c,size_x,size_y]; model.rpar=[colormap.slice(),x,y]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; 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); diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 21a69763..e9428ea8 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -15,7 +15,7 @@ break mess=[]; if (cmax<=cmin) { mess=[mess,"Error with minimum and maximum value"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -52,7 +52,7 @@ model.evtin=1; model.ipar=[cmin,cmax,size_c]; model.rpar=[alpha_c,beta_c,colormap.slice()]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string("jetcolormap(25)"),string(cmin),string(cmax)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index c2f36d23..38f4fcd1 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -15,49 +15,49 @@ break mess=[]; if (size(in1,"*")<=0) { mess=[mess,"Block must have at least one input port"," "]; -ok=None; +ok=false; } if (min(in1)<=0) { mess=[mess,"Port sizes must be positive"," "]; -ok=None; +ok=false; } if (size(clrs,"*")<sum(in1)) { mess=[mess,"Not enough colors defined (at least "+string(sum(in1))+")"," "]; -ok=None; +ok=false; } if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number can\'t be < -1"," "]; -ok=None; +ok=false; } if (size(per,"*")!=size(ymin,"*")) { mess=[mess,"Size of Refresh Period must equal size of Ymin/Ymax vector"," "]; -ok=None; +ok=false; } for (i=1;i<=size(per,"*");i+=1) { if ((per(i)<=0)) { mess=[mess,"Refresh Period must be positive"," "]; -ok=None; +ok=false; } } if (N<2) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (or(ymin>=ymax)) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (!or(heritance==[0,1])) { mess=[mess,"Accept herited events must be 0 or 1"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -116,7 +116,7 @@ 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.blocktype="c"; -model.dep_ut=[true,None]; +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()]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 05f09246..3bf3cc03 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -15,31 +15,31 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number can\'t be < -1"," "]; -ok=None; +ok=false; } if (per<=0) { mess=[mess,"Refresh period must be positive"," "]; -ok=None; +ok=false; } if (N<2) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (!or(heritance==[0,1])) { mess=[mess,"Accept herited events must be 0 or 1"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -85,7 +85,7 @@ model.evtin=1; model.rpar=[0,ymin,ymax,per]; model.ipar=[win,1,N,clrs,wpos,wdim]; model.blocktype="c"; -model.dep_ut=[true,None]; +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()]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index c252f25e..ecf168b9 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -15,35 +15,35 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of Curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +ok=false; } if (N==1&&clrs>0) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -89,7 +89,7 @@ model.evtin=1; 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=[None,None]; +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)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index f77ab34a..fec5ad0c 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -15,47 +15,47 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(clrs,"*")!=size(siz,"*")) { mess=[mess,"Colors and Size must have same size"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +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)"," "]; -ok=None; +ok=false; } } } if (vec_y(1)>=vec_y(2)) { mess=[mess,"Ymax must be higher than Ymin"," "]; -ok=None; +ok=false; } if (vec_x(1)>=vec_x(2)) { mess=[mess,"Xmax must be higher than Xmin"," "]; -ok=None; +ok=false; } if (vec_z(1)>=vec_z(2)) { mess=[mess,"Zmax must be higher than Zmin"," "]; -ok=None; +ok=false; } if (ok) { in1=nbr_curves*ones(3,1); @@ -102,7 +102,7 @@ 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.blocktype="d"; -model.dep_ut=[None,None]; +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)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 490f1e07..eacd248e 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -39,7 +39,7 @@ prt=1; model.sim="outimpl"; model.ipar=[1]; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; mo=modelica(); mo.model="PORT"; mo.inputs="n"; diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index a8eddb21..6f1ad615 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -37,7 +37,7 @@ model.in2=-2; model.intyp=-1; model.ipar=prt; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); gr_i=[]; x=standard_define([1,1],model,exprs,gr_i); diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index e6bd549a..2dcc6b55 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -14,13 +14,13 @@ break } if ((nz<=0)) { message("Size of buffer must be positive"); -ok=None; +ok=false; } -r=None; +r=false; ierr=execstr("r = validvar(varnam)","errcatch"); if (!r||ierr!=0||length(varnam)>19) { message(["Invalid variable name.","Please choose another variable name."]); -ok=None; +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"); if (ok) { @@ -55,7 +55,7 @@ model.rpar=[]; model.ipar=[nz,length(varnam),transpose(ascii(varnam))]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; exprs=[string(nz),string(varnam),string(herit)]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 3b950c21..1ab5bc39 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -12,7 +12,7 @@ model.sim="trash"; model.in1=in1; model.evtin=1; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index d78784af..520bea5f 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -23,32 +23,32 @@ break } in1=int(in1); nin=in1; -fname1=pathconvert(stripblanks(fname1),None,true); +fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); if (lunit>0&&min(length(frmt),1)!=min(length(frmt1),1)) { block_parameter_error(gettext("Simulation running !!! You cannot switch<br />between formatted and unformatted when running"),gettext("End current simulation first.")); -ok=None; +ok=false; } else if (lunit>0&&fname1!=fname) { block_parameter_error(gettext("You cannot modify \'Output File Name\' when running."),gettext("End current simulation first.")); -ok=None; +ok=false; } else if (fname1=="") { block_parameter_error(gettext("Wrong value for \'Output File Name\' parameter"),gettext("You must provide a filename.")); -ok=None; +ok=false; } else if (fileparts(fname1)!="") { [pa,fn,ex]=fileparts(fname1); if (!isdir(pa)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa)); -ok=None; +ok=false; } } else if (frmt1!=""&&(part(frmt1,1)!="("||part(frmt1,length(frmt1))!=")")) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("You must enclose the format\'s string between parentheses.")); -ok=None; +ok=false; } else if (N<2) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Must be greater than 1.")); -ok=None; +ok=false; } else if (in1<=0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Size"),in1),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } if (ok) { ipar=[length(fname1),length(frmt1),0,N,_str2code(fname1),_str2code(frmt1)]; @@ -58,7 +58,7 @@ dstate=[-1,lunit,zeros((nin+1)*N,1)]; model.in1=nin; model.dstate=dstate; model.ipar=ipar; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; graphics.exprs=exprs; x.graphics=graphics; x.model=model; @@ -80,7 +80,7 @@ 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.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(in1),fname,frmt,string(N)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index e3045356..114709dd 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -20,14 +20,14 @@ fname1="/dev/audio"; frmt1="uc "; if (alreadyran&&(N!=ipar(5))) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); -ok=None; +ok=false; } else if (N<1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } if (swap!=0&&swap!=1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } if (ok) { ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)]; @@ -59,7 +59,7 @@ model.evtin=1; 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,None]; +model.dep_ut=[true,false]; exprs=[string(N),string(swap)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index b101a91e..7383c7a7 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -19,35 +19,35 @@ break } in1=int(in1); nin=in1; -fname1=pathconvert(stripblanks(fname1),None,true); +fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"]; if (and(frmt1!=fmts)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("Valid formats are: "+strcat(fmts,", "))); -ok=None; +ok=false; } else if (alreadyran&&fname1!=fname) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running"),gettext("Input Format")),gettext("End current simulation first.")); -ok=None; +ok=false; } else if (alreadyran&&N!=ipar(5)) { block_parameter_error(msprintf(gettext("You cannot modify \'Buffer Size\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); -ok=None; +ok=false; } else if (fname1=="") { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),gettext("You must provide a filename.")); } else if (fileparts(fname1)!="") { [pa,fn,ex]=fileparts(fname1); if (!isdir(pa)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa)); -ok=None; +ok=false; } } else if (N<1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } else if (in1<=0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Size"),in1),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } else if (swap!=0&&swap!=1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } frmt1=part(frmt1,1,3); if (ok) { @@ -80,7 +80,7 @@ model.evtin=1; 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,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); |