diff options
author | Sunil Shetye | 2018-06-26 14:59:47 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-06-26 14:59:47 +0530 |
commit | eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00 (patch) | |
tree | 6378935263fe5cafd389b6893ac3b37a1dd4b1a7 /js/Misc/fortran_block.js | |
parent | afed64f1a0eab0b2d742088186d7bc340a2c895b (diff) | |
download | sci2js-eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00.tar.gz sci2js-eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00.tar.bz2 sci2js-eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00.zip |
add return value from scicos_getvalue to global vars
Diffstat (limited to 'js/Misc/fortran_block.js')
-rw-r--r-- | js/Misc/fortran_block.js | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 7cd0df3e..79bfa270 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -14,8 +14,8 @@ function fortran_block() { model.blocktype = "c"; model.firing = []; model.dep_ut = [true,false]; - funam = "forty"; - label = list([[sci2exp(model.in1)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[funam]],list([])); + this.funam = "forty"; + label = list([[sci2exp(model.in1)],[sci2exp(model.out)],[strcat(sci2exp(model.rpar))],[this.funam]],list([])); gr_i = []; this.x = standard_define([4,2],model,label,gr_i); return new BasicBlock(this.x); @@ -31,31 +31,31 @@ function fortran_block() { graphics = arg1.graphics; label = graphics.exprs; while (true) { - [ok,i,o,rpar,funam,lab] = scicos_getvalue("Set fortran_block parameters",[["input ports sizes"],["output port sizes"],["System parameters vector"],["function name"]],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); + [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set fortran_block parameters",[["input ports sizes"],["output port sizes"],["System parameters vector"],["function name"]],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); if (!ok) { break; } - if (funam==" ") { + if (this.funam==" ") { break; } - label[1-1] = lab; - rpar = rpar.slice(); - i = int(i.slice()); - ni = size(i,1); - o = int(o.slice()); - no = size(o,1); + label[1-1] = this.lab; + this.rpar = this.rpar.slice(); + this.i = int(this.i.slice()); + ni = size(this.i,1); + this.o = int(this.o.slice()); + no = size(this.o,1); tt = label[2-1]; - if (model.sim[1-1]!=funam||size(model.in1,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) { + if (model.sim[1-1]!=this.funam||size(model.in1,"*")!=size(this.i,"*")||size(model.out,"*")!=size(this.o,"*")) { tt = []; } - [ok,tt] = FORTR(funam,tt,i,o); + [ok,tt] = FORTR(this.funam,tt,this.i,this.o); if (!ok) { break; } - [model,graphics,ok] = check_io(model,graphics,i,o,[],[]); + [model,graphics,ok] = check_io(model,graphics,this.i,this.o,[],[]); if (ok) { - model.sim[1-1] = funam; - model.rpar = rpar; + model.sim[1-1] = this.funam; + model.rpar = this.rpar; label[2-1] = tt; this.x.model = model; graphics.exprs = label; |