diff options
Diffstat (limited to 'js/Branching/SWITCH_f.js')
-rw-r--r-- | js/Branching/SWITCH_f.js | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 47b4f087..3e3a58c5 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -4,17 +4,17 @@ function SWITCH_f() { i0 = 0; in1 = [[-1],[-1]]; this.nin = 2; - model = scicos_model(); - model.sim = list("switchn",2); - model.in1 = in1; - model.out = -1; - model.ipar = i0; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,true]; + this.model = scicos_model(); + this.model.sim = list("switchn",2); + this.model.in1 = in1; + this.model.out = new ScilabDouble(-1); + this.model.ipar = new ScilabDouble(i0); + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,true]; exprs = [[string(this.nin)],[string(i0+1)]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -33,8 +33,8 @@ function SWITCH_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; - ipar = model.ipar; + this.model = arg1.model; + ipar = this.model.ipar; while (true) { [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),exprs); if (!ok) { @@ -43,12 +43,12 @@ function SWITCH_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(model,graphics,-ones(this.nin,1),-1,[],[]); + [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); if (ok) { graphics.exprs = exprs; - model.ipar = this.z0-1; + this.model.ipar = new ScilabString(this.z0-1); this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } |