summaryrefslogtreecommitdiff
path: root/js/Sinks
diff options
context:
space:
mode:
Diffstat (limited to 'js/Sinks')
-rw-r--r--js/Sinks/AFFICH_m.js14
-rw-r--r--js/Sinks/BARXY.js8
-rw-r--r--js/Sinks/CANIMXY.js6
-rw-r--r--js/Sinks/CANIMXY3D.js6
-rw-r--r--js/Sinks/CEVENTSCOPE.js10
-rw-r--r--js/Sinks/CFSCOPE.js6
-rw-r--r--js/Sinks/CLKOUTV_f.js12
-rw-r--r--js/Sinks/CLKOUT_f.js12
-rw-r--r--js/Sinks/CMAT3D.js12
-rw-r--r--js/Sinks/CMATVIEW.js12
-rw-r--r--js/Sinks/CMSCOPE.js10
-rw-r--r--js/Sinks/CSCOPE.js14
-rw-r--r--js/Sinks/CSCOPXY.js6
-rw-r--r--js/Sinks/CSCOPXY3D.js6
-rw-r--r--js/Sinks/OUTIMPL_f.js8
-rw-r--r--js/Sinks/OUT_f.js14
-rw-r--r--js/Sinks/TOWS_c.js12
-rw-r--r--js/Sinks/TRASH_f.js8
-rw-r--r--js/Sinks/WFILE_f.js10
-rw-r--r--js/Sinks/WRITEAU_f.js10
-rw-r--r--js/Sinks/WRITEC_f.js10
21 files changed, 103 insertions, 103 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 14957e35..67033419 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -8,16 +8,16 @@ function AFFICH_m() {
this.nd = 1;
this.in1 = [1,1];
this.model = scicos_model();
- this.model.sim = list(new ScilabString("affich2"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(this.in1[1-1][1-1]);
- this.model.in2 = new ScilabDouble(this.in1[1-1][2-1]);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["affich2"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([this.in1[1-1][1-1]]);
+ this.model.in2 = new ScilabDouble([this.in1[1-1][2-1]]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.dstate = [[-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]];
this.model.ipar = [[this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in1[1-1][1-1]]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
- this.model.label = new ScilabString("");
+ this.model.label = new ScilabString([""]);
exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]];
gr_i = [];
this.x = standard_define([3,2],this.model,exprs,gr_i);
@@ -88,7 +88,7 @@ function AFFICH_m() {
if (ok) {
this.model.ipar = [[this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]];
this.model.dstate = [[-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]];
- this.model.evtin = new ScilabDouble(ones(1-this.herit,1));
+ this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js
index 09aa6382..535e8f75 100644
--- a/js/Sinks/BARXY.js
+++ b/js/Sinks/BARXY.js
@@ -6,15 +6,15 @@ function BARXY() {
this.xmax = 15;
this.ymin = -15;
this.ymax = 15;
- this.model.sim = list(new ScilabString("BARXY_sim"),new ScilabDouble(5));
- this.model.blocktype = new ScilabString("d");
+ this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5]));
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [true,false];
this.model.in1 = [[-1],[-1]];
this.model.intyp = [1];
this.model.out = [];
this.model.evtin = [1];
this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
this.x = standard_define([2,2],this.model,[],[]);
this.x.graphics.in_implicit = ["E","E"];
this.x.graphics.out_implicit = [];
@@ -66,7 +66,7 @@ function BARXY() {
message(mess);
} else {
this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
- this.model.ipar = new ScilabDouble(this.thickness);
+ this.model.ipar = new ScilabDouble([this.thickness]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index ab1397e4..758842f7 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -13,14 +13,14 @@ function CANIMXY() {
this.ymax = 15;
this.nbr_curves = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("canimxy"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["canimxy"]), new ScilabDouble([4]));
this.model.in1 = [[1],[1]];
this.model.in2 = [[1],[1]];
this.model.intyp = [[1],[1]];
- this.model.evtin = new ScilabDouble(1);
+ this.model.evtin = new ScilabDouble([1]);
this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
this.model.ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [false,false];
exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]];
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index bb181733..b110986b 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -13,14 +13,14 @@ function CANIMXY3D() {
this.vec_z = [[-15],[15]];
this.nbr_curves = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("canimxy3d"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["canimxy3d"]), new ScilabDouble([4]));
this.model.in1 = [[1],[1],[1]];
- this.model.evtin = new ScilabDouble(1);
+ this.model.evtin = new ScilabDouble([1]);
this.model.in2 = [[1],[1],[1]];
this.model.intyp = [[1],[1],[1]];
this.model.rpar = [[this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]];
this.model.ipar = [[this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [false,false];
exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]];
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index 3a9a058f..1f612e6a 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -8,11 +8,11 @@ function CEVENTSCOPE() {
this.wpos = [[-1],[-1]];
this.per = 30;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cevscpe"),new ScilabDouble(4));
- this.model.evtin = new ScilabDouble(1);
- this.model.rpar = new ScilabDouble(this.per);
+ this.model.sim = list(new ScilabString(["cevscpe"]), new ScilabDouble([4]));
+ this.model.evtin = new ScilabDouble([1]);
+ this.model.rpar = new ScilabDouble([this.per]);
this.model.ipar = [[this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]];
gr_i = [];
@@ -91,7 +91,7 @@ function CEVENTSCOPE() {
}
rpar = this.per;
ipar = [[this.win],[1],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.slice()]];
- this.model.rpar = new ScilabDouble(rpar);
+ this.model.rpar = new ScilabDouble([rpar]);
this.model.ipar = ipar;
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js
index 8fad283d..be63e978 100644
--- a/js/Sinks/CFSCOPE.js
+++ b/js/Sinks/CFSCOPE.js
@@ -10,11 +10,11 @@ function CFSCOPE() {
this.ymax = 15;
this.per = 30;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cfscope"),new ScilabDouble(4));
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["cfscope"]), new ScilabDouble([4]));
+ this.model.evtin = new ScilabDouble([1]);
this.model.rpar = [[0],[this.ymin],[this.ymax],[this.per]];
this.model.ipar = [[this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]];
gr_i = [];
diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js
index 473968a7..c55bed30 100644
--- a/js/Sinks/CLKOUTV_f.js
+++ b/js/Sinks/CLKOUTV_f.js
@@ -3,10 +3,10 @@ function CLKOUTV_f() {
CLKOUTV_f.prototype.define = function CLKOUTV_f() {
this.prt = 1;
this.model = scicos_model();
- this.model.sim = new ScilabString("output");
- this.model.evtin = new ScilabDouble(1);
- this.model.ipar = new ScilabDouble(this.prt);
- this.model.blocktype = new ScilabString("d");
+ this.model.sim = new ScilabString(["output"]);
+ this.model.evtin = new ScilabDouble([1]);
+ this.model.ipar = new ScilabDouble([this.prt]);
+ this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [false,false];
exprs = string(this.prt);
@@ -36,8 +36,8 @@ function CLKOUTV_f() {
if (this.prt<=0) {
block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected.");
} else {
- this.model.ipar = new ScilabDouble(this.prt);
- this.model.evtin = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([this.prt]);
+ this.model.evtin = new ScilabDouble([1]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js
index 023c3d86..3cd1bbd8 100644
--- a/js/Sinks/CLKOUT_f.js
+++ b/js/Sinks/CLKOUT_f.js
@@ -3,10 +3,10 @@ function CLKOUT_f() {
CLKOUT_f.prototype.define = function CLKOUT_f() {
this.prt = 1;
this.model = scicos_model();
- this.model.sim = new ScilabString("output");
- this.model.evtin = new ScilabDouble(1);
- this.model.ipar = new ScilabDouble(this.prt);
- this.model.blocktype = new ScilabString("d");
+ this.model.sim = new ScilabString(["output"]);
+ this.model.evtin = new ScilabDouble([1]);
+ this.model.ipar = new ScilabDouble([this.prt]);
+ this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [false,false];
exprs = string(this.prt);
@@ -37,8 +37,8 @@ function CLKOUT_f() {
if (this.prt<=0) {
message("Port number must be a positive integer");
} else {
- this.model.ipar = new ScilabDouble(this.prt);
- this.model.evtin = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([this.prt]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.firing = [];
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 010fa534..a7f23444 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -10,14 +10,14 @@ function CMAT3D() {
size_x = 1;
size_y = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cmat3d"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["cmat3d"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.ipar = [[this.cmin],[this.cmax],[size_c],[size_x],[size_y]];
this.model.rpar = [[this.colormap.slice()],[this.x],[y]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]];
gr_i = [];
diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js
index 03232d25..594a6622 100644
--- a/js/Sinks/CMATVIEW.js
+++ b/js/Sinks/CMATVIEW.js
@@ -8,14 +8,14 @@ function CMATVIEW() {
alpha_c = 0.24;
beta_c = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cmatview"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["cmatview"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.ipar = [[this.cmin],[this.cmax],[size_c]];
this.model.rpar = [[alpha_c],[beta_c],[this.colormap.slice()]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]];
gr_i = [];
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index a16eb019..9d0db26d 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -13,14 +13,14 @@ function CMSCOPE() {
yy = [[transpose(this.ymin.slice())],[transpose(this.ymax.slice())]];
period = transpose(this.per.slice());
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cmscope"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4]));
this.model.in1 = this.in1;
this.model.in2 = [[1],[1]];
this.model.intyp = [[1],[1]];
- this.model.evtin = new ScilabDouble(1);
+ this.model.evtin = new ScilabDouble([1]);
this.model.rpar = [[0],[period.slice()],[yy.slice()]];
this.model.ipar = [[this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]];
gr_i = [];
@@ -136,11 +136,11 @@ function CMSCOPE() {
rpar = [[0],[period.slice()],[yy.slice()]];
this.clrs = this.clrs.slice(1-1,sum(this.in1));
ipar = [[this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice()],[this.heritance]];
- this.model.evtin = new ScilabDouble(ones(1-this.heritance,1));
+ this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]);
this.model.dstate = [];
this.model.rpar = rpar;
this.model.ipar = ipar;
- this.model.label = new ScilabDouble(this.nom);
+ this.model.label = new ScilabDouble([this.nom]);
graphics.id = this.nom;
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 9e636ba6..3c69cbed 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -10,13 +10,13 @@ function CSCOPE() {
this.ymax = 15;
this.per = 30;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cscope"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["cscope"]), new ScilabDouble([4]));
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.rpar = [[0],[this.ymin],[this.ymax],[this.per]];
this.model.ipar = [[this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]];
gr_i = [];
@@ -107,8 +107,8 @@ function CSCOPE() {
ipar = [[this.win],[1],[this.N],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.slice()]];
this.model.rpar = rpar;
this.model.ipar = ipar;
- this.model.evtin = new ScilabDouble(ones(1-this.heritance,1));
- this.model.label = new ScilabDouble(this.nom);
+ this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]);
+ this.model.label = new ScilabDouble([this.nom]);
graphics.id = this.nom;
graphics.exprs = exprs;
this.x.graphics = graphics;
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index c9f2b9e6..a5c63ce1 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -13,14 +13,14 @@ function CSCOPXY() {
this.ymax = 15;
this.nbr_curves = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cscopxy"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["cscopxy"]), new ScilabDouble([4]));
this.model.in1 = [[1],[1]];
this.model.in2 = [[1],[1]];
this.model.intyp = [[1],[1]];
- this.model.evtin = new ScilabDouble(1);
+ this.model.evtin = new ScilabDouble([1]);
this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
this.model.ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]];
gr_i = [];
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 1b1b7996..80210a6a 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -13,14 +13,14 @@ function CSCOPXY3D() {
this.vec_z = [[-15],[15]];
this.nbr_curves = 1;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("cscopxy3d"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["cscopxy3d"]), new ScilabDouble([4]));
this.model.in1 = [[1],[1],[1]];
this.model.in2 = [[1],[1],[1]];
this.model.intyp = [[1],[1],[1]];
- this.model.evtin = new ScilabDouble(1);
+ this.model.evtin = new ScilabDouble([1]);
this.model.rpar = [[this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]];
this.model.ipar = [[this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]];
gr_i = [];
diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js
index b0e9595d..68bb28fa 100644
--- a/js/Sinks/OUTIMPL_f.js
+++ b/js/Sinks/OUTIMPL_f.js
@@ -5,14 +5,14 @@ function OUTIMPL_f() {
this.model.in1 = [-1];
this.model.in2 = [1];
this.prt = 1;
- this.model.sim = new ScilabString("outimpl");
+ this.model.sim = new ScilabString(["outimpl"]);
this.model.ipar = [1];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,false];
mo = modelica();
mo.model = "PORT";
mo.inputs = "n";
- this.model.equations = new ScilabDouble(mo);
+ this.model.equations = new ScilabDouble([mo]);
exprs = "1";
gr_i = [];
this.x = standard_define([1,1],this.model,exprs,gr_i);
@@ -49,7 +49,7 @@ function OUTIMPL_f() {
needcompile = 4;
y = needcompile;
}
- this.model.ipar = new ScilabDouble(this.prt);
+ this.model.ipar = new ScilabDouble([this.prt]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js
index 624915bf..eff38eaa 100644
--- a/js/Sinks/OUT_f.js
+++ b/js/Sinks/OUT_f.js
@@ -4,12 +4,12 @@ function OUT_f() {
n = -1;
this.prt = 1;
this.model = scicos_model();
- this.model.sim = new ScilabString("output");
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(-1);
- this.model.ipar = new ScilabDouble(this.prt);
- this.model.blocktype = new ScilabString("c");
+ this.model.sim = new ScilabString(["output"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([-1]);
+ this.model.ipar = new ScilabDouble([this.prt]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,false];
exprs = string(this.prt);
gr_i = [];
@@ -42,7 +42,7 @@ function OUT_f() {
if (this.prt<=0) {
block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected.");
} else {
- this.model.ipar = new ScilabDouble(this.prt);
+ this.model.ipar = new ScilabDouble([this.prt]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 5b84ca01..64909f1f 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -6,16 +6,16 @@ function TOWS_c() {
this.varnam = "A";
this.herit = 0;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("tows_c"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["tows_c"]), new ScilabDouble([4]));
this.model.in1 = [nu];
- this.model.in2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(-1);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([-1]);
this.model.out = [];
this.model.evtin = [1];
this.model.evtout = [];
this.model.rpar = [];
this.model.ipar = [[this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [false,false];
gr_i = [];
@@ -61,9 +61,9 @@ function TOWS_c() {
if (ok) {
[model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]);
if (this.herit==1) {
- this.model.blocktype = new ScilabString("x");
+ this.model.blocktype = new ScilabString(["x"]);
} else {
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
}
this.model.ipar = [[this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]];
graphics.exprs = exprs;
diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js
index 3d8a402a..4c9eca2b 100644
--- a/js/Sinks/TRASH_f.js
+++ b/js/Sinks/TRASH_f.js
@@ -3,10 +3,10 @@ function TRASH_f() {
TRASH_f.prototype.define = function TRASH_f() {
in1 = -1;
this.model = scicos_model();
- this.model.sim = new ScilabString("trash");
- this.model.in1 = new ScilabDouble(in1);
- this.model.evtin = new ScilabDouble(1);
- this.model.blocktype = new ScilabString("d");
+ this.model.sim = new ScilabString(["trash"]);
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.evtin = new ScilabDouble([1]);
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
exprs = " ";
gr_i = [];
diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js
index c09b1f9c..85226831 100644
--- a/js/Sinks/WFILE_f.js
+++ b/js/Sinks/WFILE_f.js
@@ -8,12 +8,12 @@ function WFILE_f() {
lunit = 0;
this.N = 2;
this.model = scicos_model();
- this.model.sim = new ScilabString("writef");
- this.model.in1 = new ScilabDouble(this.in1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = new ScilabString(["writef"]);
+ this.model.in1 = new ScilabDouble([this.in1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]];
this.model.ipar = [[length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]];
gr_i = [];
@@ -89,7 +89,7 @@ function WFILE_f() {
if (prod(size(dstate))!=(nin+1)*this.N+2) {
dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]];
}
- this.model.in1 = new ScilabDouble(nin);
+ this.model.in1 = new ScilabDouble([nin]);
this.model.dstate = dstate;
this.model.ipar = ipar;
this.model.dep_ut = [true,false];
diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js
index 0287ad13..a6c65b77 100644
--- a/js/Sinks/WRITEAU_f.js
+++ b/js/Sinks/WRITEAU_f.js
@@ -9,12 +9,12 @@ function WRITEAU_f() {
lunit = 0;
this.N = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("writeau"),new ScilabDouble(2));
- this.model.in1 = new ScilabDouble(in1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["writeau"]), new ScilabDouble([2]));
+ this.model.in1 = new ScilabDouble([in1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]];
this.model.ipar = [[length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [true,false];
exprs = [string(this.N),string(this.swap)];
gr_i = [];
@@ -65,7 +65,7 @@ function WRITEAU_f() {
if (prod(size(dstate))!=(nin+1)*this.N+2) {
dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]];
}
- this.model.in1 = new ScilabDouble(1);
+ this.model.in1 = new ScilabDouble([1]);
this.model.dstate = dstate;
this.model.ipar = ipar;
graphics.exprs = exprs;
diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js
index 0cea309b..72777742 100644
--- a/js/Sinks/WRITEC_f.js
+++ b/js/Sinks/WRITEC_f.js
@@ -9,12 +9,12 @@ function WRITEC_f() {
lunit = 0;
this.N = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("writec"),new ScilabDouble(2));
- this.model.in1 = new ScilabDouble(this.in1);
- this.model.evtin = new ScilabDouble(1);
+ this.model.sim = list(new ScilabString(["writec"]), new ScilabDouble([2]));
+ this.model.in1 = new ScilabDouble([this.in1]);
+ this.model.evtin = new ScilabDouble([1]);
this.model.dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]];
this.model.ipar = [[length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]];
- this.model.blocktype = new ScilabString("d");
+ this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]];
gr_i = [];
@@ -92,7 +92,7 @@ function WRITEC_f() {
if (prod(size(dstate))!=(nin+1)*this.N+2) {
dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]];
}
- this.model.in1 = new ScilabDouble(nin);
+ this.model.in1 = new ScilabDouble([nin]);
this.model.dstate = dstate;
this.model.ipar = ipar;
graphics.exprs = exprs;