handle multiple rows

1 files changed, 11 insertions, 11 deletions

diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index 5b4c3f8a..3127a1db 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -12,11 +12,11 @@ ipar[k-1]=j;
 k=k+1;
 }
 }
-walls=[0,5,0,5];
-x=[2,2.5];
-xd=[0,0];
-y=[3,5];
-yd=[0,0];
+walls=[[0],[5],[0],[5]];
+x=[[2],[2.5]];
+xd=[[0],[0]];
+y=[[3],[5]];
+yd=[[0],[0]];
 g=9.81;
 C=0;
 rpar1=ones(n,1);
@@ -26,14 +26,14 @@ state=transpose(state);
 model=scicos_model();
 model.sim=list("bounce_ball",4);
 model.in1=[];
-model.out=[n,n];
+model.out=[[n],[n]];
 model.state=state.slice();
-model.rpar=[rpar1,rpar2,walls,g,C];
+model.rpar=[[rpar1],[rpar2],[walls],[g],[C]];
 model.ipar=ipar;
 model.nzcross=n*(n-1)/2+4*n;
 model.blocktype="c";
 model.dep_ut=[false,true];
-exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))];
+exprs=[[strcat(sci2exp(rpar1))],[strcat(sci2exp(rpar2))],[strcat(sci2exp(walls))],[strcat(sci2exp(x))],[strcat(sci2exp(xd))],[strcat(sci2exp(y))],[strcat(sci2exp(yd))]];
 gr_i=[];
 x=standard_define([3,2],model,exprs,gr_i);
 }
@@ -51,7 +51,7 @@ exprs[8-1]="9.81";
 exprs[9-1]="0";
 }
 while (true) {
-[ok,rpar1,rpar2,walls,xt,xd,y,yd,g,C,exprs]=scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
+[ok,rpar1,rpar2,walls,xt,xd,y,yd,g,C,exprs]=scicos_getvalue(["Set Bounce Block"],[["Mass"],["Radius"],["[xmin,xmax,ymin,ymax]"],["xpos"],["xdpos"],["ypos"],["ydpos"],["g (gravity)"],["C (aerodynamic coeff"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break;
 }
@@ -72,7 +72,7 @@ walls=walls[[3,4]-1];
 if (n!=size(y,"*")||n!=size(rpar1,"*")||n!=size(rpar2,"*")||n!=size(xd,"*")||n!=size(yd,"*")) {
 message("All vectors must have equal size");
 ok=false;
-} else if (!(min([rpar1,rpar2])>0)) {
+} else if (!(min([[rpar1],[rpar2]])>0)) {
 message("Mass and radius must be >0");
 ok=false;
 }
@@ -91,7 +91,7 @@ ipar[k-1]=j;
 k=k+1;
 }
 }
-model.rpar=[rpar1,rpar2,walls,g,C];
+model.rpar=[[rpar1],[rpar2],[walls],[g],[C]];
 model.ipar=ipar;
 state=[xt,xd,y,yd];
 state=transpose(state);