diff options
Diffstat (limited to 'js/Sinks/AFFICH_m.js')
-rw-r--r-- | js/Sinks/AFFICH_m.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 257cff45..868cdb9c 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -9,7 +9,7 @@ function AFFICH_m() { this.in1 = [1,1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["affich2"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([this.in1[1-1][1-1]]); + this.model.in = new ScilabDouble([this.in1[1-1][1-1]]); this.model.in2 = new ScilabDouble([this.in1[1-1][2-1]]); this.model.evtin = new ScilabDouble([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)]); @@ -18,7 +18,7 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); - this.exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new AfficheBlock(this.x); @@ -47,10 +47,7 @@ function AFFICH_m() { this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,this.exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { |