summaryrefslogtreecommitdiff
path: root/js/Linear/INTEGRAL_m.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Linear/INTEGRAL_m.js')
-rw-r--r--js/Linear/INTEGRAL_m.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js
index feda531e..07d5480e 100644
--- a/js/Linear/INTEGRAL_m.js
+++ b/js/Linear/INTEGRAL_m.js
@@ -14,9 +14,9 @@ function INTEGRAL_m() {
this.model.rpar = new ScilabDouble(rpar);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([false,true]);
- var exprs = string([[0],[0],[0],[this.maxp],[minp]]);
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,exprs,gr_i);
+ this.exprs = string([[0],[0],[0],[this.maxp],[minp]]);
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]);
+ this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
INTEGRAL_m.prototype.details = function INTEGRAL_m() {
@@ -38,12 +38,13 @@ function INTEGRAL_m() {
this.satur = parseFloat(arguments[0]["satur"])
this.maxp = parseFloat(arguments[0]["maxp"])
this.lowp = parseFloat(arguments[0]["lowp"])
+ 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.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs);
+ [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),this.exprs);
if (!ok) {
break;
}
@@ -131,7 +132,7 @@ function INTEGRAL_m() {
}
}
if (ok) {
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;