summaryrefslogtreecommitdiff
path: root/js/Linear/CLR.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Linear/CLR.js')
-rw-r--r--js/Linear/CLR.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js
index d48d4a76..0ae65202 100644
--- a/js/Linear/CLR.js
+++ b/js/Linear/CLR.js
@@ -6,7 +6,7 @@ function CLR() {
var B = 1;
var C = 1;
var D = 0;
- var exprs = [["1"],["1+s"]];
+ this.exprs = [["1"],["1+s"]];
this.model = scicos_model();
this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4]));
this.model.in1 = new ScilabDouble([1]);
@@ -15,8 +15,8 @@ function CLR() {
this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([false,true]);
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]);
- this.x = standard_define([3,2],this.model,exprs,gr_i);
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]);
+ this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
CLR.prototype.details = function CLR() {
@@ -32,9 +32,10 @@ function CLR() {
CLR.prototype.set = function CLR() {
this.num = arguments[0]["num"]
this.den = arguments[0]["den"]
+ 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;
var x0 = this.model.state;
var rpar = this.model.rpar;
@@ -44,7 +45,7 @@ function CLR() {
var PREVAR_scicos_context = PREVAR_scicos_context;
PREVAR_scicos_context.s = %s;
while (true) {
- [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs);
+ [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs);
if (!ok) {
break;
}
@@ -59,7 +60,7 @@ function CLR() {
var B = tmpvar0[1];
var C = tmpvar0[2];
var D = tmpvar0[3];
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
var tmpvar1 = size(A);
var ns1 = tmpvar1[0];
var ns1 = tmpvar1[1];