summaryrefslogtreecommitdiff
path: root/js/Electrical/Capacitor.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Electrical/Capacitor.js')
-rw-r--r--js/Electrical/Capacitor.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js
index 8b9601f7..d11d389c 100644
--- a/js/Electrical/Capacitor.js
+++ b/js/Electrical/Capacitor.js
@@ -16,9 +16,9 @@ function Capacitor() {
this.model.equations = new ScilabDouble([mo]);
this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]);
this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]);
- var exprs = string([[this.C],[this.v]]);
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]);
- this.x = standard_define([2,1.1],this.model,exprs,list(gr_i,0));
+ this.exprs = string([[this.C],[this.v]]);
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]);
+ this.x = standard_define([2,1.1],this.model,this.exprs,list(this.gr_i,0));
this.x.graphics.in_implicit = ["I"];
this.x.graphics.out_implicit = ["I"];
return new BasicBlock(this.x);
@@ -36,18 +36,19 @@ function Capacitor() {
Capacitor.prototype.set = function Capacitor() {
this.C = parseFloat(arguments[0]["C"])
this.v = parseFloat(arguments[0]["v"])
+ 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.C,this.v,exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs);
+ [ok,this.C,this.v,this.exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),this.exprs);
if (!ok) {
break;
}
this.model.rpar = new ScilabDouble([this.C]);
this.model.equations.parameters[2-1] = list(new ScilabDouble([this.C]), new ScilabDouble([this.v]));
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;