diff options
Diffstat (limited to 'js/Sources/RAMP.js')
| -rw-r--r-- | js/Sources/RAMP.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index d0d6e161..3ac0a879 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -14,9 +14,9 @@ function RAMP() { this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = [string(rpar)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string(rpar)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { @@ -34,12 +34,13 @@ function RAMP() { this.slope = parseFloat(arguments[0]["slope"]) this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.slope,this.stt,this.iout,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function RAMP() { block_parameter_error(msprintf("Wrong value for \'Start Time\' parameter: %e.",this.stt),"Null or positive integer expected."); } else { this.model.rpar = new ScilabDouble([this.slope],[this.stt],[this.iout]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; |