diff options
Diffstat (limited to 'js/Sinks')
42 files changed, 260 insertions, 344 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index a71d6f4b..54e87f82 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -18,9 +18,9 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.label = new ScilabString([""]); - this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",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([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { @@ -39,7 +39,7 @@ function AFFICH_m() { return options; } AFFICH_m.prototype.set = function AFFICH_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = inverse(arguments[0]["in1"]); @@ -91,7 +91,7 @@ function AFFICH_m() { this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]); - 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/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index 028cca3a..a85fbe77 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -10,24 +10,20 @@ aS'colr' p4 aS'in1' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'fontsize' -p8 +p6 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'font' -p12 +p10 aS'nt' -p13 -atp14 -Rp15 +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 286427e9..bb576420 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -35,7 +35,7 @@ function BARXY() { return options; } BARXY.prototype.set = function BARXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.xmin = parseFloat(arguments[0]["xmin"]); @@ -65,7 +65,7 @@ function BARXY() { } else { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.thickness]); - 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/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 2af2eb77..ddc2b822 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -6,24 +6,20 @@ S'ymax' p2 aS'thickness' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'xmax' -p6 +p4 aS'graphics' -p7 +p5 aS'xmin' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'ymin' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index b98165fe..4625e975 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -23,9 +23,9 @@ function CANIMXY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.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)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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.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 = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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); } CANIMXY.prototype.details = function CANIMXY() { @@ -48,7 +48,7 @@ function CANIMXY() { return options; } CANIMXY.prototype.set = function CANIMXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -118,7 +118,7 @@ function CANIMXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index 4890b7d6..c70d7cab 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -16,26 +16,22 @@ aS'wdim' p7 aS'N' p8 -aS'exprs' -p9 -aS'gr_i' -p10 aS'xmax' -p11 +p9 aS'graphics' -p12 +p10 aS'xmin' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 9ff328e5..af4757f1 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -23,9 +23,9 @@ function CANIMXY3D() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.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)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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.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 = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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); } CANIMXY3D.prototype.details = function CANIMXY3D() { @@ -48,7 +48,7 @@ function CANIMXY3D() { return options; } CANIMXY3D.prototype.set = function CANIMXY3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -135,7 +135,7 @@ function CANIMXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index eb4cb122..96d8b9f3 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -20,22 +20,18 @@ aS'param3ds' p9 aS'N' p10 -aS'exprs' -p11 -aS'gr_i' -p12 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 13e18eb5..8e3bebbb 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -14,9 +14,9 @@ function CEVENTSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",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); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { @@ -34,7 +34,7 @@ function CEVENTSCOPE() { return options; } CEVENTSCOPE.prototype.set = function CEVENTSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nclock = parseFloat(arguments[0]["nclock"]); @@ -94,7 +94,7 @@ function CEVENTSCOPE() { var ipar = [[this.win],[1],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.slice()]]; this.model.rpar = new ScilabDouble([rpar]); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle index 848fca4f..28384e9a 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -12,20 +12,16 @@ aS'wdim' p5 aS'per' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'nclock' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 928fb538..6fe9167c 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -16,9 +16,9 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.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])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",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); } CFSCOPE.prototype.details = function CFSCOPE() { @@ -39,7 +39,7 @@ function CFSCOPE() { return options; } CFSCOPE.prototype.set = function CFSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.clrs = inverse(arguments[0]["clrs"]); @@ -106,7 +106,7 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - 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/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle index 2995c739..ee50f7b9 100644 --- a/js/Sinks/CFSCOPE.pickle +++ b/js/Sinks/CFSCOPE.pickle @@ -16,22 +16,18 @@ aS'per' p7 aS'N' p8 -aS'exprs' -p9 aS'wu' -p10 -aS'gr_i' -p11 +p9 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'ymin' -p15 -atp16 -Rp17 +p13 +atp14 +Rp15 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index ecf86c06..653e2633 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -9,8 +9,8 @@ function CLKOUTV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { @@ -23,7 +23,7 @@ function CLKOUTV_f() { return options; } CLKOUTV_f.prototype.set = function CLKOUTV_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.prt = arguments[0]["prt"]; @@ -36,7 +36,7 @@ function CLKOUTV_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -69,8 +69,8 @@ function CLKOUTV_f() { var y = orig[2-1]+sz[2-1]*[[0],[1/3],[1],[1],[1/3]]; var xo = orig[1-1]; var yo = orig[2-1]+sz[2-1]/3; - if (this.type[this.gr_i-1]==15) { - var coli = this.gr_i[2-1]; + if (this.type[gr_i-1]==15) { + var coli = gr_i[2-1]; var pcoli = xget("pattern"); xfpolys(this.x,y,coli); xset("pattern",coli); diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle index 4523edef..1461c53d 100644 --- a/js/Sinks/CLKOUTV_f.pickle +++ b/js/Sinks/CLKOUTV_f.pickle @@ -2,28 +2,24 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'diag' p2 -aS'diag' -p3 aS'default_color' +p3 +aS'prt' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'type' -p10 +p8 aS'options' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'xo' p1 diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 88ec4ea3..b3e7f946 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -9,8 +9,8 @@ function CLKOUT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { @@ -23,8 +23,8 @@ function CLKOUT_f() { return options; } CLKOUT_f.prototype.set = function CLKOUT_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -39,7 +39,7 @@ function CLKOUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); this.model.firing = new ScilabDouble([]); - 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/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle index 8de8dad9..c3b14260 100644 --- a/js/Sinks/CLKOUT_f.pickle +++ b/js/Sinks/CLKOUT_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +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/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 5656b99c..b220e9f2 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -19,9 +19,9 @@ function CMAT3D() { this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",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); } CMAT3D.prototype.details = function CMAT3D() { @@ -38,7 +38,7 @@ function CMAT3D() { return options; } CMAT3D.prototype.set = function CMAT3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.vec_x = arguments[0]["vec_x"]; @@ -69,7 +69,7 @@ function CMAT3D() { var rpar = [[this.colormap.slice()],[this.vec_x.slice()],[this.vec_y.slice()]]; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - 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/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle index 4db7bf86..70976a35 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -8,22 +8,18 @@ aS'vec_x' p3 aS'vec_y' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'cmax' -p10 +p8 aS'cmin' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index d6abdde1..e06541ac 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -17,9 +17,9 @@ function CMATVIEW() { this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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); } CMATVIEW.prototype.details = function CMATVIEW() { @@ -34,7 +34,7 @@ function CMATVIEW() { return options; } CMATVIEW.prototype.set = function CMATVIEW() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.colormap = parseFloat(arguments[0]["colormap"]); @@ -61,7 +61,7 @@ function CMATVIEW() { var rpar = [[alpha_c],[beta_c],[this.colormap.slice()]]; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - 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/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index 06435d50..c6a3e5b6 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'colormap' +S'cmin' p2 -aS'exprs' +aS'graphics' p3 -aS'gr_i' +aS'x' p4 -aS'graphics' +aS'model' p5 -aS'x' +aS'cmax' p6 -aS'model' +aS'colormap' p7 -aS'cmax' -p8 -aS'cmin' -p9 -atp10 -Rp11 +atp8 +Rp9 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 20969d00..e45ce629 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -22,9 +22,9 @@ function CMSCOPE() { this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.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()]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",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); } CMSCOPE.prototype.details = function CMSCOPE() { @@ -47,7 +47,7 @@ function CMSCOPE() { return options; } CMSCOPE.prototype.set = function CMSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = inverse(arguments[0]["in1"]); @@ -143,7 +143,7 @@ function CMSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.label = new ScilabDouble([this.nom]); this.graphics.id = new ScilabDouble([this.nom]); - 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/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 043924d7..0645baab 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -20,22 +20,18 @@ aS'per' p9 aS'N' p10 -aS'exprs' -p11 -aS'gr_i' -p12 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'ymin' -p16 +p14 aS'heritance' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 5b12e2ea..4ad77d3d 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -18,9 +18,9 @@ function CSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.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()]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",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); } CSCOPE.prototype.details = function CSCOPE() { @@ -42,7 +42,7 @@ function CSCOPE() { return options; } CSCOPE.prototype.set = function CSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.clrs = inverse(arguments[0]["clrs"]); @@ -111,7 +111,7 @@ function CSCOPE() { this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.label = new ScilabDouble([this.nom]); this.graphics.id = new ScilabDouble([this.nom]); - 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/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index 1190c106..9b7286a1 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -18,22 +18,18 @@ aS'per' p8 aS'N' p9 -aS'exprs' -p10 -aS'gr_i' -p11 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'ymin' -p15 +p13 aS'heritance' -p16 -atp17 -Rp18 +p14 +atp15 +Rp16 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index dc49319e..d42f46e5 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -22,9 +22,9 @@ function CSCOPXY() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.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)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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.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 = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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); } CSCOPXY.prototype.details = function CSCOPXY() { @@ -47,7 +47,7 @@ function CSCOPXY() { return options; } CSCOPXY.prototype.set = function CSCOPXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -117,7 +117,7 @@ function CSCOPXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index a3b31d8e..171d6647 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -16,26 +16,22 @@ aS'wdim' p7 aS'N' p8 -aS'exprs' -p9 -aS'gr_i' -p10 aS'xmax' -p11 +p9 aS'graphics' -p12 +p10 aS'xmin' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 9b25962a..3e73e43c 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -22,9 +22,9 @@ function CSCOPXY3D() { this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.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)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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.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 = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { @@ -47,7 +47,7 @@ function CSCOPXY3D() { return options; } CSCOPXY3D.prototype.set = function CSCOPXY3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -127,7 +127,7 @@ function CSCOPXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index 8e68f9ac..ecfc3cdb 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -20,22 +20,18 @@ aS'param3ds' p9 aS'N' p10 -aS'exprs' -p11 -aS'gr_i' -p12 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 3ffe67be..0b4f8293 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -13,9 +13,9 @@ function OUTIMPL_f() { mo.model = "PORT"; mo.inputs = "n"; this.model.equations = new ScilabDouble([mo]); - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } @@ -29,9 +29,9 @@ function OUTIMPL_f() { return options; } OUTIMPL_f.prototype.set = function OUTIMPL_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -48,7 +48,7 @@ function OUTIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - 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/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index 387f4e48..56136135 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index e578c791..0b644878 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -11,9 +11,9 @@ function OUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { @@ -26,9 +26,9 @@ function OUT_f() { return options; } OUT_f.prototype.set = function OUT_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -41,7 +41,7 @@ function OUT_f() { block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected."); } else { this.model.ipar = new ScilabDouble([this.prt]); - 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/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index d59ea7cf..25233f77 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +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.in2' p1 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 0f285c96..f07c35d0 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -18,9 +18,9 @@ function TOWS_c() { 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),\"TOWS_c\",sz(1),sz(2));"]); - this.exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.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 = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { @@ -35,7 +35,7 @@ function TOWS_c() { return options; } TOWS_c.prototype.set = function TOWS_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nz = parseFloat(arguments[0]["nz"]); @@ -68,7 +68,7 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); } this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); - 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/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 07723464..330d4c47 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -4,24 +4,20 @@ p0 ((lp1 S'herit' p2 -aS'exprs' -p3 aS'nz' -p4 -aS'gr_i' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'ascii' -p9 +p7 aS'varnam' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index cf48b38b..bd5dea22 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -8,9 +8,9 @@ function TRASH_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_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 = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_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); } TRASH_f.prototype.details = function TRASH_f() { diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle index 969fe5fc..9478b876 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_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/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 19f166b5..00d25edb 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -15,9 +15,9 @@ function WFILE_f() { this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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 = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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); } WFILE_f.prototype.details = function WFILE_f() { @@ -37,11 +37,11 @@ function WFILE_f() { var warnMessage = msprintf("Feature %s is obsolete.","WFILE_f"); var warnAdvise = msprintf("Please use %s instead.","WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = this.exprs[2-1]; - var frmt = this.exprs[3-1]; + var fname = exprs[2-1]; + var frmt = exprs[3-1]; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -92,7 +92,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabBoolean([true,false]); - 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/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index 6cf01c1d..851555f2 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -6,26 +6,22 @@ S'isdir' p2 aS'_str2code' p3 -aS'in1' +aS'frmt1' p4 aS'fname1' p5 -aS'frmt1' +aS'in1' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'N' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index af012eb2..1ddffb03 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -16,9 +16,9 @@ function WRITEAU_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string(this.N),string(this.swap)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [string(this.N),string(this.swap)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString(exprs),gr_i); return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { @@ -32,7 +32,7 @@ function WRITEAU_f() { return options; } WRITEAU_f.prototype.set = function WRITEAU_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -65,7 +65,7 @@ function WRITEAU_f() { this.model.in = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index f42ff3ef..0e7703be 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -6,22 +6,18 @@ S'_str2code' p2 aS'N' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'swap' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'alreadyran' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 816c1ee7..b4eea5fe 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -16,9 +16,9 @@ function WRITEC_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { @@ -35,12 +35,12 @@ function WRITEC_f() { return options; } WRITEC_f.prototype.set = function WRITEC_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = this.exprs[2-1]; - var frmt = this.exprs[3-1]; + var fname = exprs[2-1]; + var frmt = exprs[3-1]; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -95,7 +95,7 @@ function WRITEC_f() { this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - 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/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index c4a21594..fa3e6c96 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -6,30 +6,26 @@ S'isdir' p2 aS'_str2code' p3 -aS'in1' +aS'frmt1' p4 aS'fname1' p5 -aS'frmt1' +aS'in1' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'swap' -p9 +p7 aS'graphics' -p10 +p8 aS'x' -p11 +p9 aS'model' -p12 +p10 aS'N' -p13 +p11 aS'alreadyran' -p14 -atp15 -Rp16 +p12 +atp13 +Rp14 .(dp0 S'model.dstate' p1 |