diff options
author | Sunil Shetye | 2018-07-16 15:29:15 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-16 15:31:24 +0530 |
commit | 5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f (patch) | |
tree | 8b842ea29c504a11164c39221e948fdaa8fa9035 /js/Misc | |
parent | 614f18061faa4fc126f0d3577792dd9adfb3f240 (diff) | |
download | sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.tar.gz sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.tar.bz2 sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.zip |
treat third argument of standard_define as model expression
Diffstat (limited to 'js/Misc')
-rw-r--r-- | js/Misc/AUTOMAT.js | 2 | ||||
-rw-r--r-- | js/Misc/BACKLASH.js | 2 | ||||
-rw-r--r-- | js/Misc/BOUNCE.js | 2 | ||||
-rw-r--r-- | js/Misc/BOUNCEXY.js | 2 | ||||
-rw-r--r-- | js/Misc/BPLATFORM.js | 2 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT_c.js | 2 | ||||
-rw-r--r-- | js/Misc/DEADBAND.js | 2 | ||||
-rw-r--r-- | js/Misc/DIFF_f.js | 2 | ||||
-rw-r--r-- | js/Misc/EDGETRIGGER.js | 2 | ||||
-rw-r--r-- | js/Misc/EDGE_TRIGGER.js | 2 | ||||
-rw-r--r-- | js/Misc/ENDBLK.js | 2 | ||||
-rw-r--r-- | js/Misc/Extract_Activation.js | 2 | ||||
-rw-r--r-- | js/Misc/HYSTHERESIS.js | 2 | ||||
-rw-r--r-- | js/Misc/IMPSPLIT_f.js | 2 | ||||
-rw-r--r-- | js/Misc/LOGICAL_OP.js | 2 | ||||
-rw-r--r-- | js/Misc/MBLOCK.js | 2 | ||||
-rw-r--r-- | js/Misc/MEMORY_f.js | 2 | ||||
-rw-r--r-- | js/Misc/MPBLOCK.js | 2 | ||||
-rw-r--r-- | js/Misc/PAL_f.js | 2 | ||||
-rw-r--r-- | js/Misc/PENDULUM_ANIM.js | 2 | ||||
-rw-r--r-- | js/Misc/RATELIMITER.js | 2 | ||||
-rw-r--r-- | js/Misc/RELATIONALOP.js | 2 | ||||
-rw-r--r-- | js/Misc/SPLIT_f.js | 2 | ||||
-rw-r--r-- | js/Misc/SUPER_f.js | 2 | ||||
-rw-r--r-- | js/Misc/func_block.js | 2 | ||||
-rw-r--r-- | js/Misc/generic_block.js | 2 | ||||
-rw-r--r-- | js/Misc/generic_block2.js | 2 | ||||
-rw-r--r-- | js/Misc/generic_block3.js | 2 |
28 files changed, 28 insertions, 28 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 11057d0f..1e8806bb 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -24,7 +24,7 @@ function AUTOMAT() { this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index b2a69f86..2af53279 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -11,7 +11,7 @@ function BACKLASH() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index bf1a4a1e..c2c9867f 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -35,7 +35,7 @@ function BOUNCE() { this.model.dep_ut = new ScilabBoolean([false,true]); this.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))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 915a51de..0eed5d47 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -32,7 +32,7 @@ function BOUNCEXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.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))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 37b101fc..49243956 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -18,7 +18,7 @@ function BPLATFORM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 988db1e1..0ea8c789 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -12,7 +12,7 @@ function CONSTRAINT_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = "0"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 8e044e7c..8bf9884b 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -15,7 +15,7 @@ function DEADBAND() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 722f1350..d6a523c2 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -11,7 +11,7 @@ function DIFF_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f0699af4..04b3881a 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -13,7 +13,7 @@ function EDGETRIGGER() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.edge)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 4699c0b0..0faafe7f 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -78,7 +78,7 @@ function EDGE_TRIGGER() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 3ef0abeb..a173fddf 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -6,7 +6,7 @@ function ENDBLK() { 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()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 164b496c..e42bbd03 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -83,7 +83,7 @@ function Extract_Activation() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 19e73b50..f63ef6b7 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -16,7 +16,7 @@ function HYSTHERESIS() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(rpar)],[string(sign(this.nzz))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index a54061e9..e9bfaa98 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -10,7 +10,7 @@ function IMPSPLIT_f() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I","I"]; return new BasicBlock(this.x); diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index cdb9ed51..b0884b8d 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -13,7 +13,7 @@ function LOGICAL_OP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 0ca1910a..44c8ca1c 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -27,7 +27,7 @@ function MBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 6489728b..f3687612 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -14,7 +14,7 @@ function MEMORY_f() { this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 8b246576..a089a56e 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -27,7 +27,7 @@ function MPBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 8c5eca6e..f4d7bf06 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -11,7 +11,7 @@ function PAL_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.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 940c5b0f..c38cbcb4 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -18,7 +18,7 @@ function PENDULUM_ANIM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index f3a168e8..0e61e53a 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -13,7 +13,7 @@ function RATELIMITER() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index b4874f59..f9089a4a 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -12,7 +12,7 @@ function RELATIONALOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(ipar)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 03991e57..25a77818 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -7,7 +7,7 @@ function SPLIT_f() { this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } SPLIT_f.prototype.details = function SPLIT_f() { diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 42ac935d..f7ed1507 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -19,7 +19,7 @@ function SUPER_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new SuperBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 54bc297f..f21a5066 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -9,7 +9,7 @@ function func_block() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "v=sin(u);y=u*v"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index e6e9b94d..c8ef0332 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -18,7 +18,7 @@ function generic_block() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[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"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 4803ee3b..ccd515b7 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -18,7 +18,7 @@ function generic_block2() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[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"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index ce288c44..63199c40 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -14,7 +14,7 @@ function generic_block3() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,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"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { |