diff options
Diffstat (limited to 'js/Hydraulics/Flowmeter.js')
| -rw-r--r-- | js/Hydraulics/Flowmeter.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 8d7a5bbc..6221b688 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -36,15 +36,15 @@ function Flowmeter() { mo.outputs = MO; this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); + this.exprs = "1"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -59,19 +59,20 @@ function Flowmeter() { } Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] + 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; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (false) { - [ok,this.Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs); + [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.Qini); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); |