diff options
Diffstat (limited to 'js/Sinks/CSCOPE.js')
-rw-r--r-- | js/Sinks/CSCOPE.js | 38 |
1 files changed, 19 insertions, 19 deletions
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); |