From 5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Mon, 16 Jul 2018 15:29:15 +0530 Subject: treat third argument of standard_define as model expression --- js/Sources/CLKINV_f.js | 2 +- js/Sources/CLKIN_f.js | 2 +- js/Sources/CONST.js | 2 +- js/Sources/CONST_f.js | 2 +- js/Sources/CONST_m.js | 2 +- js/Sources/CURVE_c.js | 2 +- js/Sources/CURV_f.js | 2 +- js/Sources/Counter.js | 2 +- js/Sources/FROMWSB.js | 2 +- js/Sources/FROMWS_c.js | 2 +- js/Sources/GENSIN_f.js | 2 +- js/Sources/GENSQR_f.js | 2 +- js/Sources/GEN_SQR.js | 2 +- js/Sources/Ground_g.js | 2 +- js/Sources/INIMPL_f.js | 2 +- js/Sources/IN_f.js | 2 +- js/Sources/Modulo_Count.js | 2 +- js/Sources/PULSE_SC.js | 2 +- js/Sources/RAMP.js | 2 +- js/Sources/RAND_f.js | 2 +- js/Sources/RAND_m.js | 2 +- js/Sources/READAU_f.js | 2 +- js/Sources/READC_f.js | 2 +- js/Sources/RFILE_f.js | 2 +- js/Sources/SAWTOOTH_f.js | 2 +- js/Sources/STEP.js | 2 +- js/Sources/STEP_FUNCTION.js | 2 +- js/Sources/SampleCLK.js | 2 +- js/Sources/Sigbuilder.js | 2 +- js/Sources/TIME_f.js | 2 +- js/Sources/TKSCALE.js | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) (limited to 'js/Sources') diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 47127717..140623c7 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -11,7 +11,7 @@ function CLKINV_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index d4829280..73cd143c 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -10,7 +10,7 @@ function CLKIN_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 99bbac2b..c48814a6 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -11,7 +11,7 @@ function CONST() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 3ef8149c..22b503c3 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -11,7 +11,7 @@ function CONST_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 70921450..7996dfc3 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -14,7 +14,7 @@ function CONST_m() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = sci2exp(this.C); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index d570080d..4e040c1c 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -20,7 +20,7 @@ function CURVE_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CURVE_c.prototype.details = function CURVE_c() { diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 1c694d99..32a9fd29 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -16,7 +16,7 @@ function CURV_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CURV_f.prototype.details = function CURV_f() { diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 804b9666..79fbc87a 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -15,7 +15,7 @@ function Counter() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 059510d1..ea9aa8c9 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -8,7 +8,7 @@ function FROMWSB() { scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 2e7844d2..714ff8fe 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -18,7 +18,7 @@ function FROMWS_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 18dfd652..b141b1a7 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -13,7 +13,7 @@ function GENSIN_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 0fbb44b9..7c09ea48 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -13,7 +13,7 @@ function GENSQR_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.Amplitude); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 01b23731..acd68578 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -47,7 +47,7 @@ function GEN_SQR() { var F = 1; this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 6dbf9bf3..1fe4898b 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -15,7 +15,7 @@ function Ground_g() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Ground_g.prototype.details = function Ground_g() { diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index c6b8133c..91304a4c 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -15,7 +15,7 @@ function INIMPL_f() { this.prt = 1; this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 2d293530..31326a50 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -12,7 +12,7 @@ function IN_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = sci2exp(prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index da9413fb..d3d8fc63 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -13,7 +13,7 @@ function Modulo_Count() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.ini_c)],[string(this.base)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index e59c3a36..6ec87ef7 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -42,7 +42,7 @@ function PULSE_SC() { var A = 1; this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index a50b550b..4e351fee 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -16,7 +16,7 @@ function RAMP() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [string(rpar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 072839b4..0cdd5b9c 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -17,7 +17,7 @@ function RAND_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index af6c26bb..f5753151 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -26,7 +26,7 @@ function RAND_m() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 499d61dc..1d6748b9 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -22,7 +22,7 @@ function READAU_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[fname],[string(this.N)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index e00c0d90..a52a4711 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -26,7 +26,7 @@ function READC_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 4e7e4653..a05b52ed 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -22,7 +22,7 @@ function RFILE_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 89e6d378..7f975daf 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -10,7 +10,7 @@ function SAWTOOTH_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 21b9f45e..a5779be2 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -15,7 +15,7 @@ function STEP() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(1)],[string(rpar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 10024cd5..bda1f4b5 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -48,7 +48,7 @@ function STEP_FUNCTION() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 9595688c..55e4663a 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -9,7 +9,7 @@ function SampleCLK() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index e2c9c722..b4f130fc 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -12,7 +12,7 @@ function Sigbuilder() { scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 23feae55..f0b39c13 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -7,7 +7,7 @@ function TIME_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } TIME_f.prototype.details = function TIME_f() { diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index bd1b757c..a487f386 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -13,7 +13,7 @@ function TKSCALE() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { -- cgit