handle multiple rows

6 files changed, 40 insertions, 40 deletions

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 653b0273..012be294 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -15,7 +15,7 @@ zs2=0;
 z0=30;
 T0=290;
 p_rho=0;
-model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
+model.rpar=[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]];
 model.sim="Bache";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -23,15 +23,15 @@ mo=modelica();
 mo.model="Bache";
 mo.inputs=["Ce1","Ce2"];
 mo.outputs=["Cs1","Cs2","yNiveau"];
-mo.parameters=list(["Patm","A","ze1","ze2","zs1","zs2","z0","T0","p_rho"],[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho]);
+mo.parameters=list([["Patm"],["A"],["ze1"],["ze2"],["zs1"],["zs2"],["z0"],["T0"],["p_rho"]],[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(Patm),string(A),string(ze1),string(ze2),string(zs1),string(zs2),string(z0),string(T0),string(p_rho)];
+exprs=[[string(Patm)],[string(A)],[string(ze1)],[string(ze2)],[string(zs1)],[string(zs2)],[string(z0)],[string(T0)],[string(p_rho)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=["I","I"];
-x.graphics.out_implicit=["I","I","E"];
+x.graphics.in_implicit=[["I"],["I"]];
+x.graphics.out_implicit=[["I"],["I"],["E"]];
 }
 Bache.prototype.details = function Bache() {
 }
@@ -43,11 +43,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,exprs]=scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho,exprs]=scicos_getvalue("Parametres de la bache",[["Pression dans le ciel de la bache : Patm (Pa)"],["Section de la bache : A (m2)"],["Altitude du piquage d entrée 1: ze1 (m)"],["Altitude du piquage d entrée 2: ze2 (m)"],["Altitude du piquage de sortie 1: zs1 (m)"],["Altitude du piquage de sortie 2: zs2 (m)"],["Altitude initiale du fluide : z0 (m)"],["Température initiale du fluide : T0 (K)"],["Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho];
+model.rpar=[[Patm],[A],[ze1],[ze2],[zs1],[zs2],[z0],[T0],[p_rho]];
 model.equations.parameters[2-1]=list(Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho);
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index 13049fe4..b93415e4 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -9,24 +9,24 @@ Typein=[];
 Typeout=[];
 MI=[];
 MO=[];
-P=[50,105,-1,90,0,10,2,0,101,10,-2,0];
-PortName=["Mesure","C1","C2"];
+P=[[50,105,-1,90],[0,10,2,0],[101,10,-2,0]];
+PortName=[["Mesure"],["C1"],["C2"]];
 for (i=1;i<=size(P,"r");i+=1) {
 if (P(i,3)==1) {
-Typein=[Typein,"E"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["E"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==2) {
-Typein=[Typein,"I"];
-MI=[MI,PortName(i)];
+Typein=[[Typein],["I"]];
+MI=[[MI],[PortName(i)]];
 }
 if (P(i,3)==-1) {
-Typeout=[Typeout,"E"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["E"]];
+MO=[[MO],[PortName(i)]];
 }
 if (P(i,3)==-2) {
-Typeout=[Typeout,"I"];
-MO=[MO,PortName(i)];
+Typeout=[[Typeout],["I"]];
+MO=[[MO],[PortName(i)]];
 }
 }
 model=scicos_model();
@@ -60,7 +60,7 @@ model=arg1.model;
 x=arg1;
 exprs=x.graphics.exprs;
 while (false) {
-[ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs);
+[ok,Qini,exprs]=scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs);
 if (!ok) {
 break;
 }
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 6889c951..dce5711b 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -10,7 +10,7 @@ lambda=0.03;
 z1=0;
 z2=0;
 p_rho=0;
-model.rpar=[L,D,lambda,z1,z2,p_rho];
+model.rpar=[[L],[D],[lambda],[z1],[z2],[p_rho]];
 model.sim="PerteDP";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -18,11 +18,11 @@ mo=modelica();
 mo.model="PerteDP";
 mo.inputs="C1";
 mo.outputs="C2";
-mo.parameters=list(["L","D","lambda","z1","z2","p_rho"],[L,D,lambda,z1,z2,p_rho]);
+mo.parameters=list([["L"],["D"],["lambda"],["z1"],["z2"],["p_rho"]],[[L],[D],[lambda],[z1],[z2],[p_rho]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(L),string(D),string(lambda),string(z1),string(z2),string(p_rho)];
+exprs=[[string(L)],[string(D)],[string(lambda)],[string(z1)],[string(z2)],[string(p_rho)]];
 gr_i=[];
 x=standard_define([2,1],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
@@ -38,11 +38,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,L,D,lambda,z1,z2,p_rho,exprs]=scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,L,D,lambda,z1,z2,p_rho,exprs]=scicos_getvalue("Parametres du tuyau",[["Longueur du tube : L (m)"],["Diamètre interne du tube : D (m)"],["Coefficient de perte de charge-frottement(S.U) : lambda"],["Altitude entrée tuyauterie : z1 (m)"],["Altitude sortie tuyauterie : z2 (m)"],["Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[L,D,lambda,z1,z2,p_rho];
+model.rpar=[[L],[D],[lambda],[z1],[z2],[p_rho]];
 model.equations.parameters[2-1]=list(L,D,lambda,z1,z2,p_rho);
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index 47816b22..7ad470c6 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -6,17 +6,17 @@ P0=100000;
 T0=290;
 H0=100000;
 option_temperature=1;
-model.rpar=[P0,T0,H0,option_temperature];
+model.rpar=[[P0],[T0],[H0],[option_temperature]];
 model.sim="Puits";
 model.blocktype="c";
 model.dep_ut=[true,false];
 mo=modelica();
 mo.model="Puits";
 mo.inputs=["C"];
-mo.parameters=list(["P0","T0","H0","option_temperature"],[P0,T0,H0,option_temperature]);
+mo.parameters=list([["P0"],["T0"],["H0"],["option_temperature"]],[[P0],[T0],[H0],[option_temperature]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
-exprs=[string(P0),string(T0),string(H0),string(option_temperature)];
+exprs=[[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
 gr_i=[];
 x=standard_define([2.5,2],model,exprs,list(gr_i,0));
 x.graphics.in_implicit=["I"];
@@ -31,11 +31,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",[["Pression de la source : P0 (Pa)"],["Temperature de la source : T0 (K)"],["Enthalpie spécifique de la source : H0 (J/kg)"],["1:température fixée - 2:enthalpie fixée : option_temperature"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[P0,T0,H0,option_temperature];
+model.rpar=[[P0],[T0],[H0],[option_temperature]];
 model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index f607d598..f6256723 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -6,7 +6,7 @@ P0=300000;
 T0=290;
 H0=100000;
 option_temperature=1;
-model.rpar=[P0,T0,H0,option_temperature];
+model.rpar=[[P0],[T0],[H0],[option_temperature]];
 model.sim="Source";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -14,11 +14,11 @@ mo=modelica();
 mo.model="Source";
 mo.inputs=[];
 mo.outputs=["C"];
-mo.parameters=list(["P0","T0","H0","option_temperature"],[P0,T0,H0,option_temperature]);
+mo.parameters=list([["P0"],["T0"],["H0"],["option_temperature"]],[[P0],[T0],[H0],[option_temperature]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(P0),string(T0),string(H0),string(option_temperature)];
+exprs=[[string(P0)],[string(T0)],[string(H0)],[string(option_temperature)]];
 gr_i=[];
 x=standard_define([2.5,2],model,exprs,list(gr_i,0));
 x.graphics.out_implicit=["I"];
@@ -33,11 +33,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
+[ok,P0,T0,H0,option_temperature,exprs]=scicos_getvalue("Paramètres du puits",[["Pression de la source : P0 (Pa)"],["Temperature de la source : T0 (K)"],["Enthalpie spécifique de la source : H0 (J/kg)"],["1:température fixée - 2:enthalpie fixée : option_temperature"]],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[P0,T0,H0,option_temperature];
+model.rpar=[[P0],[T0],[H0],[option_temperature]];
 model.equations.parameters[2-1]=list(P0,T0,H0,option_temperature);
 graphics.exprs=exprs;
 x.graphics=graphics;
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 70cbafc7..3b6fc5cc 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -2,11 +2,11 @@
 function VanneReglante() {
 VanneReglante.prototype.define = function VanneReglante() {
 model=scicos_model();
-model.in1=[1,1];
+model.in1=[[1],[1]];
 model.out=[1];
 Cvmax=8005.42;
 p_rho=0;
-model.rpar=[Cvmax,p_rho];
+model.rpar=[[Cvmax],[p_rho]];
 model.sim="VanneReglante";
 model.blocktype="c";
 model.dep_ut=[true,false];
@@ -14,14 +14,14 @@ mo=modelica();
 mo.model="VanneReglante";
 mo.inputs=["C1","Ouv"];
 mo.outputs="C2";
-mo.parameters=list(["Cvmax","p_rho"],[Cvmax,p_rho]);
+mo.parameters=list([["Cvmax"],["p_rho"]],[[Cvmax],[p_rho]]);
 model.equations=mo;
 model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
-exprs=[string(Cvmax),string(p_rho)];
+exprs=[[string(Cvmax)],[string(p_rho)]];
 gr_i=[];
 x=standard_define([2,2],model,exprs,list(gr_i,0));
-x.graphics.in_implicit=["I","E"];
+x.graphics.in_implicit=[["I"],["E"]];
 x.graphics.out_implicit=["I"];
 }
 VanneReglante.prototype.details = function VanneReglante() {
@@ -34,11 +34,11 @@ graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
 while (true) {
-[ok,Cvmax,p_rho,exprs]=scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
+[ok,Cvmax,p_rho,exprs]=scicos_getvalue("Paramètres de la vanne reglante",[["Cvmax"],["p_rho"]],list("vec",-1,"vec",-1),exprs);
 if (!ok) {
 break;
 }
-model.rpar=[Cvmax,p_rho];
+model.rpar=[[Cvmax],[p_rho]];
 model.equations.parameters[2-1]=list(Cvmax,p_rho);
 graphics.exprs=exprs;
 x.graphics=graphics;