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