diff options
author | Sunil Shetye | 2018-08-24 11:46:02 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-08-27 16:43:40 +0530 |
commit | 3386d0d537a498adce65f313aacb7ca4a147a4d2 (patch) | |
tree | dc8b98c70c10cec2c9f3f37b5858e1afd6554698 /js/Misc/scifunc_block_m.js | |
parent | 9fee9bd7e5e356e872c7a539d4a6cfa89cae593c (diff) | |
download | sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.tar.gz sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.tar.bz2 sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.zip |
remove exprs and gr_i from default global list
Diffstat (limited to 'js/Misc/scifunc_block_m.js')
-rw-r--r-- | js/Misc/scifunc_block_m.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 554d97ba..a93fb549 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -29,9 +29,9 @@ function scifunc_block_m() { this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabBoolean([true,false]); - this.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)"," "," "," ")); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,exprs,gr_i); return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { @@ -53,7 +53,7 @@ function scifunc_block_m() { } scifunc_block_m.prototype.set = function scifunc_block_m() { var needcompile = 0; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.i = arguments[0]["i"]; @@ -69,7 +69,7 @@ function scifunc_block_m() { if (!ok) { break; } - this.exprs[1-1] = this.lab; + exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -82,7 +82,7 @@ function scifunc_block_m() { var nci = size(this.ci,1); this.co = int(this.co.slice()); var nco = size(this.co,1); - var tmpvar0 = genfunc2(this.exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc2(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); var ok = tmpvar0[0]; var tt = tmpvar0[1]; var dep_ut = tmpvar0[2]; @@ -110,8 +110,8 @@ function scifunc_block_m() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - this.exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([this.exprs]); + exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; break; } |