summaryrefslogtreecommitdiff
path: root/js/Misc/CBLOCK.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Misc/CBLOCK.js')
-rw-r--r--js/Misc/CBLOCK.js26
1 files changed, 13 insertions, 13 deletions
diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js
index 38cb0da0..d1c5fcf4 100644
--- a/js/Misc/CBLOCK.js
+++ b/js/Misc/CBLOCK.js
@@ -14,19 +14,19 @@ function CBLOCK() {
funam = "toto";
this.ng = 0;
this.model = scicos_model();
- this.model.sim = list(new ScilabString(" "),new ScilabDouble(2004));
- this.model.in1 = new ScilabDouble(in1);
- this.model.out = new ScilabDouble(out);
+ this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004]));
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.out = new ScilabDouble([out]);
this.model.evtin = clkin;
this.model.evtout = clkout;
this.model.state = x0;
this.model.dstate = z0;
this.model.rpar = this.rpar;
this.model.ipar = this.ipar;
- this.model.blocktype = new ScilabString(typ);
+ this.model.blocktype = new ScilabString([typ]);
this.model.firing = auto;
this.model.dep_ut = [true,false];
- this.model.nzcross = new ScilabDouble(this.ng);
+ this.model.nzcross = new ScilabDouble([this.ng]);
label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]);
gr_i = [];
this.x = standard_define([4,2],this.model,label,gr_i);
@@ -134,18 +134,18 @@ function CBLOCK() {
} else {
[model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co);
if (ok) {
- this.model.sim = list(new ScilabDouble(funam),new ScilabDouble(funtyp));
- this.model.in1 = new ScilabDouble(this.i);
- this.model.out = new ScilabDouble(this.o);
- this.model.evtin = new ScilabDouble(this.ci);
- this.model.evtout = new ScilabDouble(this.co);
+ this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp]));
+ this.model.in1 = new ScilabDouble([this.i]);
+ this.model.out = new ScilabDouble([this.o]);
+ this.model.evtin = new ScilabDouble([this.ci]);
+ this.model.evtout = new ScilabDouble([this.co]);
this.model.state = this.xx;
this.model.dstate = this.z;
this.model.rpar = this.rpar;
- this.model.ipar = new ScilabDouble(this.ipar);
- this.model.firing = new ScilabDouble(this.auto0);
+ this.model.ipar = new ScilabDouble([this.ipar]);
+ this.model.firing = new ScilabDouble([this.auto0]);
this.model.dep_ut = dep_ut;
- this.model.nzcross = new ScilabDouble(this.ng);
+ this.model.nzcross = new ScilabDouble([this.ng]);
label[2-1] = tt;
this.x.model = this.model;
graphics.exprs = label;