diff options
Diffstat (limited to 'js/Sources')
44 files changed, 207 insertions, 309 deletions
diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index a36af2c0..ed031ea4 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -25,9 +25,6 @@ function CLKINV_f() { CLKINV_f.prototype.set = function CLKINV_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/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 7d77c8f0..e5928680 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -24,9 +24,6 @@ function CLKIN_f() { CLKIN_f.prototype.set = function CLKIN_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/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 259f09de..a967cc83 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -56,15 +56,12 @@ function CLOCK_c() { this.dt = arguments[0]["dt"] this.t0 = arguments[0]["t0"] this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; @@ -84,7 +81,6 @@ function CLOCK_c() { this.model.rpar = new ScilabDouble([this.dt],[this.t0]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -96,7 +92,6 @@ function CLOCK_c() { } else { var needcompile = 0; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index 8783f17d..3fb2bb94 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -56,15 +56,12 @@ function CLOCK_f() { this.dt = arguments[0]["dt"] this.t0 = arguments[0]["t0"] this.exprs0 = arguments[0]["exprs0"] - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") { var path = i; break; } } var newpar = list(); - var xx = arg1.model.rpar.objs[path-1]; this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; @@ -84,7 +81,6 @@ function CLOCK_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.t0]); xx.model = this.model; - arg1.model.rpar.objs[path-1] = xx; break; } } @@ -96,7 +92,6 @@ function CLOCK_f() { } else { var needcompile = 0; } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index f3a25e18..b48b2892 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -4,7 +4,7 @@ function CONST() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); @@ -25,10 +25,7 @@ function CONST() { CONST.prototype.set = function CONST() { this.C = parseFloat(arguments[0]["C"]) 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.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle index 4820fb4d..79e16740 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -43,27 +43,27 @@ g2 sS'model.rpar' p11 g2 -sS'model.in1' -p12 -S'vector' -p13 sS'exprs' -p14 +p12 g2 sS'x.model' -p15 +p13 NsS'gr_i' -p16 -g13 +p14 +S'vector' +p15 sS'model.dep_ut' +p16 +g15 +sS'model.in' p17 -g13 +g15 sS'graphics' p18 g7 sS'y' p19 -g13 +g15 sS'x' p20 g2 @@ -76,7 +76,7 @@ S'list' p23 sS'typ' p24 -g13 +g15 sS'nout' p25 g2 diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 518831b3..f86e6d30 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -4,7 +4,7 @@ function CONST_f() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); @@ -25,10 +25,7 @@ function CONST_f() { CONST_f.prototype.set = function CONST_f() { this.C = parseFloat(arguments[0]["C"]) 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.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle index 473b5774..4f742b51 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -44,27 +44,27 @@ g4 sS'model.rpar' p12 g4 -sS'model.in1' -p13 -S'vector' -p14 sS'exprs' -p15 +p13 g4 sS'x.model' -p16 +p14 NsS'gr_i' -p17 -g14 +p15 +S'vector' +p16 sS'model.dep_ut' +p17 +g16 +sS'model.in' p18 -g14 +g16 sS'graphics' p19 g8 sS'y' p20 -g14 +g16 sS'x' p21 g4 @@ -73,7 +73,7 @@ p22 g8 sS'typ' p23 -g14 +g16 sS'nout' p24 g4 diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index ea17b2c4..12236b48 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -4,7 +4,7 @@ function CONST_m() { this.C = [1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([size(this.C,1)]); this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([size(this.C,2)]); @@ -28,10 +28,7 @@ function CONST_m() { CONST_m.prototype.set = function CONST_m() { this.C = inverse(arguments[0]["C"]) 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.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index 5ada7cb9..550ae682 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -36,23 +36,23 @@ sS'model.in2' p7 S'vector' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'model.sim' -p11 +p10 S'list' -p12 +p11 sS'C' -p13 +p12 g8 sS'model.out2' -p14 +p13 g6 sS'model.rpar' +p14 +g8 +sS'model.in' p15 g8 sS'graphics.exprs' @@ -62,7 +62,7 @@ p17 g8 sS'model.opar' p18 -g12 +g11 sS'ok' p19 S'boolean' diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 3bd5134d..47ca2a52 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -9,7 +9,7 @@ function CURVE_c() { this.PeriodicOption = "y"; var Graf = "n"; this.model.sim = list(new ScilabString(["curve_c"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[1]); @@ -43,9 +43,6 @@ function CURVE_c() { this.PeriodicOption = arguments[0]["PeriodicOption"] this.graf = arguments[0]["graf"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index c186f931..7db8558b 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -649,105 +649,105 @@ p172 NsS'XMX' p173 g7 -sS'graphics' +sS'model.in' p174 +g2 +sS'graphics' +p175 g74 sS'Exitm' -p175 +p176 g4 sS'N2' -p176 +p177 g7 sS'model.ipar' -p177 +p178 g26 sS'Pw3' -p178 +p179 g2 sS'f' -p179 +p180 g7 sS'a.grid' -p180 +p181 g2 sS'y[N-1]' -p181 +p182 g7 sS'xy[zz-1].slice()' -p182 +p183 g2 sS'gr_i' -p183 +p184 g2 sS'ipar' -p184 +p185 g2 sS'ystC' -p185 +p186 g4 sS'mtd' -p186 +p187 g7 sS'PERIODIC' -p187 +p188 g4 sS'xmx1' -p188 +p189 g7 sS'scam' -p189 +p190 g4 sS'exprs[4-1]' -p190 +p191 g4 sS'ans0' -p191 +p192 g4 sS'ymn1' -p192 +p193 g7 sS't1' -p193 +p194 g4 sS'model.evtout' -p194 +p195 g7 sS'rpar' -p195 +p196 g2 sS'lx11' -p196 +p197 g7 sS'model.out' -p197 +p198 g7 sS'Bias3' -p198 +p199 g2 sS'Tp3' -p199 +p200 g2 sS'np5' -p200 +p201 g2 sS'np4' -p201 +p202 g2 sS'rectx' -p202 +p203 g7 sS'np1' -p203 +p204 g7 sS'Lx' -p204 +p205 g7 sS'x21' -p205 -g4 -sS'model.in1' p206 -g2 +g4 sS'x[k-1]' p207 g2 diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index c7e3fd39..2dcaa156 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -9,7 +9,7 @@ function CURV_f() { var rpar = [[xx],[yy],[rect.slice()]]; this.model = scicos_model(); this.model.sim = new ScilabString(["intplt"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([xx],[yy],[rect.slice()]); this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); @@ -28,9 +28,6 @@ function CURV_f() { return options; } CURV_f.prototype.set = function CURV_f() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var rpar = this.model.rpar; var ipar = this.model.ipar; var n = ipar[1-1]; diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle index 3d37146b..56f1b102 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_f.pickle @@ -34,28 +34,28 @@ sS'model.out' p8 S'double' p9 -sS'model.in1' +sS'x.graphics' p10 -S'vector' +NsS'model.firing' p11 -sS'x.graphics' +S'vector' p12 -NsS'model.firing' -p13 -g11 sS'model.sim' -p14 +p13 S'string' -p15 +p14 sS'axisdata' -p16 +p15 g4 sS'model.rpar' -p17 +p16 g4 sS'yy' -p18 +p17 g4 +sS'model.in' +p18 +g12 sS'graphics' p19 NsS'model.ipar' @@ -63,35 +63,35 @@ p20 g4 sS'typ' p21 -g11 +g12 sS'rect' p22 -g11 +g12 sS'ok' p23 S'boolean' p24 sS'model.blocktype' p25 -g15 +g14 sS'xx' p26 g4 sS'model.dep_ut' p27 -g11 +g12 sS'n' p28 g9 sS'gr_i' p29 -g11 +g12 sS'ipar' p30 g4 sS'y' p31 -g11 +g12 sS'x' p32 g9 diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 26085612..d0e462d0 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -34,10 +34,7 @@ function Counter() { this.maxim = parseFloat(arguments[0]["maxim"]) this.rule = parseFloat(arguments[0]["rule"]) 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.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 2c8e6e64..1489096a 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -20,8 +20,6 @@ function FROMWSB() { return options; } FROMWSB.prototype.set = function FROMWSB() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="FROMWS_c") { var ppath = list(i); break; @@ -38,20 +36,19 @@ function FROMWSB() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (!isequalbitwise(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -80,12 +77,10 @@ function FROMWSB() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 02a6c352..85acbda6 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -39,10 +39,7 @@ function FROMWS_c() { this.ZC = parseFloat(arguments[0]["ZC"]) this.OutEnd = parseFloat(arguments[0]["OutEnd"]) 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.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 9a9f29eb..e99e4566 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -4,7 +4,7 @@ function GENSIN_f() { var rpar = [[1],[1],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["gensin"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -32,10 +32,7 @@ function GENSIN_f() { this.F = arguments[0]["F"] this.P = arguments[0]["P"] 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.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index 2043a20b..222abe50 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -25,28 +25,28 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 -S'vector' +S'double' p4 sS'ok' p5 S'boolean' p6 -sS'model.blocktype' +sS'model.in' p7 -g2 -sS'x.graphics' +S'vector' p8 -S'object' +sS'x.graphics' p9 -sS'arg1' +S'object' p10 -g9 -sS'model.out2' +sS'arg1' p11 -S'double' +g10 +sS'model.out2' p12 +g4 sS'model.rpar' p13 S'matrix' @@ -61,31 +61,31 @@ sS'x.model' p17 NsS'gr_i' p18 -g4 +g8 sS'model.dep_ut' p19 -g4 +g8 sS'graphics.exprs' p20 NsS'graphics' p21 -g9 +g10 sS'y' p22 -g4 +g8 sS'x' p23 -g12 +g4 sS'model' p24 -g9 +g10 sS'typ' p25 -g4 +g8 sS'model.outtyp' p26 -g12 -sS'model.out' +g4 +sS'model.blocktype' p27 -g12 +g2 s.
\ No newline at end of file diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 162dbe83..9d78b143 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -28,10 +28,7 @@ function GENSQR_f() { GENSQR_f.prototype.set = function GENSQR_f() { this.Amplitude = parseFloat(arguments[0]["Amplitude"]) 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[2-1]; } diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index f119e1dc..41a6cbeb 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -20,7 +20,7 @@ function GEN_SQR() { scs_m_1.objs[16-1] = scicos_link(xx=[[48.313686],[48.229901]],yy=[[403.57431],[385.21998]],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[1,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -65,16 +65,13 @@ function GEN_SQR() { scicos_context.F = arguments[0]["scicos_context.F"] this.exprs = arguments[0]["exprs"] var y = this.needcompile; - arg1.model.ipar = 1; var typ = list(); - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; var Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; var Ss = list("mat",[-1,-1],"mat",[-1,-1],"pol",-1,"pol",-1); var scicos_context = struct(); - this.x = arg1; var ok = false; while (!ok) { [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index fce61f2d..42a37c4c 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -87,9 +87,9 @@ g4 sS'model.in2' p24 g7 -sS'model.in1' +sS'model.intyp' p25 -g7 +g4 sS'model.nzcross' p26 g4 @@ -154,21 +154,21 @@ g4 sS'sblock' p47 g9 -sS'model.intyp' +sS'model.nmode' p48 g4 sS'model.rpar' p49 g4 -sS'model.nmode' -p50 -g4 sS'scs_m_1.objs[4-1]' -p51 +p50 g4 sS'sblock.props' -p52 +p51 g9 +sS'model.in' +p52 +g7 sS'graphics' p53 g9 diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index b30d73e8..a87dfdbf 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -4,7 +4,7 @@ function Ground_g() { var C = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([1]); @@ -27,7 +27,6 @@ function Ground_g() { return options; } Ground_g.prototype.set = function Ground_g() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle index 12e7a77c..5d502d5e 100644 --- a/js/Sources/Ground_g.pickle +++ b/js/Sources/Ground_g.pickle @@ -37,22 +37,22 @@ sS'model.out2' p9 S'double' p10 -sS'model.in1' -p11 -g4 sS'model.rpar' -p12 +p11 g4 sS'model.opar' -p13 +p12 g2 sS'model.out' -p14 +p13 g10 sS'gr_i' -p15 +p14 g4 sS'model.dep_ut' +p15 +g4 +sS'model.in' p16 g4 sS'y' diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 75664e3c..c5260693 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -30,10 +30,7 @@ function INIMPL_f() { INIMPL_f.prototype.set = function INIMPL_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/Sources/IN_f.js b/js/Sources/IN_f.js index 6ff481fa..2437d88b 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -24,9 +24,6 @@ function IN_f() { return options; } IN_f.prototype.set = function IN_f() { - 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/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 22d253bb..f9d34251 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -30,10 +30,7 @@ function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) 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.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); this.ini_c = int(this.ini_c); diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 796d4e50..4d79196d 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -15,7 +15,7 @@ function PULSE_SC() { scs_m_1.objs[11-1] = scicos_link(xx=[[154.57795],[174.57795]],yy=[[206.09381],[206.09381]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); @@ -60,16 +60,13 @@ function PULSE_SC() { scicos_context.A = arguments[0]["scicos_context.A"] this.exprs = arguments[0]["exprs"] var y = this.needcompile; - arg1.model.ipar = 1; var typ = list(); - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; var Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; var Ss = list("pol",-1,"pol",-1,"pol",-1,"mat",[-1,-1]); var scicos_context = struct(); - this.x = arg1; var ok = false; while (!ok) { [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 7cd361a3..91045067 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -40,109 +40,109 @@ sS'model.dstate' p6 S'vector' p7 -sS'arg1' +sS'W' p8 -S'object' +g4 +sS'arg1' p9 -sS'scs_m_1.objs[6-1]' +S'object' p10 +sS'scs_m_1.objs[6-1]' +p11 g4 sS'scs_m_1.objs[5-1]' -p11 +p12 g4 sS'scs_m_1.objs[3-1]' -p12 +p13 g4 sS'scicos_context' -p13 +p14 g4 sS'model.out' -p14 +p15 g4 sS'x.model' -p15 -g9 -sS'scs_m_1.objs[9-1]' p16 +g10 +sS'scs_m_1.objs[9-1]' +p17 g4 sS'x.model.rpar' -p17 -g9 -sS'Btitre' p18 -S'string' +g10 +sS'Btitre' p19 -sS'E' +S'string' p20 +sS'E' +p21 g4 sS'scs_m_1.objs[11-1]' -p21 +p22 g4 sS'model.in2' -p22 -g7 -sS'model.in1' p23 g7 -sS'model.nzcross' +sS'model.intyp' p24 g4 -sS'model.opar' +sS'model.nzcross' p25 +g4 +sS'model.opar' +p26 g2 sS'gr_i' -p26 +p27 g7 sS'scs_m_1' -p27 +p28 g4 sS'model.evtin' -p28 +p29 g7 sS'scs_m_1.objs[2-1]' -p29 +p30 g4 sS'model.label' -p30 -g19 -sS'model.sim' p31 -g19 -sS'model.evtout' +g20 +sS'model.sim' p32 +g20 +sS'model.evtout' +p33 g7 sS'model.equations' -p33 +p34 g2 sS'scs_m_1.objs[8-1]' -p34 +p35 g4 sS'scs_m_1.objs[10-1]' -p35 +p36 g4 sS'F' -p36 +p37 g4 sS'Ss' -p37 +p38 g2 sS'Exprs0' -p38 -S'matrix' p39 -sS'model.out2' +S'matrix' p40 +sS'model.out2' +p41 g4 sS'sblock' -p41 -g9 -sS'model.intyp' p42 -g4 -sS'model.rpar' +g10 +sS'model.nmode' p43 g4 -sS'model.nmode' +sS'model.rpar' p44 g4 sS'scs_m_1.objs[4-1]' @@ -150,13 +150,13 @@ p45 g4 sS'sblock.props' p46 -g9 -sS'W' +g10 +sS'model.in' p47 -g4 +g7 sS'graphics' p48 -g9 +g10 sS'scs_m_1.objs[7-1]' p49 g4 @@ -171,14 +171,14 @@ p52 g4 sS'Bitems' p53 -g39 +g40 sS'ok' p54 S'boolean' p55 sS'model.blocktype' p56 -g19 +g20 sS'scs_m_1.objs[1-1]' p57 g4 @@ -204,7 +204,7 @@ p64 g4 sS'model' p65 -g9 +g10 sS'model.state' p66 g7 diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 3ac0a879..5d1ffec1 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -7,7 +7,7 @@ function RAMP() { var rpar = [[this.slope],[this.stt],[this.iout]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ramp"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -35,10 +35,7 @@ function RAMP() { this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) 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.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index ec96548a..9b83ecf6 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -41,31 +41,31 @@ p8 NsS'model.out' p9 g2 -sS'model.in1' -p10 -S'vector' -p11 sS'x.graphics' -p12 +p10 g4 sS'model.nzcross' -p13 +p11 g2 sS'model.sim' -p14 +p12 S'list' -p15 +p13 sS'model.nmode' -p16 +p14 g2 sS'model.rpar' -p17 +p15 g7 +sS'model.in' +p16 +S'vector' +p17 sS'graphics.exprs' p18 NsS'typ' p19 -g11 +g17 sS'model.blocktype' p20 S'string' @@ -75,19 +75,19 @@ p22 g2 sS'model.dep_ut' p23 -g11 +g17 sS'stt' p24 g2 sS'exprs' p25 -g11 +g17 sS'gr_i' p26 -g11 +g17 sS'y' p27 -g11 +g17 sS'x' p28 g2 diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 73084f93..1c215505 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -38,10 +38,7 @@ function RAND_f() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==5) { this.exprs = this.exprs.slice(1-1,3); } diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 56333efc..c4c64ea4 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -9,7 +9,7 @@ function RAND_m() { var funtyp = 4; this.model = scicos_model(); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); @@ -49,10 +49,7 @@ function RAND_m() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==14) { this.exprs[9-1] = []; } diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index bd5f8157..7e5ecfa1 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -52,7 +52,7 @@ sS'model.in2' p11 S'vector' p12 -sS'model.in1' +sS'model.intyp' p13 g12 sS'x.graphics' @@ -81,19 +81,19 @@ g12 sS'model.out2' p23 g8 -sS'model.intyp' -p24 -g12 sS'model.rpar' -p25 +p24 g12 sS'model.outtyp' -p26 +p25 g8 sS'flag' -p27 +p26 g8 sS'model.state' +p27 +g12 +sS'model.in' p28 g12 sS'graphics.exprs' diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 76498f48..1cb14586 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -41,10 +41,7 @@ function READAU_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 out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 0e72d59d..9020963e 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -55,9 +55,7 @@ function READC_f() { this.offset = parseFloat(arguments[0]["offset"]) this.swap = parseFloat(arguments[0]["swap"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; this.model = this.x.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 4cc3f634..31d3047b 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -45,10 +45,7 @@ function RFILE_f() { this.frmt1 = parseFloat(arguments[0]["frmt1"]) 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; var dstate = this.model.dstate; var ipar = this.model.ipar; var ievt = ipar[3-1]; diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 2cfae4d2..313fc0cc 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -22,7 +22,6 @@ function SAWTOOTH_f() { return options; } SAWTOOTH_f.prototype.set = function SAWTOOTH_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index c5d93cd3..7322169b 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -34,10 +34,7 @@ function STEP() { this.in1 = arguments[0]["in1"] this.fi = arguments[0]["fi"] 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.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 5d81952f..af1f38d7 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -60,8 +60,6 @@ function STEP_FUNCTION() { return options; } STEP_FUNCTION.prototype.set = function STEP_FUNCTION() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="STEP") { var ppath = list(i); break; @@ -77,14 +75,13 @@ function STEP_FUNCTION() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { @@ -116,11 +113,9 @@ function STEP_FUNCTION() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; } } - this.x = arg1; var y = needcompile; var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 4fe2eb15..4c5c67f3 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -26,9 +26,6 @@ function SampleCLK() { this.frequ = arguments[0]["frequ"] this.offset = arguments[0]["offset"] 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.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs); diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index 96c8d9b7..c8f61747 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -25,8 +25,6 @@ function Sigbuilder() { } Sigbuilder.prototype.set = function Sigbuilder() { var ppath = list(0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="CURVE_c") { ppath[1-1] = i; break; @@ -43,20 +41,19 @@ function Sigbuilder() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -85,12 +82,10 @@ function Sigbuilder() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; this.y = max(this.y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 1cb47909..7cc4ac99 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -19,7 +19,6 @@ function TIME_f() { return options; } TIME_f.prototype.set = function TIME_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index ec4bba02..2b93dbf4 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -32,10 +32,7 @@ function TKSCALE() { this.b = parseFloat(arguments[0]["b"]) this.f = parseFloat(arguments[0]["f"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs); if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); |