diff options
257 files changed, 520 insertions, 513 deletions
diff --git a/combined.js b/combined.js index 3b7f9b34..9dcfdaa6 100644 --- a/combined.js +++ b/combined.js @@ -127,7 +127,7 @@ function CLKGotoTagVisibility() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -180,7 +180,7 @@ function DEMUX() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.out); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -257,7 +257,7 @@ function DEMUX_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.out); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -337,7 +337,7 @@ function ESELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); var exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -415,7 +415,7 @@ function EXTRACTOR() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([this.ind]); var exprs = [sci2exp(this.ind)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -472,7 +472,7 @@ function FROM() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = ["A"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); @@ -532,7 +532,7 @@ function FROMMO() { mo.model = "frommo"; mo.outputs = "n"; var exprs = ["A"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -589,7 +589,7 @@ function GOTO() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["A"],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); @@ -658,7 +658,7 @@ function GOTOMO() { mo.model = "gotomo"; mo.inputs = "p"; var exprs = [["A"],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -725,7 +725,7 @@ function GotoTagVisibility() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -782,7 +782,7 @@ function GotoTagVisibilityMO() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -837,7 +837,7 @@ function ISELECT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nout)],[string(this.z0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -905,7 +905,7 @@ function ISELECT_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -973,7 +973,7 @@ function MUX() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1048,7 +1048,7 @@ function MUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); this.x = standard_define([0.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1125,7 +1125,7 @@ function M_SWITCH() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1201,7 +1201,7 @@ function NRMSOM_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.nin)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); this.x = standard_define([.2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1255,7 +1255,7 @@ function RELAY_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); var exprs = [[string(this.nin)],[string(i0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1312,7 +1312,7 @@ function SCALAR2VECTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([this.nout])]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1372,7 +1372,7 @@ function SELECT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(this.z0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1440,7 +1440,7 @@ function SELECT_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1561,7 +1561,7 @@ function SWITCH2() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1634,7 +1634,7 @@ function SWITCH2_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1720,7 +1720,7 @@ function SWITCH_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); var exprs = [[string(this.nin)],[string(i0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -1805,7 +1805,7 @@ function CCS() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -1873,7 +1873,7 @@ function CVS() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -1921,7 +1921,7 @@ function Capacitor() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = string([[this.C],[this.v]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); this.x = standard_define([2,1.1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -1977,7 +1977,7 @@ function ConstantVoltage() { mo.parameters = list("V",list(this.V)); this.model.equations = new ScilabDouble([mo]); var exprs = string(this.V); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); this.x = standard_define([1.5,1.1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -2027,7 +2027,7 @@ function CurrentSensor() { mo.outputs = [["n"],["i"]]; this.model.equations = new ScilabDouble([mo]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; @@ -2067,7 +2067,7 @@ function Diode() { mo.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); this.model.equations = new ScilabDouble([mo]); var exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -2123,7 +2123,7 @@ function Ground() { mo.inputs = "p"; this.model.equations = new ScilabDouble([mo]); var exprs = ""; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -2181,7 +2181,7 @@ function Gyrator() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = [["1"],["1"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -2263,7 +2263,7 @@ function IdealTransformer() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = ["1"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -2322,7 +2322,7 @@ function Inductor() { mo.parameters = list("L",list(this.L)); this.model.equations = new ScilabDouble([mo]); var exprs = string(this.L); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); this.x = standard_define([2,0.9],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -2366,7 +2366,7 @@ function MOTOR() { this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); var exprs = ""; this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; @@ -2411,7 +2411,7 @@ function NMOS() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; @@ -2501,7 +2501,7 @@ function NPN() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -2593,7 +2593,7 @@ function OpAmp() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); var exprs = string(Z); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); this.x = standard_define([3,5],this.model,exprs,gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; @@ -2657,7 +2657,7 @@ function PMOS() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; @@ -2747,7 +2747,7 @@ function PNP() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -2835,7 +2835,7 @@ function PotentialSensor() { mo.inputs = "p"; mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,"",list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; @@ -2872,7 +2872,7 @@ function Resistor() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = string(this.R); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -2929,7 +2929,7 @@ function SineVoltage() { mo.parameters = list([["V"],["phase"],["freqHz"],["offset"],["startTime"]],list(this.V,this.ph,this.frq,this.offset,this.start)); this.model.equations = new ScilabDouble([mo]); var exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -2994,7 +2994,7 @@ function Switch() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); var exprs = string(Z); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; @@ -3050,7 +3050,7 @@ function VVsourceAC() { mo.parameters = list(["f"],list(this.FR)); this.model.equations = new ScilabDouble([mo]); var exprs = [string(this.FR)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; @@ -3101,7 +3101,7 @@ function VariableResistor() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; @@ -3135,7 +3135,7 @@ function VoltageSensor() { mo.outputs = [["n"],["v"]]; this.model.equations = new ScilabDouble([mo]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; @@ -3173,7 +3173,7 @@ function VsourceAC() { mo.parameters = list([["VA"],["f"]],list(this.VA,this.FR)); this.model.equations = new ScilabDouble([mo]); var exprs = [[string(this.VA)],[string(this.FR)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -3303,7 +3303,7 @@ function ANDLOG_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); this.x = standard_define([3,3],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -3330,7 +3330,7 @@ function CLKSOMV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -3357,7 +3357,7 @@ function CLKSOM_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); this.x = standard_define([1,1]/1.2,this.model,[],gr_i); return new BasicBlock(this.x); } @@ -3412,7 +3412,7 @@ function END_c() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.tf); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3461,7 +3461,7 @@ function EVTDLY_c() { this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3517,7 +3517,7 @@ function EVTDLY_f() { this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3570,7 +3570,7 @@ function EVTGEN_f() { this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.tt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3618,7 +3618,7 @@ function EVTVARDLY() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.model.firing); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3662,7 +3662,7 @@ function HALT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.n); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3712,7 +3712,7 @@ function IFTHEL_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); var exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; this.x = standard_define([3,3],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -3815,7 +3815,7 @@ function MCLOCK_f() { split2.graphics.orig = [[482.45315],[169.33333]]; split2.graphics.pein = 5; split2.graphics.peout = [[12],[13]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = mfclck; diagram.objs[2-1] = clksom; @@ -3887,7 +3887,7 @@ function MFCLCK_f() { this.model.firing = new ScilabDouble([-1,0]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[string(this.nn)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -3935,7 +3935,7 @@ function M_freq() { this.model.firing = new ScilabDouble([0,-1,-1]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -4140,7 +4140,7 @@ function freq_div() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -4273,7 +4273,7 @@ function Bache() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; @@ -4364,7 +4364,7 @@ function Flowmeter() { this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = "1"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; @@ -4429,7 +4429,7 @@ function PerteDP() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; @@ -4494,7 +4494,7 @@ function PuitsP() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -4556,7 +4556,7 @@ function SourceP() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4618,7 +4618,7 @@ function VanneReglante() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; @@ -4671,7 +4671,7 @@ function BITCLEAR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -4770,7 +4770,7 @@ function BITSET() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -4869,7 +4869,7 @@ function CONVERT() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -5327,7 +5327,7 @@ function DFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -5379,7 +5379,7 @@ function DLATCH() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -5412,7 +5412,7 @@ function EXTRACTBITS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -5659,7 +5659,7 @@ function INTMUL() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -5807,7 +5807,7 @@ function JKFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -5881,7 +5881,7 @@ function LOGIC() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -5960,7 +5960,7 @@ function SHIFT() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6108,7 +6108,7 @@ function SRFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -6176,7 +6176,7 @@ function BIGSOM_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,exprs,gr_i); return new BigSom(this.x); } @@ -6225,7 +6225,7 @@ function CLINDUMMY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -6259,7 +6259,7 @@ function CLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6348,7 +6348,7 @@ function CLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6439,7 +6439,7 @@ function CLSS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6547,7 +6547,7 @@ function CLSS_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6645,7 +6645,7 @@ function DELAYV_f() { this.model.firing = new ScilabDouble([0,-1]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6851,7 +6851,7 @@ function DERIV() { this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6880,7 +6880,7 @@ function DIFF_c() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -6951,7 +6951,7 @@ function DLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7039,7 +7039,7 @@ function DLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7127,7 +7127,7 @@ function DLSS() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7234,7 +7234,7 @@ function DLSS_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7328,7 +7328,7 @@ function DOLLAR() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7431,7 +7431,7 @@ function DOLLAR_f() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7499,7 +7499,7 @@ function DOLLAR_m() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7605,7 +7605,7 @@ function GAINBLK() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7766,7 +7766,7 @@ function GAINBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7826,7 +7826,7 @@ function GAIN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -7887,7 +7887,7 @@ function INTEGRAL() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); @@ -7983,7 +7983,7 @@ function INTEGRAL_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = strcat(sci2exp(this.x0)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -8033,7 +8033,7 @@ function INTEGRAL_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -8195,7 +8195,7 @@ function PID() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -8300,7 +8300,7 @@ function REGISTER() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -8394,7 +8394,7 @@ function REGISTER_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -8443,7 +8443,7 @@ function SAMPHOLD() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); } @@ -8476,7 +8476,7 @@ function SAMPHOLD_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -8534,7 +8534,7 @@ function SAMPLEHOLD_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); } @@ -8564,7 +8564,7 @@ function SOM_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -8612,7 +8612,7 @@ function SUMMATION() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,exprs,gr_i); return new Summation(this.x); } @@ -8759,7 +8759,7 @@ function SUM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); var exprs = []; this.x = standard_define([1,1],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -8798,7 +8798,7 @@ function TCLSS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -8903,7 +8903,7 @@ function TCLSS_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -9003,7 +9003,7 @@ function TIME_DELAY() { this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); this.x = standard_define([3.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -9075,7 +9075,7 @@ function VARIABLE_DELAY() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -9153,7 +9153,7 @@ function CUMSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9261,7 +9261,7 @@ function EXTRACT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9368,7 +9368,7 @@ function EXTTRI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9473,7 +9473,7 @@ function MATBKSL() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9555,7 +9555,7 @@ function MATCATH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9629,7 +9629,7 @@ function MATCATV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9702,7 +9702,7 @@ function MATDET() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9784,7 +9784,7 @@ function MATDIAG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9866,7 +9866,7 @@ function MATDIV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -9948,7 +9948,7 @@ function MATEIG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10054,7 +10054,7 @@ function MATEXPM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10136,7 +10136,7 @@ function MATINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10218,7 +10218,7 @@ function MATLU() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10299,7 +10299,7 @@ function MATMAGPHI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10375,7 +10375,7 @@ function MATMUL() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10552,7 +10552,7 @@ function MATPINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10634,7 +10634,7 @@ function MATRESH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10746,7 +10746,7 @@ function MATSING() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10855,7 +10855,7 @@ function MATSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -10953,7 +10953,7 @@ function MATTRAN() { this.model.out2 = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11041,7 +11041,7 @@ function MATZCONJ() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11081,7 +11081,7 @@ function MATZREIM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11168,7 +11168,7 @@ function RICC() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11241,7 +11241,7 @@ function ROOTCOEF() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11315,7 +11315,7 @@ function SQRT() { this.model.out2 = new ScilabDouble([-2]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11392,7 +11392,7 @@ function SUBMAT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -11507,7 +11507,7 @@ function AUTOMAT() { this.model.dep_ut = new ScilabDouble([false,true]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -11639,7 +11639,7 @@ function BACKLASH() { this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -11722,7 +11722,7 @@ function BOUNCE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -11853,7 +11853,7 @@ function BOUNCEXY() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -11954,7 +11954,7 @@ function BPLATFORM() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12048,7 +12048,7 @@ function CBLOCK() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -12201,7 +12201,7 @@ function CBLOCK4() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -12363,7 +12363,7 @@ function CONSTRAINT2_c() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12445,7 +12445,7 @@ function CONSTRAINT_c() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = "0"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12508,7 +12508,7 @@ function DEADBAND() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12564,7 +12564,7 @@ function DEBUG() { this.model.sim = list(new ScilabString(["%debug_scicos"]), new ScilabDouble([99])); this.model.blocktype = new ScilabString(["d"]); var exprs = list("","xcos_debug_gui(flag,block);"); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEBUG\",sz(1),sz(2));"]); this.x = standard_define([8,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12647,7 +12647,7 @@ function DIFF_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12760,7 +12760,7 @@ function EDGETRIGGER() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.edge)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -12872,7 +12872,7 @@ function EDGE_TRIGGER() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -12962,7 +12962,7 @@ function ENDBLK() { scs_m_1.objs[1-1] = scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -13129,7 +13129,7 @@ function Extract_Activation() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -13163,7 +13163,7 @@ function HYSTHERESIS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(rpar)],[string(sign(this.nzz))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -13256,7 +13256,7 @@ function LOGICAL_OP() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -13402,7 +13402,7 @@ function MBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; @@ -13691,7 +13691,7 @@ function MEMORY_f() { this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -13773,7 +13773,7 @@ function MPBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; @@ -14043,7 +14043,7 @@ function PAL_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); @@ -14090,7 +14090,7 @@ function PENDULUM_ANIM() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); this.x = standard_define([3,3],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -14168,7 +14168,7 @@ function RATELIMITER() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]); this.x = standard_define([3.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -14221,7 +14221,7 @@ function RELATIONALOP() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); @@ -14361,7 +14361,7 @@ function SUPER_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new SuperBlock(this.x); } @@ -14483,7 +14483,7 @@ function c_block() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -14568,7 +14568,7 @@ function fortran_block() { this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -14645,7 +14645,7 @@ function func_block() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "v=sin(u);y=u*v"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -14695,7 +14695,7 @@ function generic_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -14828,7 +14828,7 @@ function generic_block2() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -14963,7 +14963,7 @@ function generic_block3() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -15126,7 +15126,7 @@ function scifunc_block() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15254,7 +15254,7 @@ function scifunc_block_m() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15356,7 +15356,7 @@ function ABSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -15386,7 +15386,7 @@ function ABS_VALUE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([1])]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15437,7 +15437,7 @@ function COSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -15475,7 +15475,7 @@ function DLRADAPT_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15545,7 +15545,7 @@ function EXPBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = ["%e"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15601,7 +15601,7 @@ function EXPBLK_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = ["%e"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15651,7 +15651,7 @@ function FSV_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15683,7 +15683,7 @@ function INTRP2BLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15742,7 +15742,7 @@ function INTRPLBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15796,7 +15796,7 @@ function INVBLK() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15824,7 +15824,7 @@ function INVBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15854,7 +15854,7 @@ function LOGBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "%e"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -15914,7 +15914,7 @@ function LOOKUP2D() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16041,7 +16041,7 @@ function LOOKUP_c() { this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16208,7 +16208,7 @@ function LOOKUP_f() { this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -16269,7 +16269,7 @@ function MAXMIN() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); var exprs = [string(transpose([2,1,1]))]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); @@ -16356,7 +16356,7 @@ function MAX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16385,7 +16385,7 @@ function MIN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16415,7 +16415,7 @@ function POWBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.a); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16469,7 +16469,7 @@ function PRODUCT() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,exprs,gr_i); return new Product(this.x); } @@ -16571,7 +16571,7 @@ function QUANT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.pas)],[string(this.meth)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16638,7 +16638,7 @@ function SATURATION() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16703,7 +16703,7 @@ function SAT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16761,7 +16761,7 @@ function SIGNUM() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([1])]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16812,7 +16812,7 @@ function SINBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16840,7 +16840,7 @@ function TANBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16868,7 +16868,7 @@ function TrigFun() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "sin"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -16918,7 +16918,7 @@ function PDE() { this.model.dep_ut = new ScilabDouble([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); this.x = standard_define([3,3],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -17142,7 +17142,7 @@ function AFFICH_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); var exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new AfficheBlock(this.x); } @@ -17328,7 +17328,7 @@ function CANIMXY() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -17459,7 +17459,7 @@ function CANIMXY3D() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -17598,7 +17598,7 @@ function CEVENTSCOPE() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -17707,7 +17707,7 @@ function CFSCOPE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -17991,7 +17991,7 @@ function CMAT3D() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18071,7 +18071,7 @@ function CMATVIEW() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18150,7 +18150,7 @@ function CMSCOPE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18303,7 +18303,7 @@ function CSCOPE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18431,7 +18431,7 @@ function CSCOPXY() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18561,7 +18561,7 @@ function CSCOPXY3D() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18695,7 +18695,7 @@ function OUTIMPL_f() { mo.inputs = "n"; this.model.equations = new ScilabDouble([mo]); var exprs = "1"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); @@ -18754,7 +18754,7 @@ function OUT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); return new ExplicitOutBlock(this.x); } @@ -18814,7 +18814,7 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); var exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -18885,7 +18885,7 @@ function TRASH_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -18920,7 +18920,7 @@ function WFILE_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19028,7 +19028,7 @@ function WRITEAU_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.N),string(this.swap)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19107,7 +19107,7 @@ function WRITEC_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19209,7 +19209,7 @@ function CLKINV_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); return new EventInBlock(this.x); } @@ -19323,7 +19323,7 @@ function CLOCK_c() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; @@ -19427,7 +19427,7 @@ function CLOCK_f() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; @@ -19520,7 +19520,7 @@ function CONST() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(sci2exp(this.C)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19573,7 +19573,7 @@ function CONST_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(sci2exp(this.C)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19626,7 +19626,7 @@ function CONST_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = sci2exp(this.C); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19714,7 +19714,7 @@ function CURVE_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -19879,7 +19879,7 @@ function CURV_f() { this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -19951,7 +19951,7 @@ function Counter() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20006,7 +20006,7 @@ function FROMWSB() { scs_m_1.objs[3-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); this.x = standard_define([5,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -20107,7 +20107,7 @@ function FROMWS_c() { this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); var exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; this.x = standard_define([3.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -20187,7 +20187,7 @@ function GENSIN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20250,7 +20250,7 @@ function GENSQR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.Amplitude); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20336,7 +20336,7 @@ function GEN_SQR() { var rule = 1; var F = 1; var exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20411,7 +20411,7 @@ function Ground_g() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20444,7 +20444,7 @@ function INIMPL_f() { this.model.equations = new ScilabDouble([mo]); this.prt = 1; var exprs = "1"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); @@ -20502,7 +20502,7 @@ function IN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = sci2exp(prt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); return new ExplicitInBlock(this.x); } @@ -20575,7 +20575,7 @@ function Modulo_Count() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.ini_c)],[string(this.base)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20662,7 +20662,7 @@ function PULSE_SC() { var F = 1; var A = 1; var exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20740,7 +20740,7 @@ function RAMP() { this.model.nzcross = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [string(rpar)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20799,7 +20799,7 @@ function RAND_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20879,7 +20879,7 @@ function RAND_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -20974,7 +20974,7 @@ function READAU_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[fname],[string(this.N)],[string(this.swap)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); this.x = standard_define([5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21076,7 +21076,7 @@ function READC_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21214,7 +21214,7 @@ function RFILE_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21327,7 +21327,7 @@ function SAWTOOTH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21360,7 +21360,7 @@ function STEP() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(1)],[string(rpar)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21474,7 +21474,7 @@ function STEP_FUNCTION() { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -21628,7 +21628,7 @@ function Sigbuilder() { scs_m_1.objs[7-1] = scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -21720,7 +21720,7 @@ function TIME_f() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -21751,7 +21751,7 @@ function TKSCALE() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21800,7 +21800,7 @@ function GENERAL_f() { this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -21868,7 +21868,7 @@ function NEGTOPOS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -21899,7 +21899,7 @@ function POSTONEG_f() { this.model.blocktype = new ScilabString(["z"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.firing = new ScilabDouble([-1]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -21932,7 +21932,7 @@ function ZCROSS_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = strcat(sci2exp(this.in1)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 72fac875..10dd1d16 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -15,7 +15,7 @@ function CLKGotoTagVisibility() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 8b537934..61137fad 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -11,7 +11,7 @@ function DEMUX() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.out); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 7184e51c..1d7808ad 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -11,7 +11,7 @@ function DEMUX_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.out); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index b0c6d2dd..b543617b 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -14,7 +14,7 @@ function ESELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); var exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 5f999f43..a4b49e1d 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -10,7 +10,7 @@ function EXTRACTOR() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([this.ind]); var exprs = [sci2exp(this.ind)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 5f3049dc..3b9260bb 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -14,7 +14,7 @@ function FROM() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = ["A"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 78f6bc51..d7f417e4 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -17,7 +17,7 @@ function FROMMO() { mo.model = "frommo"; mo.outputs = "n"; var exprs = ["A"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index abed8429..e3532daf 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -14,7 +14,7 @@ function GOTO() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["A"],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index f3998900..55b26401 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -17,7 +17,7 @@ function GOTOMO() { mo.model = "gotomo"; mo.inputs = "p"; var exprs = [["A"],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index fc76df5b..3a3fc93f 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -15,7 +15,7 @@ function GotoTagVisibility() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 91f935e4..57cd648a 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -15,7 +15,7 @@ function GotoTagVisibilityMO() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index a4953e7b..5b3297ec 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -13,7 +13,7 @@ function ISELECT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nout)],[string(this.z0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 7b828ea8..46c9cbc5 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -21,7 +21,7 @@ function ISELECT_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 9bfc3ef9..33cf91bb 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -10,7 +10,7 @@ function MUX() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index ea6bf4f3..4c88c94e 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -10,7 +10,7 @@ function MUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); this.x = standard_define([0.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 9d893685..bf0ed7fe 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -12,7 +12,7 @@ function M_SWITCH() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index b6a26ec8..bec18258 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -10,7 +10,7 @@ function NRMSOM_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.nin)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); this.x = standard_define([.2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index afb1673b..1a4e0d43 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -14,7 +14,7 @@ function RELAY_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); var exprs = [[string(this.nin)],[string(i0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 43d92954..bdedbfce 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -9,7 +9,7 @@ function SCALAR2VECTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([this.nout])]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 73bdc8eb..1946c662 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -13,7 +13,7 @@ function SELECT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(this.z0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 32e62c27..4642dad9 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -21,7 +21,7 @@ function SELECT_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 04f504b5..738579b3 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -16,7 +16,7 @@ function SWITCH2() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 798077ad..a3a2c7fc 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -19,7 +19,7 @@ function SWITCH2_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 68375cea..8ca9c036 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -13,7 +13,7 @@ function SWITCH_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); var exprs = [[string(this.nin)],[string(i0+1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index bdd17ed1..fac95aa1 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -37,7 +37,7 @@ function CCS() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 36aee0b6..40920b17 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -37,7 +37,7 @@ function CVS() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 1c37b386..8b9601f7 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -17,7 +17,7 @@ function Capacitor() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = string([[this.C],[this.v]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); this.x = standard_define([2,1.1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index 1191ac64..8ac4d151 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -16,7 +16,7 @@ function ConstantVoltage() { mo.parameters = list("V",list(this.V)); this.model.equations = new ScilabDouble([mo]); var exprs = string(this.V); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); this.x = standard_define([1.5,1.1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 9ca08d67..e055927e 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -13,7 +13,7 @@ function CurrentSensor() { mo.outputs = [["n"],["i"]]; this.model.equations = new ScilabDouble([mo]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index be762e26..f696eef6 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -19,7 +19,7 @@ function Diode() { mo.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); this.model.equations = new ScilabDouble([mo]); var exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index 2c94c087..50163380 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -12,7 +12,7 @@ function Ground() { mo.inputs = "p"; this.model.equations = new ScilabDouble([mo]); var exprs = ""; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 1d717593..bf52abfb 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -37,7 +37,7 @@ function Gyrator() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = [["1"],["1"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index f65858f6..3b2037c2 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -37,7 +37,7 @@ function IdealTransformer() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = ["1"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index b4f4c4bf..bf577ee0 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -16,7 +16,7 @@ function Inductor() { mo.parameters = list("L",list(this.L)); this.model.equations = new ScilabDouble([mo]); var exprs = string(this.L); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); this.x = standard_define([2,0.9],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 7927882f..254d7d5b 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -7,7 +7,7 @@ function MOTOR() { this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); var exprs = ""; this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index d92186dd..5096d9f5 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -23,7 +23,7 @@ function NMOS() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index d2e8dde1..88227a3c 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -37,7 +37,7 @@ function NPN() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index fc529cb8..4a807bc0 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -17,7 +17,7 @@ function OpAmp() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); var exprs = string(Z); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); this.x = standard_define([3,5],this.model,exprs,gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index f783dab0..01c64d2f 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -23,7 +23,7 @@ function PMOS() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 4166537b..3ba3ea3b 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -37,7 +37,7 @@ function PNP() { this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index 99b180da..850af214 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -13,7 +13,7 @@ function PotentialSensor() { mo.inputs = "p"; mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,"",list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index 381dc950..fa493c6d 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -16,7 +16,7 @@ function Resistor() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = string(this.R); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index c479539f..97e2bfde 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -20,7 +20,7 @@ function SineVoltage() { mo.parameters = list([["V"],["phase"],["freqHz"],["offset"],["startTime"]],list(this.V,this.ph,this.frq,this.offset,this.start)); this.model.equations = new ScilabDouble([mo]); var exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 927bd912..a60c5e2a 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -19,7 +19,7 @@ function Switch() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); var exprs = string(Z); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 755932ea..84dcd9dc 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -17,7 +17,7 @@ function VVsourceAC() { mo.parameters = list(["f"],list(this.FR)); this.model.equations = new ScilabDouble([mo]); var exprs = [string(this.FR)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 271be235..a2175f58 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -13,7 +13,7 @@ function VariableResistor() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 0a1851f3..40f04f65 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -13,7 +13,7 @@ function VoltageSensor() { mo.outputs = [["n"],["v"]]; this.model.equations = new ScilabDouble([mo]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index 6ed2395b..786b4a0b 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -17,7 +17,7 @@ function VsourceAC() { mo.parameters = list([["VA"],["f"]],list(this.VA,this.FR)); this.model.equations = new ScilabDouble([mo]); var exprs = [[string(this.VA)],[string(this.FR)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index c6a99734..64005fef 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -8,7 +8,7 @@ function ANDLOG_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); this.x = standard_define([3,3],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 65b37b35..1f86339f 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -8,7 +8,7 @@ function CLKSOMV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 948e5269..44864f88 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -8,7 +8,7 @@ function CLKSOM_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); this.x = standard_define([1,1]/1.2,this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 4a6d30f3..e81cdf1c 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -10,7 +10,7 @@ function END_c() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.tf); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 2efd3fc3..7832ad4f 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -12,7 +12,7 @@ function EVTDLY_c() { this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index dff6dabd..ebf8f365 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -12,7 +12,7 @@ function EVTDLY_f() { this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 19c40114..b40c24f6 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -9,7 +9,7 @@ function EVTGEN_f() { this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.tt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 2116f270..3c2f451b 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -11,7 +11,7 @@ function EVTVARDLY() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.model.firing); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index e891d796..efd0e1f9 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -10,7 +10,7 @@ function HALT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.n); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index be1e07ee..0c4bc116 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -13,7 +13,7 @@ function IFTHEL_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); var exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; this.x = standard_define([3,3],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index 81d7a1e3..0866962b 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -43,7 +43,7 @@ function MCLOCK_f() { split2.graphics.orig = [[482.45315],[169.33333]]; split2.graphics.pein = 5; split2.graphics.peout = [[12],[13]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = mfclck; diagram.objs[2-1] = clksom; diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 333c096e..322550c3 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -14,7 +14,7 @@ function MFCLCK_f() { this.model.firing = new ScilabDouble([-1,0]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[string(this.nn)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 1b969936..ce96787f 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -11,7 +11,7 @@ function M_freq() { this.model.firing = new ScilabDouble([0,-1,-1]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 06413e1f..7e3f8b68 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -103,7 +103,7 @@ function freq_div() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index b961911e..cccef914 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -28,7 +28,7 @@ function Bache() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 170c1783..8d7a5bbc 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -37,7 +37,7 @@ function Flowmeter() { this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = "1"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 06572f67..dfca2054 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -23,7 +23,7 @@ function PerteDP() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 6d995c71..84d90966 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -17,7 +17,7 @@ function PuitsP() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 66944673..fe20a9fb 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -19,7 +19,7 @@ function SourceP() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 27e498a2..85b21dfc 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -19,7 +19,7 @@ function VanneReglante() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); var exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 63406fca..550671b5 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -13,7 +13,7 @@ function BITCLEAR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index fa66ce48..bee59f69 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -13,7 +13,7 @@ function BITSET() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 76f957bb..dab0ab34 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -15,7 +15,7 @@ function CONVERT() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 80a84dfd..bf597aee 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -88,7 +88,7 @@ function DFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 317254cc..8dde9f63 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -33,7 +33,7 @@ function DLATCH() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 30036458..73d29d70 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -14,7 +14,7 @@ function EXTRACTBITS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 1b704f2e..56a654ff 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -15,7 +15,7 @@ function INTMUL() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index d8cb71c0..1fb25113 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -44,7 +44,7 @@ function JKFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 4c7ca2f2..4f2013b8 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -16,7 +16,7 @@ function LOGIC() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 0096da1b..f7204135 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -16,7 +16,7 @@ function SHIFT() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 6f9ade74..99b49370 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -28,7 +28,7 @@ function SRFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 1a8f47b6..81ce262a 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -10,7 +10,7 @@ function BIGSOM_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,exprs,gr_i); return new BigSom(this.x); } diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 0159348b..13b249d4 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -8,7 +8,7 @@ function CLINDUMMY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 2eb7da63..d48d4a76 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -15,7 +15,7 @@ function CLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 86f80362..e567e751 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -15,7 +15,7 @@ function CLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 1d417592..a5c78f5c 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -17,7 +17,7 @@ function CLSS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index de3fd53e..df05e986 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -17,7 +17,7 @@ function CLSS_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index fe839f0d..db1fe8e8 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -17,7 +17,7 @@ function DELAYV_f() { this.model.firing = new ScilabDouble([0,-1]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 01ef03d1..4809a060 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -8,7 +8,7 @@ function DERIV() { this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 8f18e1a8..0583cc59 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -10,7 +10,7 @@ function DIFF_c() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index d28ee566..3ca9726f 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -16,7 +16,7 @@ function DLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 07b4f8c7..c19a22cc 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -16,7 +16,7 @@ function DLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index c3145a36..10a7659b 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -16,7 +16,7 @@ function DLSS() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 6842290e..5adc3864 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -16,7 +16,7 @@ function DLSS_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 4d0a382c..aa9123cb 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -13,7 +13,7 @@ function DOLLAR() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index e9ef5da5..b817ecc4 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -13,7 +13,7 @@ function DOLLAR_f() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index fa02bcf1..bf83bf51 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -13,7 +13,7 @@ function DOLLAR_m() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 3cdb1087..fa1b00c6 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -16,7 +16,7 @@ function GAINBLK() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index a2525140..df5a51b4 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -12,7 +12,7 @@ function GAINBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index d6f8880f..14a6fb54 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -12,7 +12,7 @@ function GAIN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 177029f6..95f66a49 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -13,7 +13,7 @@ function INTEGRAL() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 4c0836d1..bd98770c 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -10,7 +10,7 @@ function INTEGRAL_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = strcat(sci2exp(this.x0)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 2cc71ad9..feda531e 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -15,7 +15,7 @@ function INTEGRAL_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 659289e1..037ed7a5 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -35,7 +35,7 @@ function PID() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 0a5a8d40..85227456 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -11,7 +11,7 @@ function REGISTER() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index e0e94fb4..272606f6 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -11,7 +11,7 @@ function REGISTER_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index ebb8d78c..aed7855f 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -9,7 +9,7 @@ function SAMPHOLD() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 1dc31704..3eb05779 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -13,7 +13,7 @@ function SAMPHOLD_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index daca32c1..7241ba3a 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -9,7 +9,7 @@ function SAMPLEHOLD_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 2cd2b7bf..1a130333 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -10,7 +10,7 @@ function SOM_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 4f8390c6..f0d68daf 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -12,7 +12,7 @@ function SUMMATION() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,exprs,gr_i); return new Summation(this.x); } diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index de2a8e22..a80d7b1d 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -7,7 +7,7 @@ function SUM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); var exprs = []; this.x = standard_define([1,1],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 980ca35b..2ffcd2c6 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -19,7 +19,7 @@ function TCLSS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index fbed9355..282a3f16 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -19,7 +19,7 @@ function TCLSS_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 157612ae..b80c8c4e 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -14,7 +14,7 @@ function TIME_DELAY() { this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); this.x = standard_define([3.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 35b7cff9..2dbf9bac 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -14,7 +14,7 @@ function VARIABLE_DELAY() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 84ce2655..db4a4074 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -21,7 +21,7 @@ function CUMSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 4085179b..a8af7cf2 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -21,7 +21,7 @@ function EXTRACT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 73389965..556f7f43 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -21,7 +21,7 @@ function EXTTRI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index a9c5926d..89af3810 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -21,7 +21,7 @@ function MATBKSL() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index a7998608..38ce63aa 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -21,7 +21,7 @@ function MATCATH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 8b8e49b2..6b587007 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -22,7 +22,7 @@ function MATCATV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 1a429089..eec51a6d 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -21,7 +21,7 @@ function MATDET() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 4d4fc28f..809caf21 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -21,7 +21,7 @@ function MATDIAG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index d8452298..d06e9ddc 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -21,7 +21,7 @@ function MATDIV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index f41bc778..eb40ea0f 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -21,7 +21,7 @@ function MATEIG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index ad5d0d01..1ddaf92d 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -21,7 +21,7 @@ function MATEXPM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index a99b1d51..52f3ce2a 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -21,7 +21,7 @@ function MATINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index db897eb0..d18761da 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -21,7 +21,7 @@ function MATLU() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index af24ba07..44bfd55e 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -21,7 +21,7 @@ function MATMAGPHI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index e30a6e2c..c2c1aaf1 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -10,7 +10,7 @@ function MATMUL() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index d0a39209..3bd87e74 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -21,7 +21,7 @@ function MATPINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 4fdeb46d..55f610fa 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -21,7 +21,7 @@ function MATRESH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 8e14ea57..aad0ca3c 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -21,7 +21,7 @@ function MATSING() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index a95a6c39..8d1277bf 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -21,7 +21,7 @@ function MATSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 6f907f60..e9742920 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -9,7 +9,7 @@ function MATTRAN() { this.model.out2 = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 4a5dd180..1a1851d6 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -21,7 +21,7 @@ function MATZCONJ() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index f49bd4ef..d7bd1ac4 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -21,7 +21,7 @@ function MATZREIM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 6de43443..69517680 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -21,7 +21,7 @@ function RICC() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 9a3dfdf0..99ab2917 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -21,7 +21,7 @@ function ROOTCOEF() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 69eaf16c..d0be5533 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -11,7 +11,7 @@ function SQRT() { this.model.out2 = new ScilabDouble([-2]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 473b975f..2660bf83 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -21,7 +21,7 @@ function SUBMAT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 08e86247..41c27a3b 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -23,7 +23,7 @@ function AUTOMAT() { this.model.dep_ut = new ScilabDouble([false,true]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index cfa11318..80d95389 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -10,7 +10,7 @@ function BACKLASH() { this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 0f4e7ea3..0c2fa34f 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -34,7 +34,7 @@ function BOUNCE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 5935fb23..fd4b1222 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -31,7 +31,7 @@ function BOUNCEXY() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 4a57274b..00c632f8 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -17,7 +17,7 @@ function BPLATFORM() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 56d861f1..5f4ab520 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -28,7 +28,7 @@ function CBLOCK() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 6eb3e3f8..de732b84 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -12,7 +12,7 @@ function CBLOCK4() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 46f2c4d7..8e4b09e8 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -13,7 +13,7 @@ function CONSTRAINT2_c() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index fa704f34..f3bb0aa0 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -11,7 +11,7 @@ function CONSTRAINT_c() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = "0"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 151ee357..6493d594 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -14,7 +14,7 @@ function DEADBAND() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 7f507143..3cb017bb 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -5,7 +5,7 @@ function DEBUG() { this.model.sim = list(new ScilabString(["%debug_scicos"]), new ScilabDouble([99])); this.model.blocktype = new ScilabString(["d"]); var exprs = list("","xcos_debug_gui(flag,block);"); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEBUG\",sz(1),sz(2));"]); this.x = standard_define([8,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 0c07503e..630b1ad9 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -10,7 +10,7 @@ function DIFF_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f0de2468..f9e0ceac 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -12,7 +12,7 @@ function EDGETRIGGER() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.edge)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 01cc340e..c3fae1b5 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -77,7 +77,7 @@ function EDGE_TRIGGER() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 3a854c31..a3e1b18d 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -5,7 +5,7 @@ function ENDBLK() { scs_m_1.objs[1-1] = scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 2385bc51..67abe3fb 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -82,7 +82,7 @@ function Extract_Activation() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index c3018391..1df3ee97 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -15,7 +15,7 @@ function HYSTHERESIS() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(rpar)],[string(sign(this.nzz))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 2b79cc39..0e1735d8 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -12,7 +12,7 @@ function LOGICAL_OP() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index f0da699e..c1f54e5f 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -26,7 +26,7 @@ function MBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index a9f54a89..53979f34 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -13,7 +13,7 @@ function MEMORY_f() { this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index a783ecfb..ba6669ae 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -26,7 +26,7 @@ function MPBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 58177753..f57e5b93 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -10,7 +10,7 @@ function PAL_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 55ab73f7..0e265168 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -17,7 +17,7 @@ function PENDULUM_ANIM() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); this.x = standard_define([3,3],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 35287585..d4a0b090 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -12,7 +12,7 @@ function RATELIMITER() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]); this.x = standard_define([3.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 48de0bf5..4f4a8e2f 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -11,7 +11,7 @@ function RELATIONALOP() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 986ce265..c1829e59 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -18,7 +18,7 @@ function SUPER_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new SuperBlock(this.x); } diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 095a6fa1..7cfb272a 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -25,7 +25,7 @@ function c_block() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 3b56e06e..494609d6 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -16,7 +16,7 @@ function fortran_block() { this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 197225db..2d7c76fc 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -8,7 +8,7 @@ function func_block() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "v=sin(u);y=u*v"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 8a02e104..20e68c23 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -17,7 +17,7 @@ function generic_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index bbec134a..74bd3ca9 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -17,7 +17,7 @@ function generic_block2() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 28b5c5ab..9d28b43c 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -13,7 +13,7 @@ function generic_block3() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index f5715e61..2676a016 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -25,7 +25,7 @@ function scifunc_block() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index ad411fa4..b4a8cb3b 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -30,7 +30,7 @@ function scifunc_block_m() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 99864ff5..d46d66b6 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -7,7 +7,7 @@ function ABSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 868dd610..3b72f272 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -11,7 +11,7 @@ function ABS_VALUE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([1])]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index a27929db..05c80a02 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -8,7 +8,7 @@ function COSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index 6562a428..4e27387d 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -19,7 +19,7 @@ function DLRADAPT_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 0162f5ff..db3fdc0f 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -11,7 +11,7 @@ function EXPBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = ["%e"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 72cd885a..a974ab01 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -15,7 +15,7 @@ function EXPBLK_m() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = ["%e"]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 0a1b1914..3f636cad 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -9,7 +9,7 @@ function FSV_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 37b2eac9..44c9ee59 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -13,7 +13,7 @@ function INTRP2BLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 69e5382f..bff54205 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -11,7 +11,7 @@ function INTRPLBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index a777a4f3..77748cae 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -9,7 +9,7 @@ function INVBLK() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index af9b25a4..029a9191 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -9,7 +9,7 @@ function INVBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 86ebbd9a..cfaf50af 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -11,7 +11,7 @@ function LOGBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "%e"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index dd6cde5a..978b14ad 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -17,7 +17,7 @@ function LOOKUP2D() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 112c8e02..6dd7284d 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -22,7 +22,7 @@ function LOOKUP_c() { this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 644d53bc..dc93f4a8 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -8,7 +8,7 @@ function LOOKUP_f() { this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index dd33e64a..925000a4 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -9,7 +9,7 @@ function MAXMIN() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); var exprs = [string(transpose([2,1,1]))]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 96122900..8b2696db 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -10,7 +10,7 @@ function MAX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index f571e358..43bdfa9f 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -10,7 +10,7 @@ function MIN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index 59af138e..aa76d51a 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -11,7 +11,7 @@ function POWBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.a); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 0b15d8d8..238557d3 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -10,7 +10,7 @@ function PRODUCT() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); this.x = standard_define([2,3],this.model,exprs,gr_i); return new Product(this.x); } diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 0342e720..4772a8b7 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -12,7 +12,7 @@ function QUANT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.pas)],[string(this.meth)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 9641e15c..67ecd358 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -14,7 +14,7 @@ function SATURATION() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 2252cb52..30ea8cd8 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -14,7 +14,7 @@ function SAT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 6f59a566..39de5c1b 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -11,7 +11,7 @@ function SIGNUM() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([1])]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index f3411c27..44b797f8 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -8,7 +8,7 @@ function SINBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 29012ddf..7b52966d 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -9,7 +9,7 @@ function TANBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(in1); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 8dcc2737..4787574e 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -8,7 +8,7 @@ function TrigFun() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "sin"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index f114e5a0..bb49d986 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -10,7 +10,7 @@ function PDE() { this.model.dep_ut = new ScilabDouble([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); this.x = standard_define([3,3],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index c6215ee9..c1551c3b 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -19,7 +19,7 @@ function AFFICH_m() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); var exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new AfficheBlock(this.x); } diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 06ca27bd..550fa4ae 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -24,7 +24,7 @@ function CANIMXY() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index f2b9d04f..8a8f5924 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -24,7 +24,7 @@ function CANIMXY3D() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 0bfb4c6e..cccb59fd 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -15,7 +15,7 @@ function CEVENTSCOPE() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 39b2a3c4..50515568 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -17,7 +17,7 @@ function CFSCOPE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 85aac47f..eb6e8e42 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -20,7 +20,7 @@ function CMAT3D() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 70e63a5d..40a2edb9 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -18,7 +18,7 @@ function CMATVIEW() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 2ba39542..a906fe15 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -23,7 +23,7 @@ function CMSCOPE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 46dbd86a..6944e857 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -19,7 +19,7 @@ function CSCOPE() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 62151c21..22a8be18 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -23,7 +23,7 @@ function CSCOPXY() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index eb25e569..88152fe3 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -23,7 +23,7 @@ function CSCOPXY3D() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 3f70a71e..4dd97b21 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -14,7 +14,7 @@ function OUTIMPL_f() { mo.inputs = "n"; this.model.equations = new ScilabDouble([mo]); var exprs = "1"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 15588cd2..bce3dd16 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -12,7 +12,7 @@ function OUT_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); return new ExplicitOutBlock(this.x); } diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 81a38af2..ad6cdcb1 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -18,7 +18,7 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); var exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index b14fd735..2f2bc5a5 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -9,7 +9,7 @@ function TRASH_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index d87b4bdf..4c919d7a 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -16,7 +16,7 @@ function WFILE_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index e674dfed..5765e7a6 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -17,7 +17,7 @@ function WRITEAU_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.N),string(this.swap)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 1f7579b7..b92975c2 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -17,7 +17,7 @@ function WRITEC_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index d86618c9..12ff04eb 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -10,7 +10,7 @@ function CLKINV_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); return new EventInBlock(this.x); } diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 1642f70c..4010f34a 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -21,7 +21,7 @@ function CLOCK_c() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index a18cfc4b..c071dc88 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -21,7 +21,7 @@ function CLOCK_f() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 81978c23..8465ca55 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -10,7 +10,7 @@ function CONST() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(sci2exp(this.C)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 8f809d66..abe2b3c8 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -10,7 +10,7 @@ function CONST_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(sci2exp(this.C)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 69e37818..3a207f1c 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -13,7 +13,7 @@ function CONST_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = sci2exp(this.C); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index a165bcb8..a8827ea6 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -19,7 +19,7 @@ function CURVE_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index e34977ec..ce2f2207 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -15,7 +15,7 @@ function CURV_f() { this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 6b5c835b..de94c91f 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -14,7 +14,7 @@ function Counter() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 31a19f1f..9d1ab635 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -7,7 +7,7 @@ function FROMWSB() { scs_m_1.objs[3-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); this.x = standard_define([5,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 678deb94..0626ae40 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -16,7 +16,7 @@ function FROMWS_c() { this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); var exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; this.x = standard_define([3.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 5871d300..ff8153de 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -12,7 +12,7 @@ function GENSIN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 9d5be45d..3c0b2f65 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -12,7 +12,7 @@ function GENSQR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.Amplitude); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index e6ba542c..0ed8569e 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -46,7 +46,7 @@ function GEN_SQR() { var rule = 1; var F = 1; var exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 98dfe03e..343fe0c4 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -14,7 +14,7 @@ function Ground_g() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = []; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 158e9b71..bfcbde45 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -14,7 +14,7 @@ function INIMPL_f() { this.model.equations = new ScilabDouble([mo]); this.prt = 1; var exprs = "1"; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 756cf5cd..d1b6534d 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -11,7 +11,7 @@ function IN_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = sci2exp(prt); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); this.x = standard_define([1,1],this.model,exprs,gr_i); return new ExplicitInBlock(this.x); } diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 2ac3c14f..d2ada870 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -12,7 +12,7 @@ function Modulo_Count() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.ini_c)],[string(this.base)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 802851d4..0048829d 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -41,7 +41,7 @@ function PULSE_SC() { var F = 1; var A = 1; var exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 828bed9d..d0d6e161 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -15,7 +15,7 @@ function RAMP() { this.model.nzcross = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [string(rpar)]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 8799018e..9e4444cb 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -16,7 +16,7 @@ function RAND_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index ff748381..f7d0217b 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -25,7 +25,7 @@ function RAND_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index c3db2463..dd7d168d 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -21,7 +21,7 @@ function READAU_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[fname],[string(this.N)],[string(this.swap)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); this.x = standard_define([5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 2f818f23..4a11e2ae 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -25,7 +25,7 @@ function READC_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 778ebced..4c5b6c2e 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -21,7 +21,7 @@ function RFILE_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 4ba5e01c..b3ec717e 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -9,7 +9,7 @@ function SAWTOOTH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); var exprs = " "; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 10babc97..972a8fe3 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -14,7 +14,7 @@ function STEP() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(1)],[string(rpar)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 7b98b38a..f79a4986 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -47,7 +47,7 @@ function STEP_FUNCTION() { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index d1fea012..1a558e26 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -11,7 +11,7 @@ function Sigbuilder() { scs_m_1.objs[7-1] = scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 4c56f9aa..86f44525 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -6,7 +6,7 @@ function TIME_f() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 68ea3bf2..b132a0e6 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -12,7 +12,7 @@ function TKSCALE() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 7ad81a55..8079bbc7 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -14,7 +14,7 @@ function GENERAL_f() { this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_f\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 50e5cdc3..81414ce2 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -10,7 +10,7 @@ function NEGTOPOS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index ce173fac..a6981a8c 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -11,7 +11,7 @@ function POSTONEG_f() { this.model.blocktype = new ScilabString(["z"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.firing = new ScilabDouble([-1]); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 65bd428c..e96ef207 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -13,7 +13,7 @@ function ZCROSS_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); var exprs = strcat(sci2exp(this.in1)); - var gr_i = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 8560a171..00f3d542 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -122,15 +122,19 @@ def p_functionblock_functionstatement_statementblock_endfunction(p): def p_jobfunctionstatement_function_var(p): 'jobfunctionstatement : FUNCTION lterm ASSIGNMENT VAR OPENBRACKET JOB COMMA VAR COMMA VAR CLOSEBRACKET EOL' + global SCICOS_BLOCK_NAME + SCICOS_BLOCK_NAME = p[4] for var in (p[6], p[8], p[10]): FUNCTION_VARS.add(var) - p[0] = '%s' % (p[4]) + p[0] = SCICOS_BLOCK_NAME def p_jobfunctionstatement_function_functionname(p): 'jobfunctionstatement : FUNCTION lterm ASSIGNMENT FUNCTIONNAME OPENBRACKET JOB COMMA VAR COMMA VAR CLOSEBRACKET EOL' + global SCICOS_BLOCK_NAME + SCICOS_BLOCK_NAME = p[4][0] for var in (p[6], p[8], p[10]): FUNCTION_VARS.add(var) - p[0] = '%s' % (p[4][0]) + p[0] = SCICOS_BLOCK_NAME def p_functionstatement_function_var(p): 'functionstatement : FUNCTION lterm ASSIGNMENT VAR OPENBRACKET list CLOSEBRACKET EOL' @@ -525,9 +529,12 @@ def p_lterm_assignment_expression(p): idx += 1 else: prefix = '' + value = p[3][0] + if var == 'gr_i' and value == '[]': + value = 'new ScilabString(["xstringb(orig(1),orig(2),\\"%s\\",sz(1),sz(2));"])' % (SCICOS_BLOCK_NAME) if var in LOCAL_VARS and '.' not in var: prefix = 'var ' - p[0] = '%*s%s%s = %s;\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', prefix, var, p[3][0]) + p[0] = '%*s%s%s = %s;\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', prefix, var, value) add_var_vartype(var, p[3][1]) def p_model_assignment_expression(p): |