diff options
Diffstat (limited to 'js/Misc')
31 files changed, 91 insertions, 91 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 2ba7bda8..06b0b664 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -12,7 +12,7 @@ function AUTOMAT() { ipar = [[NMode],[this.Minitial],[NX],[this.XP],[C1],[C2]]; rpar = [this.X0]; this.model = scicos_model(); - this.model.sim = list("automat",10004); + this.model.sim = list(new ScilabString("automat"),new ScilabDouble(10004)); this.model.in1 = [[2*NX+1],[2*NX+1]]; this.model.out = [[2],[2*NX]]; this.model.state = new ScilabDouble(ones(2*NX,1)); diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 30a8b1ec..14d36de1 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -3,7 +3,7 @@ function BACKLASH() { BACKLASH.prototype.define = function BACKLASH() { exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); - this.model.sim = list("backlash",4); + this.model.sim = list(new ScilabString("backlash"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.rpar = [[0],[1]]; diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 899d7c5d..fd75dd92 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -24,7 +24,7 @@ function BOUNCE() { state = [this.x,this.xd,this.y,this.yd]; state = transpose(state); this.model = scicos_model(); - this.model.sim = list("bounce_ball",4); + this.model.sim = list(new ScilabString("bounce_ball"),new ScilabDouble(4)); this.model.in1 = []; this.model.out = [[n],[n]]; this.model.state = state.slice(); diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 1f4509c1..a0123d59 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -10,7 +10,7 @@ function BOUNCEXY() { this.ymin = 0; this.ymax = 15; this.model = scicos_model(); - this.model.sim = list("bouncexy",4); + this.model.sim = list(new ScilabString("bouncexy"),new ScilabDouble(4)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[1],[1]]; this.model.intyp = [[1],[1]]; diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 8c7f2bb0..777abcba 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -9,7 +9,7 @@ function BPLATFORM() { this.ymin = 0; this.ymax = 15; this.model = scicos_model(); - this.model.sim = list("bplatform2",5); + this.model.sim = list(new ScilabString("bplatform2"),new ScilabDouble(5)); this.model.in1 = [[1],[1]]; this.model.evtin = new ScilabDouble(1); this.model.dstate = new ScilabDouble(0); diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 30976cb0..38cb0da0 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -14,7 +14,7 @@ function CBLOCK() { funam = "toto"; this.ng = 0; this.model = scicos_model(); - this.model.sim = list(" ",2004); + this.model.sim = list(new ScilabString(" "),new ScilabDouble(2004)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.evtin = clkin; @@ -134,7 +134,7 @@ function CBLOCK() { } else { [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); if (ok) { - this.model.sim = list(funam,funtyp); + this.model.sim = list(new ScilabDouble(funam),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(this.i); this.model.out = new ScilabDouble(this.o); this.model.evtin = new ScilabDouble(this.ci); diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 84051ad4..19fd7c5c 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -3,7 +3,7 @@ function CBLOCK4() { CBLOCK4.prototype.define = function CBLOCK4() { funam = "toto"; this.model = scicos_model(); - this.model.sim = list(" ",2004); + this.model.sim = list(new ScilabString(" "),new ScilabDouble(2004)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -127,7 +127,7 @@ function CBLOCK4() { break; } } else { - this.model.sim = list(funam,funtyp); + this.model.sim = list(new ScilabDouble(funam),new ScilabDouble(funtyp)); this.model.state = this.xx; this.model.dstate = this.z; this.model.odstate = new ScilabDouble(this.oz); diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 8d86b801..88363986 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -5,7 +5,7 @@ function CONSTRAINT2_c() { this.xd0 = [0]; this.id = [0]; this.model = scicos_model(); - this.model.sim = list("constraint_c",10004); + this.model.sim = list(new ScilabString("constraint_c"),new ScilabDouble(10004)); this.model.in1 = new ScilabDouble(1); this.model.out = [[1],[1]]; this.model.state = [[this.x0],[this.xd0]]; diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 084c7ef7..6a7ac07c 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -3,7 +3,7 @@ function CONSTRAINT_c() { CONSTRAINT_c.prototype.define = function CONSTRAINT_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); - this.model.sim = list("constraint_c",10004); + this.model.sim = list(new ScilabString("constraint_c"),new ScilabDouble(10004)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.ipar = new ScilabDouble(0); diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index dc380f40..7d1dd640 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -5,7 +5,7 @@ function DEADBAND() { this.maxp = .5; rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); - this.model.sim = list("deadband",4); + this.model.sim = list(new ScilabString("deadband"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.nzcross = new ScilabDouble(2); this.model.nmode = new ScilabDouble(1); diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index fd1547c1..a8f8c683 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -2,7 +2,7 @@ function DEBUG() { DEBUG.prototype.define = function DEBUG() { this.model = scicos_model(); - this.model.sim = list("%debug_scicos",99); + this.model.sim = list(new ScilabString("%debug_scicos"),new ScilabDouble(99)); this.model.blocktype = new ScilabString("d"); exprs = list("","xcos_debug_gui(flag,block);"); gr_i = []; diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index cc27fc20..4d8c219c 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -3,7 +3,7 @@ function DIFF_f() { DIFF_f.prototype.define = function DIFF_f() { this.x0 = [[0],[0]]; this.model = scicos_model(); - this.model.sim = list("diffblk",10001); + this.model.sim = list(new ScilabString("diffblk"),new ScilabDouble(10001)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = this.x0; diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index fcbf7b41..5ecdcb0a 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -3,7 +3,7 @@ function EDGETRIGGER() { EDGETRIGGER.prototype.define = function EDGETRIGGER() { this.edge = 1; this.model = scicos_model(); - this.model.sim = list("edgetrig",4); + this.model.sim = list(new ScilabString("edgetrig"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.dstate = new ScilabDouble(0); diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index bb85aa33..2f0a6d56 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -6,7 +6,7 @@ function HYSTHERESIS() { this.nzz = 2; rpar = [[1],[0],[1],[0]]; this.model = scicos_model(); - this.model.sim = list("hystheresis",4); + this.model.sim = list(new ScilabString("hystheresis"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(1); this.model.rpar = rpar; diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index fbd68077..05bef006 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -5,7 +5,7 @@ function LOGICAL_OP() { ipar = [0]; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("logicalop",4); + this.model.sim = list(new ScilabString("logicalop"),new ScilabDouble(4)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.ipar = ipar; @@ -66,21 +66,21 @@ function LOGICAL_OP() { this.tp = 1; } if (this.Datatype==1) { - this.model.sim = list("logicalop",4); + this.model.sim = list(new ScilabString("logicalop"),new ScilabDouble(4)); this.model.ipar = [this.rule]; } else { if (this.Datatype==3) { - this.model.sim = list("logicalop_i32",4); + this.model.sim = list(new ScilabString("logicalop_i32"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("logicalop_i16",4); + this.model.sim = list(new ScilabString("logicalop_i16"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("logicalop_i8",4); + this.model.sim = list(new ScilabString("logicalop_i8"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("logicalop_ui32",4); + this.model.sim = list(new ScilabString("logicalop_ui32"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("logicalop_ui16",4); + this.model.sim = list(new ScilabString("logicalop_ui16"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("logicalop_ui8",4); + this.model.sim = list(new ScilabString("logicalop_ui8"),new ScilabDouble(4)); } else { message("Datatype is not supported"); ok = false; diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 2d5fe3d2..fc1311ce 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -20,7 +20,7 @@ function MBLOCK() { mo = modelica(); mo.model = nameF; mo.parameters = list(param,paramv); - this.model.sim = list(mo.model,30004); + this.model.sim = list(new ScilabString(mo.model),new ScilabDouble(30004)); mo.inputs = this.in1; mo.outputs = this.out; this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"r"),1)); @@ -259,7 +259,7 @@ function MBLOCK() { for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]]; } - this.model.sim[('1', 'double')] = new ScilabDouble(this.funam); + this.model.sim[1] = new ScilabDouble(this.funam); exprs.in1 = this.lab_1[1-1]; exprs.intype = this.lab_1[2-1]; exprs.out = this.lab_1[3-1]; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 88091cb4..518419e3 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -73,9 +73,10 @@ g11 sS'lab_2_tmp' p15 g5 -sS"model.sim[('1', 'double')]" +sS'x.model' p16 -NsS'exprs.outtype' +g7 +sS'exprs.outtype' p17 g11 sS'exprs.intype' @@ -133,13 +134,12 @@ g21 sS'x.graphics.in_implicit' p37 g21 -sS'x.model' -p38 -g7 sS'[ok,tt]' -p39 +p38 g11 -sS'mo.parameters' +sS'model.sim[1]' +p39 +NsS'mo.parameters' p40 g5 sS'Tparam_sz' diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index aaaf1dc5..509c0db0 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -20,7 +20,7 @@ function MPBLOCK() { mo = modelica(); mo.model = nameF; mo.parameters = list(param,paramv); - this.model.sim = list(mo.model,10004); + this.model.sim = list(new ScilabString(mo.model),new ScilabDouble(10004)); mo.inputs = this.in1; mo.outputs = this.out; this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"r"),1)); @@ -236,7 +236,7 @@ function MPBLOCK() { for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = [[this.model.rpar],[double(paramv[i-1].slice())]]; } - this.model.sim[('1', 'double')] = new ScilabDouble(this.funam); + this.model.sim[1] = new ScilabDouble(this.funam); exprs.in1 = lab_1[1-1]; exprs.intype = lab_1[2-1]; exprs.out = lab_1[3-1]; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index c2410df2..64d62a78 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -112,18 +112,18 @@ g31 sS'paramv' p35 g5 -sS"model.sim[('1', 'double')]" +sS'gr_i' p36 -NsS'gr_i' -p37 g31 sS'x.graphics.in_implicit' -p38 +p37 g31 sS'x.model' -p39 +p38 g9 -sS'mo.parameters' +sS'model.sim[1]' +p39 +NsS'mo.parameters' p40 g5 sS'Tparam_sz' diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 375b3739..456ca1ef 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -9,7 +9,7 @@ function PENDULUM_ANIM() { this.ymin = -5; this.ymax = 5; this.model = scicos_model(); - this.model.sim = list("anim_pen",5); + this.model.sim = list(new ScilabString("anim_pen"),new ScilabDouble(5)); this.model.in1 = [[1],[1]]; this.model.evtin = new ScilabDouble(1); this.model.dstate = new ScilabDouble(0); diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 55ea69c5..ba4a5958 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -5,7 +5,7 @@ function RATELIMITER() { this.maxp = 1; rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); - this.model.sim = list("ratelimiter",4); + this.model.sim = list(new ScilabString("ratelimiter"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.rpar = rpar; diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 9cf2543e..a98b7e5d 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -4,7 +4,7 @@ function RELATIONALOP() { ipar = [2]; label = "<"; this.model = scicos_model(); - this.model.sim = list("relationalop",4); + this.model.sim = list(new ScilabString("relationalop"),new ScilabDouble(4)); this.model.in1 = [[1],[1]]; this.model.out = new ScilabDouble(1); this.model.ipar = ipar; @@ -52,19 +52,19 @@ function RELATIONALOP() { ok = false; } if ((this.Datatype==1)) { - this.model.sim = list("relational_op",4); + this.model.sim = list(new ScilabString("relational_op"),new ScilabDouble(4)); } else if ((this.Datatype==3||this.Datatype==9)) { - this.model.sim = list("relational_op_i32",4); + this.model.sim = list(new ScilabString("relational_op_i32"),new ScilabDouble(4)); } else if ((this.Datatype==4)) { - this.model.sim = list("relational_op_i16",4); + this.model.sim = list(new ScilabString("relational_op_i16"),new ScilabDouble(4)); } else if ((this.Datatype==5)) { - this.model.sim = list("relational_op_i8",4); + this.model.sim = list(new ScilabString("relational_op_i8"),new ScilabDouble(4)); } else if ((this.Datatype==6)) { - this.model.sim = list("relational_op_ui32",4); + this.model.sim = list(new ScilabString("relational_op_ui32"),new ScilabDouble(4)); } else if ((this.Datatype==7)) { - this.model.sim = list("relational_op_ui16",4); + this.model.sim = list(new ScilabString("relational_op_ui16"),new ScilabDouble(4)); } else if ((this.Datatype==8)) { - this.model.sim = list("relational_op_ui8",4); + this.model.sim = list(new ScilabString("relational_op_ui8"),new ScilabDouble(4)); } else { message("Datatype is not supported"); ok = false; diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 3c1e294c..32685ce8 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -12,7 +12,7 @@ function c_block() { this.rpar = []; this.funam = "toto"; this.model = scicos_model(); - this.model.sim = list(" ",2001); + this.model.sim = list(new ScilabString(" "),new ScilabDouble(2001)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.evtin = clkin; @@ -75,7 +75,7 @@ function c_block() { } [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); if (ok) { - this.model.sim[('1', 'double')] = new ScilabString(this.funam); + this.model.sim[1] = new ScilabString(this.funam); this.model.rpar = this.rpar; label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 4696c640..bb191268 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -80,47 +80,47 @@ g9 sS'model.evtin' p24 g3 -sS'model.firing' +sS'model.sim[1]' p25 +NsS'model.firing' +p26 g3 sS'model.sim' -p26 +p27 g22 sS'model.evtout' -p27 +p28 g3 sS'clkout' -p28 +p29 g3 sS'auto' -p29 +p30 g3 sS'label[2-1]' -p30 +p31 g3 sS'in1' -p31 +p32 g9 sS'model.rpar' -p32 +p33 g3 sS'model.state' -p33 +p34 g3 sS'graphics.exprs' -p34 -NsS'x0' p35 +NsS'x0' +p36 g3 sS'model.ipar' -p36 +p37 g9 sS'typ' -p37 -g13 -sS"model.sim[('1', 'double')]" p38 -NsS'[model,graphics,ok]' +g13 +sS'[model,graphics,ok]' p39 g9 sS'model.blocktype' diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index e1653c52..7a5ba3e3 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -2,7 +2,7 @@ function fortran_block() { fortran_block.prototype.define = function fortran_block() { this.model = scicos_model(); - this.model.sim = list(" ",1001); + this.model.sim = list(new ScilabString(" "),new ScilabDouble(1001)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = []; @@ -66,7 +66,7 @@ function fortran_block() { } [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); if (ok) { - this.model.sim[('1', 'double')] = new ScilabString(this.funam); + this.model.sim[1] = new ScilabString(this.funam); this.model.rpar = this.rpar; label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index ef801090..862c80a8 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -71,35 +71,35 @@ g13 sS'model.evtin' p21 g3 -sS'model.firing' +sS'model.sim[1]' p22 +NsS'model.firing' +p23 g3 sS'model.sim' -p23 +p24 g19 sS'model.evtout' -p24 +p25 g3 sS'label[2-1]' -p25 +p26 g3 sS'model.rpar' -p26 +p27 g3 sS'model.state' -p27 +p28 g3 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g13 sS'typ' -p30 -g3 -sS"model.sim[('1', 'double')]" p31 -NsS'[model,graphics,ok]' +g3 +sS'[model,graphics,ok]' p32 g13 sS'model.blocktype' diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index a7cf464a..075b2906 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -4,7 +4,7 @@ function generic_block() { this.model = scicos_model(); this.function_name = "sinblk"; this.funtyp = 1; - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabString(this.function_name),new ScilabDouble(this.funtyp)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = []; @@ -110,7 +110,7 @@ function generic_block() { if (this.funtyp==3) { needcompile = 4; } - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabDouble(this.function_name),new ScilabDouble(this.funtyp)); this.model.state = this.xx; this.model.dstate = this.z; this.model.rpar = this.rpar; diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 238255e7..55bec7e6 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -4,7 +4,7 @@ function generic_block2() { this.model = scicos_model(); this.function_name = "sinblk"; this.funtyp = 1; - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabString(this.function_name),new ScilabDouble(this.funtyp)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = []; @@ -114,7 +114,7 @@ function generic_block2() { if (this.funtyp==3) { needcompile = 4; } - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabDouble(this.function_name),new ScilabDouble(this.funtyp)); this.model.state = this.xx; this.model.dstate = this.z; this.model.rpar = this.rpar; diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index d2f1d8c3..22ff6155 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -4,7 +4,7 @@ function generic_block3() { this.model = scicos_model(); this.function_name = "sinblk"; this.funtyp = 4; - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabString(this.function_name),new ScilabDouble(this.funtyp)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -124,7 +124,7 @@ function generic_block3() { if (this.funtyp==3) { needcompile = 4; } - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabDouble(this.function_name),new ScilabDouble(this.funtyp)); this.model.state = this.xx; this.model.dstate = this.z; this.model.odstate = new ScilabDouble(this.oz); diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index a68de77f..45da6f37 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -11,7 +11,7 @@ function scifunc_block() { auto = []; this.rpar = []; this.model = scicos_model(); - this.model.sim = list("scifunc",3); + this.model.sim = list(new ScilabString("scifunc"),new ScilabDouble(3)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.evtin = clkin; diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 869b6256..924149d8 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -12,7 +12,7 @@ function scifunc_block_m() { this.rpar = []; it = 1; this.model = scicos_model(); - this.model.sim = list("scifunc",3); + this.model.sim = list(new ScilabString("scifunc"),new ScilabDouble(3)); this.model.in1 = new ScilabDouble(in1); this.model.in2 = new ScilabDouble(in1); this.model.intyp = new ScilabDouble(it); |