diff options
Diffstat (limited to 'js/Events')
32 files changed, 147 insertions, 215 deletions
diff --git a/js/Events/ANDBLK.pickle b/js/Events/ANDBLK.pickle index e00bbee6..a5a6ed4b 100644 --- a/js/Events/ANDBLK.pickle +++ b/js/Events/ANDBLK.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index b6d6671f..3aeaa30d 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -8,8 +8,8 @@ function ANDLOG_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle index 30d979c2..26374ff6 100644 --- a/js/Events/ANDLOG_f.pickle +++ b/js/Events/ANDLOG_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index e6907d4e..b5a02ef9 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -8,8 +8,8 @@ function CLKSOMV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle index 13328761..d3cbc906 100644 --- a/js/Events/CLKSOMV_f.pickle +++ b/js/Events/CLKSOMV_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 932c979a..1b67fd78 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -8,8 +8,8 @@ function CLKSOM_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle index 13328761..d3cbc906 100644 --- a/js/Events/CLKSOM_f.pickle +++ b/js/Events/CLKSOM_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle index 3235bd26..eedc04a1 100644 --- a/js/Events/CLKSPLIT_f.pickle +++ b/js/Events/CLKSPLIT_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 70af91e8..89478703 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -9,9 +9,9 @@ function END_c() { this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.tf); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.tf); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { @@ -24,7 +24,7 @@ function END_c() { return options; } END_c.prototype.set = function END_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tf = parseFloat(arguments[0]["tf"]); @@ -32,7 +32,7 @@ function END_c() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.tf]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle index d39b4b9d..dbe03e14 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'tf' p2 -aS'gr_i' +aS'x' p3 -aS'graphics' +aS'model' p4 -aS'tf' +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index b3b35bda..26e11e47 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -11,9 +11,9 @@ function EVTDLY_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { @@ -27,7 +27,7 @@ function EVTDLY_c() { return options; } EVTDLY_c.prototype.set = function EVTDLY_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.dt = parseFloat(arguments[0]["dt"]); @@ -41,7 +41,7 @@ function EVTDLY_c() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle index d6bbd0fa..e5ee1b5a 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'ff' +aS'dt' p4 -aS'graphics' +aS'ff' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 244d0e3f..f355fc65 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -11,9 +11,9 @@ function EVTDLY_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { @@ -27,7 +27,7 @@ function EVTDLY_f() { return options; } EVTDLY_f.prototype.set = function EVTDLY_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.dt = parseFloat(arguments[0]["dt"]); @@ -41,7 +41,7 @@ function EVTDLY_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle index 8f4831ec..744b403c 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'ff' +aS'dt' p4 -aS'graphics' +aS'ff' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index a0ccfd8a..d651c74d 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -8,9 +8,9 @@ function EVTGEN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.tt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.tt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { @@ -23,14 +23,14 @@ function EVTGEN_f() { return options; } EVTGEN_f.prototype.set = function EVTGEN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tt = parseFloat(arguments[0]["tt"]); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); if (this.model.firing!=this.tt) { this.model.firing = new ScilabDouble([this.tt]); } diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle index 2fcdb628..84e3bf23 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'tt' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'tt' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 791714d4..ab7fa3df 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -10,9 +10,9 @@ function EVTVARDLY() { this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.model.firing); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.model.firing); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { @@ -25,14 +25,14 @@ function EVTVARDLY() { return options; } EVTVARDLY.prototype.set = function EVTVARDLY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.fir = arguments[0]["fir"]; if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.fir]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index cf9f65c6..7fbae78f 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -4,18 +4,14 @@ p0 ((lp1 S'fir' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index d11540c7..30073376 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -9,9 +9,9 @@ function HALT_f() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.n); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.n); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { @@ -24,7 +24,7 @@ function HALT_f() { return options; } HALT_f.prototype.set = function HALT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.n = parseFloat(arguments[0]["n"]); @@ -32,7 +32,7 @@ function HALT_f() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.n]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle index eb4ae364..1286a722 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'n' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'n' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 30d8eada..50fe5c53 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -13,9 +13,9 @@ function IFTHEL_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); + var exprs = [[string(this.model.in)],[string(this.model.nmode)]]; + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { @@ -29,12 +29,12 @@ function IFTHEL_f() { return options; } IFTHEL_f.prototype.set = function IFTHEL_f() { - this.exprs = this.graphics.exprs; - if (this.exprs.length==0) { - this.exprs = string(1); + var exprs = this.graphics.exprs; + if (exprs.length==0) { + var exprs = string(1); } - if (size(this.exprs,"*")==1) { - this.exprs[2-1] = string(1); + if (size(exprs,"*")==1) { + exprs[2-1] = string(1); } while (true) { var ok = true; @@ -55,7 +55,7 @@ function IFTHEL_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabString([this.exprs]); + this.graphics.exprs = new ScilabString([exprs]); this.model.evtin = new ScilabDouble(this.inh); this.model.sim[2-1] = new ScilabDouble([-1]); this.model.nmode = new ScilabDouble([this.nmod]); diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index 77e313b9..b82c9fb3 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nmod' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' -p4 aS'inh' +p4 +aS'nmod' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index cdc40601..dfff693a 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -3,12 +3,12 @@ function MCLOCK_f() { MCLOCK_f.prototype.define = function MCLOCK_f() { var nn = 2; var dt = 0.1; - this.exprs = [[string(dt)],[string(nn)]]; + var exprs = [[string(dt)],[string(nn)]]; var mfclck = MFCLCK_f("define"); mfclck.graphics.orig = [334,199]; mfclck.graphics.sz = [40,40]; mfclck.graphics.flip = true; - mfclck.graphics.exprs = this.exprs; + mfclck.graphics.exprs = exprs; mfclck.graphics.pein = 12; mfclck.graphics.peout = [[4],[3]]; mfclck.model.rpar = 0.1; @@ -43,7 +43,7 @@ function MCLOCK_f() { split2.graphics.orig = [[482.45315],[169.33333]]; split2.graphics.pein = 5; split2.graphics.peout = [[12],[13]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); + 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; @@ -61,7 +61,7 @@ function MCLOCK_f() { this.x = scicos_block(); this.x.gui = "MCLOCK_f"; this.x.graphics.sz = [3,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.model.sim = "csuper"; this.x.model.evtout = [[1],[1]]; this.x.model.blocktype = "h"; diff --git a/js/Events/MCLOCK_f.pickle b/js/Events/MCLOCK_f.pickle index aba4263b..2e6139a4 100644 --- a/js/Events/MCLOCK_f.pickle +++ b/js/Events/MCLOCK_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'xxn' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'xxn' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'output_port1.graphics.exprs' p1 diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index b20c23d7..26f05135 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -13,9 +13,9 @@ function MFCLCK_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1,0]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[string(this.nn)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[string(this.nn)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { @@ -29,7 +29,7 @@ function MFCLCK_f() { return options; } MFCLCK_f.prototype.set = function MFCLCK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = true; this.dt = parseFloat(arguments[0]["dt"]); this.nn = parseFloat(arguments[0]["nn"]); @@ -39,7 +39,7 @@ function MFCLCK_f() { var hh = this.model.firing; hh[2-1] = 0; this.model.firing = new ScilabDouble(hh); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle index 9a07850c..6151b4df 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nn' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'dt' p4 -aS'graphics' +aS'nn' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index c764176a..f240607e 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -10,9 +10,9 @@ function M_freq() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1,-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { @@ -26,7 +26,7 @@ function M_freq() { return options; } M_freq.prototype.set = function M_freq() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.frequ = inverse(arguments[0]["frequ"]); @@ -74,7 +74,7 @@ function M_freq() { this.graphics.sz = new ScilabDouble([50,40]); } this.model.firing = new ScilabDouble([fir]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle index c66a8c64..6d8b6f60 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -8,20 +8,16 @@ aS'of' p3 aS'frequ' p4 -aS'offset' +aS'graphics' p5 -aS'exprs' +aS'offset' p6 -aS'gr_i' -p7 -aS'graphics' -p8 aS'x' -p9 +p7 aS'model' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index ea3e7638..ba638920 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -9,8 +9,8 @@ function VirtualCLK0() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = []; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = []; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs)," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle index b44a7f0c..5158c78c 100644 --- a/js/Events/VirtualCLK0.pickle +++ b/js/Events/VirtualCLK0.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 1531f9e7..66b8a2dd 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -103,8 +103,8 @@ function freq_div() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { @@ -132,7 +132,7 @@ function freq_div() { spath[$+1-1] = path; var xxn = xx; this.graphics = xx.graphics; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.model = xx.model; while (true) { var ok = true; @@ -149,7 +149,7 @@ function freq_div() { if (%ph>%df-1) { %ph = %df-1; } - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.model.ipar = new ScilabDouble([%df]); this.model.dstate = new ScilabDouble([%ph]); xxn.graphics = this.graphics; diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle index 9b2944e4..77101c43 100644 --- a/js/Events/freq_div.pickle +++ b/js/Events/freq_div.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'%df' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'%df' p4 aS'%ph' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'lnk.ct' p1 |