diff options
author | Sunil Shetye | 2018-09-18 17:38:01 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-10-08 11:24:12 +0530 |
commit | f6d537573102a160601aa5c070f63455204d5f9d (patch) | |
tree | 7d61bbc8303725a3f9b0ab4e9662ab1ce962565d /js/Sinks | |
parent | f389f174481df676c841ebcc87a7b8b313921bbc (diff) | |
download | sci2js-master.tar.gz sci2js-master.tar.bz2 sci2js-master.zip |
Diffstat (limited to 'js/Sinks')
-rw-r--r-- | js/Sinks/AFFICH_m.js | 24 | ||||
-rw-r--r-- | js/Sinks/AFFICH_m.pickle | 44 | ||||
-rw-r--r-- | js/Sinks/CMSCOPE.js | 34 | ||||
-rw-r--r-- | js/Sinks/CMSCOPE.pickle | 33 | ||||
-rw-r--r-- | js/Sinks/WFILE_f.js | 24 | ||||
-rw-r--r-- | js/Sinks/WFILE_f.pickle | 31 | ||||
-rw-r--r-- | js/Sinks/WRITEC_f.js | 24 | ||||
-rw-r--r-- | js/Sinks/WRITEC_f.pickle | 51 |
8 files changed, 131 insertions, 134 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 5daa5b0f..e0c9e793 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -6,14 +6,14 @@ function AFFICH_m() { this.colr = 1; this.nt = 5; this.nd = 1; - this.in1 = [1,1]; + this.in = [1,1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["affich2"]), new ScilabDouble([4])); - this.model.in = new ScilabDouble([this.in1[1-1][1-1]]); - this.model.in2 = new ScilabDouble([this.in1[1-1][2-1]]); + this.model.in = new ScilabDouble([this.in[1-1][1-1]]); + this.model.in2 = new ScilabDouble([this.in[1-1][2-1]]); this.model.evtin = new ScilabDouble([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.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in[1-1][1-1]*this.in[1-1][2-1],1)]); + this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in[1-1][1-1]]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); @@ -30,7 +30,7 @@ function AFFICH_m() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set parameters"; var options = { - in1:["Input Size",this.in1], + in:["Input Size",this.in], font:["Font number",this.font], fontsize:["Font size",this.fontsize], colr:["Color",this.colr], @@ -44,14 +44,14 @@ function AFFICH_m() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = inverse(arguments[0]["in1"]); + this.in = inverse(arguments[0]["in"]); this.font = parseFloat(arguments[0]["font"]); this.fontsize = parseFloat(arguments[0]["fontsize"]); this.colr = parseFloat(arguments[0]["colr"]); this.nt = parseFloat(arguments[0]["nt"]); this.nd = parseFloat(arguments[0]["nd"]); this.herit = arguments[0]["herit"]; - var exprs = [arguments[0]["in1"], arguments[0]["font"], arguments[0]["fontsize"], arguments[0]["colr"], arguments[0]["nt"], arguments[0]["nd"], arguments[0]["herit"]]; + var exprs = [arguments[0]["in"], arguments[0]["font"], arguments[0]["fontsize"], arguments[0]["colr"], arguments[0]["nt"], arguments[0]["nd"], arguments[0]["herit"]]; if (!ok) { break; } @@ -85,14 +85,14 @@ function AFFICH_m() { throw "user error"; } if (ok) { - var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); + var tmpvar0 = set_io(this.model,this.graphics,list(this.in,1),list(),ones(1-this.herit,1),[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - 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.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in[1-1][1-1]]); + this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in[1-1][1-1]*this.in[1-1][2-1],1)]); this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]); this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; @@ -108,7 +108,7 @@ function AFFICH_m() { AFFICH_m.prototype.importset = function AFFICH_m() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.font = ary[1]; this.fontsize = ary[2]; this.colr = ary[3]; diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index b4ebd3aa..53b7cd38 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -39,42 +39,42 @@ S'double' p6 sS'x.model' p7 -NsS'font' +NsS'in' p8 +S'vector' +p9 +sS'font' +p10 g6 sS'model.in2' -p9 +p11 g6 sS'x.graphics' -p10 +p12 g4 sS'nd' -p11 +p13 g6 sS'model.evtin' -p12 +p14 g6 sS'nt' -p13 +p15 g6 sS'model.firing' -p14 -S'vector' -p15 -sS'model.label' p16 -S'string' +g9 +sS'model.label' p17 -sS'model.sim' +S'string' p18 -S'list' +sS'model.sim' p19 -sS'mess' +S'list' p20 -g2 -sS'in1' +sS'mess' p21 -g15 +g2 sS'fontsize' p22 g6 @@ -88,14 +88,14 @@ p25 g2 sS'typ' p26 -g15 +g9 sS'ok' p27 S'boolean' p28 sS'model.blocktype' p29 -g17 +g18 sS'model.dep_ut' p30 S'vector_boolean' @@ -105,13 +105,13 @@ p32 g2 sS'gr_i' p33 -g15 +g9 sS'y' p34 -g15 +g9 sS'x' p35 -g15 +g9 sS'model' p36 g4 diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index a99952de..8d40f03f 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -2,7 +2,7 @@ function CMSCOPE() { CMSCOPE.prototype.define = function CMSCOPE() { this.win = -1; - this.in1 = [[1],[1]]; + this.in = [[1],[1]]; this.wdim = [[-1],[-1]]; this.wpos = [[-1],[-1]]; this.clrs = [[1],[3],[5],[7],[9],[11],[13],[15]]; @@ -14,15 +14,15 @@ function CMSCOPE() { var period = transpose(this.per.slice()); this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4])); - this.model.in = new ScilabDouble(this.in1); + this.model.in = new ScilabDouble([this.in]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); 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.ipar = new ScilabDouble([this.win],[size(this.in,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in.slice()],[this.clrs.slice(1-1,sum(this.in))]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - var 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()]]; + var exprs = [[strcat(string(this.in)," ")],[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()]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); @@ -34,7 +34,7 @@ function CMSCOPE() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set Scope parameters"; var options = { - in1:["Input ports sizes",this.in1.toString().replace(/,/g," ")], + in:["Input ports sizes",this.in.toString().replace(/,/g," ")], clrs:["Drawing colors (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")], win:["Output window number (-1 for automatic)",this.win], wpos:["Output window position",this.wpos.toString().replace(/,/g," ")], @@ -52,7 +52,7 @@ function CMSCOPE() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = inverse(arguments[0]["in1"]); + this.in = inverse(arguments[0]["in"]); this.clrs = inverse(arguments[0]["clrs"]); this.win = parseFloat(arguments[0]["win"]); this.wpos = inverse(arguments[0]["wpos"]); @@ -63,21 +63,21 @@ function CMSCOPE() { this.N = parseFloat(arguments[0]["N"]); this.heritance = arguments[0]["heritance"]; this.nom = arguments[0]["nom"]; - var exprs = [arguments[0]["in1"], arguments[0]["clrs"], arguments[0]["win"], arguments[0]["wpos"], arguments[0]["wdim"], arguments[0]["ymin"], arguments[0]["ymax"], arguments[0]["per"], arguments[0]["N"], arguments[0]["heritance"], arguments[0]["nom"]]; + var exprs = [arguments[0]["in"], arguments[0]["clrs"], arguments[0]["win"], arguments[0]["wpos"], arguments[0]["wdim"], arguments[0]["ymin"], arguments[0]["ymax"], arguments[0]["per"], arguments[0]["N"], arguments[0]["heritance"], arguments[0]["nom"]]; if (!ok) { break; } var mess = []; - if (size(this.in1,"*")<=0) { + if (size(this.in,"*")<=0) { var mess = [[mess],["Block must have at least one input port"],[" "]]; var ok = false; } - if (min(this.in1)<=0) { + if (min(this.in)<=0) { var mess = [[mess],["Port sizes must be positive"],[" "]]; var ok = false; } - if (size(this.clrs,"*")<sum(this.in1)) { - var mess = [[mess],["Not enough colors defined (at least "+string(sum(this.in1))+")"],[" "]]; + if (size(this.clrs,"*")<sum(this.in)) { + var mess = [[mess],["Not enough colors defined (at least "+string(sum(this.in))+")"],[" "]]; var ok = false; } if (size(this.wpos,"*")!=0&&size(this.wpos,"*")!=2) { @@ -119,10 +119,10 @@ function CMSCOPE() { throw "user error"; } if (ok) { - this.in1 = this.in1.slice(); - var a = size(this.in1,1); + this.in = this.in.slice(); + var a = size(this.in,1); var in2 = ones(a,1); - var tmpvar0 = set_io(this.model,this.graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); + var tmpvar0 = set_io(this.model,this.graphics,list([this.in,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; @@ -138,8 +138,8 @@ function CMSCOPE() { var period = transpose(this.per.slice()); var yy = [[transpose(this.ymin.slice())],[transpose(this.ymax.slice())]]; var rpar = [[0],[period.slice()],[yy.slice()]]; - this.clrs = this.clrs.slice(1-1,sum(this.in1)); - var ipar = [[this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice()],[this.heritance]]; + this.clrs = this.clrs.slice(1-1,sum(this.in)); + var ipar = [[this.win],[size(this.in,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in.slice()],[this.clrs.slice()],[this.heritance]]; this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.dstate = new ScilabDouble([]); this.model.rpar = new ScilabDouble(rpar); @@ -161,7 +161,7 @@ function CMSCOPE() { CMSCOPE.prototype.importset = function CMSCOPE() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.clrs = ary[1]; this.win = ary[2]; this.wpos = ary[3]; diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 77b192bf..e35f69ce 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -60,41 +60,41 @@ p11 g2 sS'x.model' p12 -NsS'ymin' +NsS'in' p13 g2 -sS'model.in2' +sS'ymin' p14 g2 -sS'model.intyp' +sS'model.in2' p15 g2 -sS'ymax' +sS'model.intyp' p16 g2 -sS'x.graphics' +sS'ymax' p17 +g2 +sS'x.graphics' +p18 g9 sS'graphics.exprs' -p18 -NsS'per' p19 +NsS'per' +p20 g2 sS'model.evtin' -p20 +p21 g7 sS'graphics.id' -p21 -NsS'model.label' p22 -NsS'model.sim' +NsS'model.label' p23 -S'list' +NsS'model.sim' p24 -sS'mess' +S'list' p25 -g2 -sS'in1' +sS'mess' p26 g2 sS'in2' @@ -111,8 +111,7 @@ p30 g2 sS'model.in' p31 -g2 -sS'wdim' +NsS'wdim' p32 g2 sS'model.ipar' diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index f8d4fc7c..a101bba9 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -1,21 +1,21 @@ /* autogenerated from "macros/Sinks/WFILE_f.sci" */ function WFILE_f() { WFILE_f.prototype.define = function WFILE_f() { - this.in1 = 1; - var nin = sum(this.in1); + this.in = 1; + var nin = sum(this.in); var frmt = "(7(e10.3,1x))"; var fname = "foo"; var lunit = 0; this.N = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["writef"]); - this.model.in = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in]); this.model.evtin = new ScilabDouble([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 = new ScilabBoolean([true,false]); - var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; + var exprs = [[sci2exp(this.in)],[fname],[frmt],[string(this.N)]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); @@ -34,7 +34,7 @@ function WFILE_f() { var frmt = exprs[3-1]; this.set_param_popup_title = msprintf("Set %s block parameters","WFILE_f"); var options = { - in1:["Input Size",this.in1], + in:["Input Size",this.in], fname1:["Output File Name",this.fname1], frmt1:["Output Format",this.frmt1], N:["Buffer Size",this.N], @@ -54,16 +54,16 @@ function WFILE_f() { var frmt = exprs[3-1]; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); + this.in = parseFloat(arguments[0]["in"]); this.fname1 = parseFloat(arguments[0]["fname1"]); this.frmt1 = parseFloat(arguments[0]["frmt1"]); this.N = parseFloat(arguments[0]["N"]); - var exprs = [arguments[0]["in1"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"]]; + var exprs = [arguments[0]["in"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"]]; if (!ok) { break; } - this.in1 = int(this.in1); - var nin = this.in1; + this.in = int(this.in); + var nin = this.in; this.fname1 = pathconvert(stripblanks(this.fname1),false,true); this.frmt1 = stripblanks(this.frmt1); if (lunit>0&&min(length(frmt),1)!=min(length(this.frmt1),1)) { @@ -90,8 +90,8 @@ function WFILE_f() { } else if (this.N<2) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Buffer Size",this.N),"Must be greater than 1."); var ok = false; - } else if (this.in1<=0) { - block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in1),"Strictly positive integer expected."); + } else if (this.in<=0) { + block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in),"Strictly positive integer expected."); var ok = false; } if (ok) { @@ -117,7 +117,7 @@ function WFILE_f() { WFILE_f.prototype.importset = function WFILE_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.fname1 = ary[1]; this.frmt1 = ary[2]; this.N = ary[3]; diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index b6e60adf..46d57deb 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -40,33 +40,33 @@ sS'model.dep_ut' p7 S'vector_boolean' p8 -sS'warnMessage' +sS'in' p9 S'double' p10 -sS'x.graphics' +sS'warnMessage' p11 +g10 +sS'x.graphics' +p12 g6 sS'lunit' -p12 +p13 g10 sS'fname' -p13 -S'string' p14 -sS'frmt' +S'string' p15 -g14 -sS'model.evtin' +sS'frmt' p16 +g15 +sS'model.evtin' +p17 g10 sS'model.sim' -p17 -g14 -sS'nin' p18 -g10 -sS'in1' +g15 +sS'nin' p19 g10 sS'N' @@ -80,8 +80,7 @@ p22 g10 sS'model.in' p23 -g10 -sS'graphics' +NsS'graphics' p24 g6 sS'model.ipar' @@ -97,7 +96,7 @@ S'boolean' p29 sS'model.blocktype' p30 -g14 +g15 sS'frmt1' p31 g10 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 42165bc6..e6c8c204 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -1,8 +1,8 @@ /* autogenerated from "macros/Sinks/WRITEC_f.sci" */ function WRITEC_f() { WRITEC_f.prototype.define = function WRITEC_f() { - this.in1 = 1; - var nin = sum(this.in1); + this.in = 1; + var nin = sum(this.in); var frmt = "c "; var fname = "foo"; this.swap = 0; @@ -10,13 +10,13 @@ function WRITEC_f() { this.N = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["writec"]), new ScilabDouble([2])); - this.model.in = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in]); this.model.evtin = new ScilabDouble([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 = new ScilabBoolean([true,false]); - var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; + var exprs = [[sci2exp(this.in)],[fname],[frmt],[string(this.N),string(this.swap)]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); @@ -33,7 +33,7 @@ function WRITEC_f() { var frmt = exprs[3-1]; this.set_param_popup_title = msprintf("Set %s block parameters","WRITEC_f"); var options = { - in1:["Input Size",this.in1], + in:["Input Size",this.in], fname1:["Output File Name",this.fname1], frmt1:["Output Format",this.frmt1], N:["Buffer Size",this.N], @@ -50,17 +50,17 @@ function WRITEC_f() { var frmt = exprs[3-1]; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); + this.in = parseFloat(arguments[0]["in"]); this.fname1 = parseFloat(arguments[0]["fname1"]); this.frmt1 = arguments[0]["frmt1"]; this.N = parseFloat(arguments[0]["N"]); this.swap = parseFloat(arguments[0]["swap"]); - var exprs = [arguments[0]["in1"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"], arguments[0]["swap"]]; + var exprs = [arguments[0]["in"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"], arguments[0]["swap"]]; if (!ok) { break; } - this.in1 = int(this.in1); - var nin = this.in1; + this.in = int(this.in); + var nin = this.in; this.fname1 = pathconvert(stripblanks(this.fname1),false,true); this.frmt1 = stripblanks(this.frmt1); var fmts = ["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"]; @@ -87,8 +87,8 @@ function WRITEC_f() { } else if (this.N<1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Buffer Size",this.N),"Strictly positive integer expected."); var ok = false; - } else if (this.in1<=0) { - block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in1),"Strictly positive integer expected."); + } else if (this.in<=0) { + block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in),"Strictly positive integer expected."); var ok = false; } else if (this.swap!=0&&this.swap!=1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Swap Mode",this.swap),msprintf("Must be in the interval %s.","[0, 1]")); @@ -117,7 +117,7 @@ function WRITEC_f() { WRITEC_f.prototype.importset = function WRITEC_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.fname1 = ary[1]; this.frmt1 = ary[2]; this.N = ary[3]; diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index 3217f2a0..98ca4424 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -45,47 +45,46 @@ sS'model.dep_ut' p7 S'vector_boolean' p8 -sS'x.graphics' +sS'in' p9 -g4 -sS'lunit' -p10 S'double' +p10 +sS'x.graphics' p11 -sS'swap' +g4 +sS'lunit' p12 -g11 -sS'fname' +g10 +sS'swap' p13 -S'string' +g10 +sS'fname' p14 -sS'frmt' +S'string' p15 -g14 -sS'model.evtin' +sS'frmt' p16 -g11 -sS'model.sim' +g15 +sS'model.evtin' p17 -S'list' +g10 +sS'model.sim' p18 -sS'nin' +S'list' p19 -g11 -sS'fmts' +sS'nin' p20 -S'vector_string' +g10 +sS'fmts' p21 -sS'in1' +S'vector_string' p22 -g11 sS'N' p23 -g11 +g10 sS'model.in' p24 -g11 -sS'graphics.exprs' +NsS'graphics.exprs' p25 NsS'model.ipar' p26 @@ -100,13 +99,13 @@ S'boolean' p30 sS'model.blocktype' p31 -g14 +g15 sS'frmt1' p32 -g14 +g15 sS'fname1' p33 -g11 +g10 sS'exprs' p34 g2 |