diff options
Diffstat (limited to 'js/Sinks')
38 files changed, 321 insertions, 392 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 257cff45..868cdb9c 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -9,7 +9,7 @@ function AFFICH_m() { 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.in = 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 = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); @@ -18,7 +18,7 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); - this.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)]]; + this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new AfficheBlock(this.x); @@ -47,10 +47,7 @@ function AFFICH_m() { this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,this.exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index f2197601..8e4f9dac 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -52,40 +52,40 @@ g7 sS'model.in2' p10 g7 -sS'model.in1' -p11 -g7 sS'x.graphics' -p12 +p11 g4 sS'nd' -p13 +p12 g7 sS'model.evtin' -p14 +p13 g7 sS'nt' -p15 +p14 g7 sS'model.firing' -p16 +p15 S'vector' -p17 +p16 sS'model.label' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'mess' -p22 +p21 g2 sS'in1' -p23 -g17 +p22 +g16 sS'fontsize' +p23 +g7 +sS'model.in' p24 g7 sS'graphics.exprs' @@ -95,26 +95,26 @@ p26 g2 sS'typ' p27 -g17 +g16 sS'ok' p28 S'boolean' p29 sS'model.blocktype' p30 -g19 +g18 sS'model.dep_ut' p31 -g17 +g16 sS'exprs' p32 g2 sS'gr_i' p33 -g17 +g16 sS'y' p34 -g17 +g16 sS'x' p35 g7 diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index c7f144bc..c4997f64 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -9,7 +9,7 @@ function BARXY() { this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5])); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); this.model.evtin = new ScilabDouble([1]); @@ -41,10 +41,7 @@ function BARXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.thickness = arguments[0]["thickness"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,this.exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 324d5e98..8f54bbe7 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -45,38 +45,38 @@ p8 sS'ymin' p9 g8 -sS'model.in1' +sS'model.intyp' p10 -S'matrix' -p11 +g5 sS'ymax' -p12 +p11 g8 sS'x.graphics' -p13 +p12 g2 sS'x.graphics.in_implicit' -p14 +p13 g5 sS'model.evtin' -p15 +p14 g5 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'mess' +p17 +S'matrix' p18 -g11 sS'x.graphics.out_implicit' p19 g5 -sS'model.intyp' -p20 -g5 sS'model.rpar' +p20 +g18 +sS'model.in' p21 -g11 +g18 sS'graphics.exprs' p22 NsS'model.ipar' @@ -100,7 +100,7 @@ sS'exprs' p30 NsS'x.graphics.exprs' p31 -g11 +g18 sS'xmax' p32 g8 diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 552889b4..5a80546d 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -14,7 +14,7 @@ function CANIMXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -60,10 +60,7 @@ function CANIMXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index 0a699534..8fa3a89c 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -59,62 +59,62 @@ p8 NsS'model.intyp' p9 g4 -sS'model.in1' -p10 -g4 sS'xmin' -p11 +p10 g2 sS'ymin' -p12 +p11 g2 sS'model.in2' -p13 +p12 g4 sS'graphics' -p14 +p13 S'object' -p15 +p14 sS'ymax' -p16 +p15 g2 sS'x.graphics' -p17 -g15 +p16 +g14 sS'siz' -p18 +p17 g2 sS'arg1' -p19 -g15 +p18 +g14 sS'model.evtin' -p20 +p19 g2 sS'model.firing' -p21 +p20 S'vector' -p22 +p21 sS'model.sim' -p23 +p22 S'list' -p24 +p23 sS'xmax' -p25 +p24 g2 sS'mess' -p26 +p25 g4 sS'in1' -p27 +p26 S'string' -p28 +p27 sS'in2' -p29 +p28 g2 sS'N' -p30 +p29 g2 sS'model.rpar' +p30 +g4 +sS'model.in' p31 g4 sS'graphics.exprs' @@ -124,35 +124,35 @@ p33 g4 sS'typ' p34 -g22 +g21 sS'ok' p35 S'boolean' p36 sS'model.blocktype' p37 -g28 +g27 sS'model.dep_ut' p38 -g22 +g21 sS'exprs' p39 g4 sS'gr_i' p40 -g22 +g21 sS'ipar' p41 g4 sS'y' p42 -g22 +g21 sS'x' p43 g2 sS'model' p44 -g15 +g14 sS'nbr_curves' p45 g2 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 9c481615..3e14c5a6 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -14,7 +14,7 @@ function CANIMXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); @@ -60,10 +60,7 @@ function CANIMXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index 7c476fb5..ba83184c 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -59,62 +59,62 @@ p8 NsS'model.intyp' p9 g2 -sS'model.in1' -p10 -g2 sS'model.in2' -p11 +p10 g2 sS'graphics' -p12 +p11 S'object' -p13 +p12 sS'x.graphics' -p14 -g13 +p13 +g12 sS'siz' -p15 +p14 g2 sS'vec_z' -p16 +p15 g2 sS'arg1' -p17 -g13 +p16 +g12 sS'model.evtin' -p18 +p17 g5 sS'model.firing' -p19 +p18 S'vector' -p20 +p19 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'mess' -p23 +p22 g2 sS'vec_x' -p24 +p23 g2 sS'vec_y' -p25 +p24 g2 sS'in1' -p26 +p25 S'string' -p27 +p26 sS'in2' -p28 +p27 g5 sS'N' -p29 +p28 g5 sS'size_siz' -p30 +p29 g5 sS'model.rpar' +p30 +g2 +sS'model.in' p31 g2 sS'graphics.exprs' @@ -124,38 +124,38 @@ p33 g2 sS'typ' p34 -g20 +g19 sS'ok' p35 S'boolean' p36 sS'model.blocktype' p37 -g27 +g26 sS'param3ds' p38 g2 sS'model.dep_ut' p39 -g20 +g19 sS'exprs' p40 g2 sS'gr_i' p41 -g20 +g19 sS'ipar' p42 g2 sS'y' p43 -g20 +g19 sS'x' p44 g5 sS'model' p45 -g13 +g12 sS'nbr_curves' p46 g5 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 499e2e08..68a84e58 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -41,10 +41,7 @@ function CEVENTSCOPE() { this.wdim = inverse(arguments[0]["wdim"]) this.per = parseFloat(arguments[0]["per"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),this.exprs); this.nclock = int(this.nclock); diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 48ed64d8..f9d59174 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -49,10 +49,7 @@ function CFSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.wu = arguments[0]["wu"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index 2d336c14..fc89a6e6 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -24,9 +24,6 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.set = function CLKOUTV_f() { this.prt = arguments[0]["prt"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),this.exprs); @@ -48,14 +45,11 @@ function CLKOUTV_f() { return new EventOutBlock(this.x); } CLKOUTV_f.prototype.getinputs = function CLKOUTV_f() { - var orig = arg1.graphics.orig; - var sz = arg1.graphics.sz; this.x = orig[1-1]+sz[1-1]/2; var y = orig[2-1]+sz[2-1]; var typ = -ones(this.x); } CLKOUTV_f.prototype.getorigin = function CLKOUTV_f() { - var tmpvar0 = standard_origin(arg1); this.x = tmpvar0[0]; var y = tmpvar0[1]; } @@ -67,10 +61,6 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.plot = function CLKOUTV_f() { var xf = 60; var yf = 40; - var orig = arg1.graphics.orig; - var sz = arg1.graphics.sz; - var orient = arg1.graphics.flip; - this.prt = arg1.model.ipar; var pat = xget("pattern"); xset("pattern",this.default_color[-1-1]); var thick = xget("thickness"); @@ -79,7 +69,6 @@ function CLKOUTV_f() { var y = orig[2-1]+sz[2-1]*[[0],[1/3],[1],[1],[1/3]]; var xo = orig[1-1]; var yo = orig[2-1]+sz[2-1]/3; - this.gr_i = arg1.graphics.gr_i; if (this.type[this.gr_i-1]==15) { var coli = this.gr_i[2-1]; var pcoli = xget("pattern"); @@ -96,7 +85,6 @@ function CLKOUTV_f() { xfpoly(in1.slice()[1-1]+ones(4,1)*(orig[1-1]+sz[1-1]/2),in1.slice()[2-1]+ones(4,1)*(orig[2-1]+sz[2-1]),1); xset("thickness",thick); xset("pattern",pat); - var ident = arg1.graphics.id; if (ident!=[]&&ident!="") { var font = xget("font"); xset("font",this.options.ID[1-1][1-1],this.options.ID[1-1][2-1]); diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 1dc5d670..95ee36ad 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -24,9 +24,6 @@ function CLKOUT_f() { CLKOUT_f.prototype.set = function CLKOUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 61bbdb86..2e58a087 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -11,7 +11,7 @@ function CMAT3D() { var 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.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); @@ -44,10 +44,7 @@ function CMAT3D() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle index dbb67d12..a5ce2127 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -50,7 +50,7 @@ g2 sS'model.in2' p10 g2 -sS'model.in1' +sS'model.intyp' p11 g2 sS'x.graphics' @@ -70,15 +70,15 @@ sS'mess' p17 S'matrix' p18 -sS'model.intyp' -p19 -g2 sS'model.rpar' -p20 +p19 g18 sS'rpar' -p21 +p20 g18 +sS'model.in' +p21 +g2 sS'graphics.exprs' p22 NsS'model.ipar' diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index e9e77c5d..fe50b305 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -9,7 +9,7 @@ function CMATVIEW() { var 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.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); @@ -38,10 +38,7 @@ function CMATVIEW() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index b5cb593d..7893017c 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -47,7 +47,7 @@ g2 sS'model.in2' p11 g2 -sS'model.in1' +sS'model.intyp' p12 g2 sS'x.graphics' @@ -70,15 +70,15 @@ sS'mess' p19 S'matrix' p20 -sS'model.intyp' -p21 -g2 sS'model.rpar' -p22 +p21 g20 sS'rpar' -p23 +p22 g20 +sS'model.in' +p23 +g2 sS'graphics.exprs' p24 NsS'model.ipar' diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index c4811853..924a4d4f 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -14,7 +14,7 @@ function CMSCOPE() { var period = transpose(this.per.slice()); this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(this.in1); + this.model.in = new ScilabDouble(this.in1); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -59,10 +59,7 @@ function CMSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 7daa4956..83f9f0b5 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -63,60 +63,60 @@ p10 g2 sS'x.model' p11 -NsS'model.intyp' +NsS'ymin' p12 g2 -sS'ymin' +sS'model.in2' p13 g2 -sS'model.in2' +sS'model.intyp' p14 g2 -sS'model.in1' -p15 -g2 sS'ymax' -p16 +p15 g2 sS'x.graphics' -p17 +p16 g7 sS'graphics.exprs' -p18 +p17 NsS'per' -p19 +p18 g2 sS'win' -p20 +p19 S'double' -p21 +p20 sS'model.evtin' -p22 -g21 +p21 +g20 sS'graphics.id' -p23 +p22 NsS'model.label' -p24 +p23 NsS'model.sim' -p25 +p24 S'list' -p26 +p25 sS'mess' -p27 +p26 g2 sS'in1' -p28 +p27 g2 sS'in2' -p29 -g21 +p28 +g20 sS'N' -p30 -g21 +p29 +g20 sS'yy' -p31 +p30 g2 sS'model.rpar' +p31 +g2 +sS'model.in' p32 g2 sS'wdim' @@ -130,7 +130,7 @@ p35 g4 sS'a' p36 -g21 +g20 sS'ok' p37 S'boolean' @@ -156,7 +156,7 @@ p45 g4 sS'x' p46 -g21 +g20 sS'model' p47 g7 diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index f708ea28..36819266 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -11,7 +11,7 @@ function CSCOPE() { 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.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); @@ -53,10 +53,7 @@ function CSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index 628431d5..a8fcda26 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -89,13 +89,13 @@ p21 sS'mess' p22 g2 -sS'model.in1' -p23 -g5 sS'model.rpar' -p24 +p23 g2 sS'N' +p24 +g5 +sS'model.in' p25 g5 sS'wdim' diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 7d104223..5bbc625d 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -14,7 +14,7 @@ function CSCOPXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -59,10 +59,7 @@ function CSCOPXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index f16dc117..98585da1 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -59,58 +59,58 @@ p8 NsS'model.intyp' p9 g4 -sS'model.in1' -p10 -g4 sS'xmin' -p11 +p10 g2 sS'ymin' -p12 +p11 g2 sS'model.in2' -p13 +p12 g4 sS'graphics' -p14 +p13 S'object' -p15 +p14 sS'ymax' -p16 +p15 g2 sS'x.graphics' -p17 -g15 +p16 +g14 sS'siz' -p18 +p17 g2 sS'arg1' -p19 -g15 +p18 +g14 sS'model.evtin' -p20 +p19 g2 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'xmax' -p23 +p22 g2 sS'mess' -p24 +p23 g4 sS'in1' -p25 +p24 S'string' -p26 +p25 sS'in2' -p27 +p26 g2 sS'N' -p28 +p27 g2 sS'model.rpar' +p28 +g4 +sS'model.in' p29 g4 sS'graphics.exprs' @@ -128,7 +128,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g26 +g25 sS'model.dep_ut' p37 g33 @@ -149,7 +149,7 @@ p42 g2 sS'model' p43 -g15 +g14 sS'nbr_curves' p44 g2 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index ba2eb57d..e4995638 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -14,7 +14,7 @@ function CSCOPXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy3d"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1],[1]); + this.model.in = new ScilabDouble([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]); @@ -59,10 +59,7 @@ function CSCOPXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index 891332f9..ae5afc50 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -59,58 +59,58 @@ p8 NsS'model.intyp' p9 g2 -sS'model.in1' -p10 -g2 sS'model.in2' -p11 +p10 g2 sS'graphics' -p12 +p11 S'object' -p13 +p12 sS'x.graphics' -p14 -g13 +p13 +g12 sS'siz' -p15 +p14 g2 sS'vec_z' -p16 +p15 g2 sS'arg1' -p17 -g13 +p16 +g12 sS'model.evtin' -p18 +p17 g5 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'mess' -p21 +p20 g2 sS'vec_x' -p22 +p21 g2 sS'vec_y' -p23 +p22 g2 sS'in1' -p24 +p23 S'string' -p25 +p24 sS'in2' -p26 +p25 g5 sS'N' -p27 +p26 g5 sS'size_siz' -p28 +p27 g5 sS'model.rpar' +p28 +g2 +sS'model.in' p29 g2 sS'graphics.exprs' @@ -128,7 +128,7 @@ S'boolean' p35 sS'model.blocktype' p36 -g25 +g24 sS'param3ds' p37 g2 @@ -152,7 +152,7 @@ p43 g5 sS'model' p44 -g13 +g12 sS'nbr_curves' p45 g5 diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index de52222b..ab05fc00 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -2,7 +2,7 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.define = function OUTIMPL_f() { this.model = scicos_model(); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); this.prt = 1; this.model.sim = new ScilabString(["outimpl"]); @@ -30,10 +30,7 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.set = function OUTIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; } diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index 394f3d4f..a6a25290 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -39,24 +39,24 @@ sS'model.in2' p9 S'vector' p10 -sS'model.in1' -p11 -g10 sS'x.graphics' -p12 +p11 g2 sS'mo.inputs' -p13 +p12 g5 sS'x.graphics.in_implicit' -p14 +p13 g10 sS'model.sim' -p15 +p14 g5 sS'model.equations' -p16 +p15 g7 +sS'model.in' +p16 +g10 sS'graphics.exprs' p17 g7 diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 968ceb1b..e6dc0e39 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -5,7 +5,7 @@ function OUT_f() { this.prt = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["output"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([this.prt]); @@ -27,9 +27,6 @@ function OUT_f() { OUT_f.prototype.set = function OUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index 44e3674f..03c970ad 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -25,7 +25,7 @@ sS'model.sim' p3 S'string' p4 -sS'model.in1' +sS'model.intyp' p5 g2 sS'model.blocktype' @@ -41,30 +41,30 @@ p9 sS'graphics.exprs' p10 g2 -sS'model.intyp' -p11 -g2 sS'model.dep_ut' -p12 +p11 S'vector' -p13 +p12 sS'n' -p14 +p13 g2 sS'exprs' -p15 +p14 g4 sS'x.model' -p16 +p15 NsS'gr_i' +p16 +g12 +sS'model.in' p17 -g13 +g2 sS'graphics' p18 g9 sS'y' p19 -g13 +g12 sS'x' p20 g2 @@ -76,7 +76,7 @@ p22 g2 sS'typ' p23 -g13 +g12 sS'x.graphics' p24 g9 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 8ebbb85e..7dae3640 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -7,7 +7,7 @@ function TOWS_c() { this.herit = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tows_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nu]); + this.model.in = new ScilabDouble([nu]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); this.model.out = new ScilabDouble([]); @@ -39,9 +39,6 @@ function TOWS_c() { this.varnam = arguments[0]["varnam"] this.herit = parseFloat(arguments[0]["herit"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.nz,this.varnam,this.herit,this.exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),this.exprs); diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 458ab931..b2ec6996 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -47,9 +47,9 @@ p10 sS'model.in2' p11 g5 -sS'model.in1' +sS'model.intyp' p12 -g8 +g5 sS'herit' p13 g5 @@ -78,10 +78,10 @@ p21 sS'model.evtout' p22 g8 -sS'model.intyp' -p23 -g5 sS'model.rpar' +p23 +g8 +sS'model.in' p24 g8 sS'graphics.exprs' diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 7ef3e6ad..b57a85ea 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -4,7 +4,7 @@ function TRASH_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["trash"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); @@ -22,7 +22,6 @@ function TRASH_f() { return options; } TRASH_f.prototype.set = function TRASH_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle index 12da9c14..606695ab 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_f.pickle @@ -19,40 +19,40 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'exprs' -p6 +p4 g2 sS'in1' -p7 -g4 +p5 +S'double' +p6 sS'model.dep_ut' -p8 +p7 S'vector' -p9 +p8 sS'model.evtin' -p10 -g4 +p9 +g6 sS'gr_i' +p10 +g8 +sS'model.in' p11 -g9 +g6 sS'y' p12 -g9 +g8 sS'x' p13 -g4 +g6 sS'model' p14 S'object' p15 sS'typ' p16 -g9 +g8 s.
\ No newline at end of file diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 62ea59fb..5e2ced67 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -9,7 +9,7 @@ function WFILE_f() { this.N = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["writef"]); - this.model.in1 = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in1]); 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]]); @@ -42,11 +42,7 @@ function WFILE_f() { var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); - warnBlockByUID(arg1.model.label,warnXcosMessage); - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; var lunit = dstate[2-1]; var fname = this.exprs[2-1]; @@ -93,7 +89,7 @@ function WFILE_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabDouble([true,false]); diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index 2a1970d6..fafc1645 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -73,10 +73,10 @@ g15 sS'nin' p19 g11 -sS'model.in1' +sS'in1' p20 g11 -sS'in1' +sS'N' p21 g11 sS'warnAdvise' @@ -85,37 +85,37 @@ g11 sS'warnXcosMessage' p23 g11 -sS'graphics' +sS'model.in' p24 +g11 +sS'graphics' +p25 g4 sS'model.ipar' -p25 +p26 g2 sS'typ' -p26 +p27 g9 sS'arg1.model' -p27 +p28 g4 sS'ok' -p28 -S'boolean' p29 -sS'model.blocktype' +S'boolean' p30 +sS'model.blocktype' +p31 g15 sS'frmt1' -p31 +p32 g11 sS'fname1' -p32 +p33 g11 sS'exprs' -p33 -g2 -sS'N' p34 -g11 +g2 sS'gr_i' p35 g9 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index d9bfa994..9cfcc038 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -10,7 +10,7 @@ function WRITEAU_f() { 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.in = new ScilabDouble([in1]); 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]]); @@ -35,10 +35,7 @@ function WRITEAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -66,7 +63,7 @@ function WRITEAU_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.graphics.exprs = new ScilabDouble([this.exprs]); diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index f3a19a0a..83272f8a 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -44,42 +44,42 @@ sS'model.dep_ut' p8 S'vector' p9 -sS'model.in1' -p10 -S'double' -p11 sS'x.graphics' -p12 +p10 g4 sS'lunit' -p13 -g11 +p11 +S'double' +p12 sS'swap' -p14 -g11 +p13 +g12 sS'fname' -p15 +p14 S'string' -p16 +p15 sS'frmt' -p17 -g16 +p16 +g15 sS'model.evtin' -p18 -g11 +p17 +g12 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'nin' -p21 -g11 +p20 +g12 sS'in1' -p22 -g11 +p21 +g12 sS'N' +p22 +g12 +sS'model.in' p23 -g11 +g12 sS'graphics.exprs' p24 NsS'model.ipar' @@ -94,13 +94,13 @@ S'boolean' p28 sS'model.blocktype' p29 -g16 +g15 sS'frmt1' p30 -g16 +g15 sS'fname1' p31 -g16 +g15 sS'exprs' p32 g9 @@ -115,7 +115,7 @@ p35 g9 sS'x' p36 -g11 +g12 sS'model' p37 g4 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 358c89bc..1a602fa9 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -10,7 +10,7 @@ function WRITEC_f() { 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.in = new ScilabDouble([this.in1]); 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]]); @@ -41,10 +41,7 @@ function WRITEC_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -96,7 +93,7 @@ function WRITEC_f() { if (prod(size(dstate))!=(nin+1)*this.N+2) { var dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; } - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.graphics.exprs = new ScilabDouble([this.exprs]); diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index b482fa90..9ff122d1 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -52,45 +52,45 @@ sS'model.dep_ut' p8 S'vector' p9 -sS'model.in1' -p10 -S'double' -p11 sS'x.graphics' -p12 +p10 g4 sS'lunit' -p13 -g11 +p11 +S'double' +p12 sS'swap' -p14 -g11 +p13 +g12 sS'fname' -p15 +p14 S'string' -p16 +p15 sS'frmt' -p17 -g16 +p16 +g15 sS'model.evtin' -p18 -g11 +p17 +g12 sS'model.sim' -p19 +p18 S'list' -p20 +p19 sS'nin' -p21 -g11 +p20 +g12 sS'fmts' -p22 +p21 g9 sS'in1' -p23 -g11 +p22 +g12 sS'N' +p23 +g12 +sS'model.in' p24 -g11 +g12 sS'graphics.exprs' p25 NsS'model.ipar' @@ -105,13 +105,13 @@ S'boolean' p29 sS'model.blocktype' p30 -g16 +g15 sS'frmt1' p31 -g16 +g15 sS'fname1' p32 -g11 +g12 sS'exprs' p33 g2 @@ -126,7 +126,7 @@ p36 g9 sS'x' p37 -g11 +g12 sS'model' p38 g4 |