From aabd535925f24c6203eb1a0dcc5b28d9670133de Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 11 Jul 2018 10:44:34 +0530 Subject: show type for matrix also --- js/Sinks/AFFICH_m.js | 8 ++++---- js/Sinks/BARXY.js | 4 ++-- js/Sinks/CANIMXY.js | 12 ++++++------ js/Sinks/CANIMXY3D.js | 12 ++++++------ js/Sinks/CEVENTSCOPE.js | 4 ++-- js/Sinks/CFSCOPE.js | 8 ++++---- js/Sinks/CMAT3D.js | 8 ++++---- js/Sinks/CMATVIEW.js | 8 ++++---- js/Sinks/CMSCOPE.js | 12 ++++++------ js/Sinks/CSCOPE.js | 8 ++++---- js/Sinks/CSCOPXY.js | 12 ++++++------ js/Sinks/CSCOPXY3D.js | 12 ++++++------ js/Sinks/TOWS_c.js | 4 ++-- js/Sinks/WFILE_f.js | 8 ++++---- js/Sinks/WRITEAU_f.js | 8 ++++---- js/Sinks/WRITEC_f.js | 8 ++++---- 16 files changed, 68 insertions(+), 68 deletions(-) (limited to 'js/Sinks') diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index d2aea4e3..35e05e03 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -12,8 +12,8 @@ function AFFICH_m() { 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.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); + this.model.ipar = new ScilabDouble([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.firing = []; this.model.dep_ut = [true,false]; @@ -86,8 +86,8 @@ function AFFICH_m() { [this.model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); } 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.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]); + this.model.dstate = new ScilabDouble([-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)]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 535e8f75..e0a39a05 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -13,7 +13,7 @@ function BARXY() { this.model.intyp = [1]; this.model.out = []; this.model.evtin = [1]; - this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; + this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([1]); this.x = standard_define([2,2],this.model,[],[]); this.x.graphics.in_implicit = ["E","E"]; @@ -65,7 +65,7 @@ function BARXY() { if (!ok) { message(mess); } else { - this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; + this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.thickness]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 75344310..63ca8fce 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -15,11 +15,11 @@ function CANIMXY() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1]); + this.model.intyp = new ScilabDouble([1],[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.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); + this.model.ipar = new ScilabDouble([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.firing = []; this.model.dep_ut = [false,false]; @@ -115,8 +115,8 @@ function CANIMXY() { } rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index ad6e0d19..24221ece 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -16,10 +16,10 @@ function CANIMXY3D() { this.model.sim = list(new ScilabString(["canimxy3d"]), new ScilabDouble([4])); this.model.in1 = [[1],[1],[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.in2 = new ScilabDouble([1],[1],[1]); + this.model.intyp = new ScilabDouble([1],[1],[1]); + this.model.rpar = new ScilabDouble([this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]); + this.model.ipar = new ScilabDouble([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.firing = []; this.model.dep_ut = [false,false]; @@ -132,8 +132,8 @@ function CANIMXY3D() { rpar = [[this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]]; size_siz = size(this.siz,"*"); ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 55a8493d..d58baea6 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -11,7 +11,7 @@ function CEVENTSCOPE() { 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.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); 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)]]; @@ -92,7 +92,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.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index be63e978..35cba386 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -12,8 +12,8 @@ function CFSCOPE() { this.model = scicos_model(); 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.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); + this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); 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])]]; @@ -104,8 +104,8 @@ function CFSCOPE() { this.clrs[8-1] = 0; } ipar = [[this.win],[1],[this.N],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.slice()],[size(this.wu,"*")],[this.wu.slice()]]; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); this.model.firing = []; this.model.dep_ut = [true,false]; graphics.exprs = exprs; diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index a7f23444..b8675a0b 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -15,8 +15,8 @@ function CMAT3D() { 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.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c],[size_x],[size_y]); + this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); 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)]]; @@ -69,8 +69,8 @@ function CMAT3D() { size_c = size(this.colormap.slice(),1); ipar = [[this.cmin],[this.cmax],[size_c],[size_x]]; rpar = [[this.colormap.slice()],[this.vec_x.slice()],[this.vec_y.slice()]]; - this.model.ipar = ipar; - this.model.rpar = rpar; + this.model.ipar = new ScilabDouble(ipar); + this.model.rpar = new ScilabDouble(rpar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 594a6622..d9c415f5 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -13,8 +13,8 @@ function CMATVIEW() { 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.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c]); + this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; @@ -61,8 +61,8 @@ function CMATVIEW() { beta_c = sol[2-1]; ipar = [[this.cmin],[this.cmax],[size_c]]; rpar = [[alpha_c],[beta_c],[this.colormap.slice()]]; - this.model.ipar = ipar; - this.model.rpar = rpar; + this.model.ipar = new ScilabDouble(ipar); + this.model.rpar = new ScilabDouble(rpar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index be339e2c..e5bf0287 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -15,11 +15,11 @@ function CMSCOPE() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1]); + this.model.intyp = new ScilabDouble([1],[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.rpar = new ScilabDouble([0],[period.slice()],[yy.slice()]); + this.model.ipar = new ScilabDouble([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.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()]]; @@ -138,8 +138,8 @@ function CMSCOPE() { 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.dstate = []; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); this.model.label = new ScilabDouble([this.nom]); graphics.id = this.nom; graphics.exprs = exprs; diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 97579a07..9c19b26b 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -14,8 +14,8 @@ function CSCOPE() { 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.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); + this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); 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()]]; @@ -105,8 +105,8 @@ function CSCOPE() { } rpar = [[0],[this.ymin],[this.ymax],[this.per]]; 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.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.label = new ScilabDouble([this.nom]); graphics.id = this.nom; diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 9364bf98..289f425e 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -15,11 +15,11 @@ function CSCOPXY() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1]); + this.model.intyp = new ScilabDouble([1],[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.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); + this.model.ipar = new ScilabDouble([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.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)]]; @@ -114,8 +114,8 @@ function CSCOPXY() { } rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 7d0c7383..d20d2b32 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -15,11 +15,11 @@ function CSCOPXY3D() { this.model = scicos_model(); 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.in2 = new ScilabDouble([1],[1],[1]); + this.model.intyp = new ScilabDouble([1],[1],[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.rpar = new ScilabDouble([this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]); + this.model.ipar = new ScilabDouble([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.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)]]; @@ -125,8 +125,8 @@ function CSCOPXY3D() { rpar = [[this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]]; size_siz = size(this.siz,"*"); ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); 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 7adc6837..c2f0d93d 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -14,7 +14,7 @@ function TOWS_c() { 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.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = []; this.model.dep_ut = [false,false]; @@ -65,7 +65,7 @@ function TOWS_c() { } else { this.model.blocktype = new ScilabString(["d"]); } - this.model.ipar = [[this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]]; + this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 85226831..e8d9f730 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -11,8 +11,8 @@ function WFILE_f() { 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.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); + this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = [true,false]; exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; @@ -90,8 +90,8 @@ function WFILE_f() { dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } this.model.in1 = new ScilabDouble([nin]); - this.model.dstate = dstate; - this.model.ipar = ipar; + this.model.dstate = new ScilabDouble(dstate); + this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = [true,false]; graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index a6c65b77..917f3dca 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -12,8 +12,8 @@ function WRITEAU_f() { 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.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); + this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = [true,false]; exprs = [string(this.N),string(this.swap)]; @@ -66,8 +66,8 @@ function WRITEAU_f() { dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } this.model.in1 = new ScilabDouble([1]); - this.model.dstate = dstate; - this.model.ipar = ipar; + this.model.dstate = new ScilabDouble(dstate); + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 72777742..7b1967e9 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -12,8 +12,8 @@ function WRITEC_f() { 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.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); + this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = [true,false]; exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; @@ -93,8 +93,8 @@ function WRITEC_f() { dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } this.model.in1 = new ScilabDouble([nin]); - this.model.dstate = dstate; - this.model.ipar = ipar; + this.model.dstate = new ScilabDouble(dstate); + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; -- cgit