diff options
Diffstat (limited to 'js/Misc')
34 files changed, 34 insertions, 34 deletions
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); } |