summaryrefslogtreecommitdiff
path: root/js/Misc/c_block.js
diff options
context:
space:
mode:
authorSunil Shetye2018-06-26 14:59:47 +0530
committerSunil Shetye2018-06-26 14:59:47 +0530
commiteb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00 (patch)
tree6378935263fe5cafd389b6893ac3b37a1dd4b1a7 /js/Misc/c_block.js
parentafed64f1a0eab0b2d742088186d7bc340a2c895b (diff)
downloadsci2js-eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00.tar.gz
sci2js-eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00.tar.bz2
sci2js-eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00.zip
add return value from scicos_getvalue to global vars
Diffstat (limited to 'js/Misc/c_block.js')
-rw-r--r--js/Misc/c_block.js34
1 files changed, 17 insertions, 17 deletions
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index 77e2cb6d..ffd42ee6 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -9,8 +9,8 @@ function c_block() {
z0 = [];
typ = "c";
auto = [];
- rpar = [];
- funam = "toto";
+ this.rpar = [];
+ this.funam = "toto";
model = scicos_model();
model.sim = list(" ",2001);
model.in1 = in1;
@@ -19,12 +19,12 @@ function c_block() {
model.evtout = clkout;
model.state = x0;
model.dstate = z0;
- model.rpar = rpar;
+ model.rpar = this.rpar;
model.ipar = 0;
model.blocktype = typ;
model.firing = auto;
model.dep_ut = [true,false];
- label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(rpar))],[funam]],list([]));
+ label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([]));
gr_i = [];
this.x = standard_define([3,2],model,label,gr_i);
return new BasicBlock(this.x);
@@ -40,31 +40,31 @@ function c_block() {
graphics = arg1.graphics;
label = graphics.exprs;
while (true) {
- [ok,i,o,rpar,funam,lab] = scicos_getvalue("Set C_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 C_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] = CFORTR(funam,tt,i,o);
+ [ok,tt] = CFORTR(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;