summaryrefslogtreecommitdiff
path: root/js/Misc/CONSTRAINT2_c.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Misc/CONSTRAINT2_c.js')
-rw-r--r--js/Misc/CONSTRAINT2_c.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index 8e4b09e8..71667091 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -12,9 +12,9 @@ function CONSTRAINT2_c() {
this.model.ipar = new ScilabDouble(this.id);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([false,true]);
- var exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id)));
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]);
- this.x = standard_define([3,2],this.model,exprs,gr_i);
+ this.exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id)));
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]);
+ this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() {
@@ -32,13 +32,14 @@ function CONSTRAINT2_c() {
this.x0 = inverse(arguments[0]["x0"])
this.xd0 = inverse(arguments[0]["xd0"])
this.id = inverse(arguments[0]["id"])
+ 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) {
var ask_again = false;
- [ok,this.x0,this.xd0,this.id,exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs);
+ [ok,this.x0,this.xd0,this.id,this.exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),this.exprs);
if (!ok) {
break;
}
@@ -69,7 +70,7 @@ function CONSTRAINT2_c() {
}
}
if (!ask_again) {
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.model.state = new ScilabDouble([this.x0],[this.xd0]);
this.model.out = new ScilabDouble([N],[N]);
this.model.in1 = new ScilabDouble([N]);