diff options
Diffstat (limited to 'js')
449 files changed, 3480 insertions, 3036 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 1ff250ee..ab278050 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -24,9 +24,9 @@ function CLKFROM() { CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs); if (!ok) { @@ -39,8 +39,8 @@ function CLKFROM() { this.model.opar = list(new ScilabDouble([this.tag])); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index 235b1140..c97cb78c 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tag' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index f1462d11..237992ae 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -28,9 +28,9 @@ function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),exprs); if (!ok) { @@ -50,8 +50,8 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.model.evtin = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index 90bbe8f3..8c0d2129 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -10,8 +10,10 @@ aS'tag' p4 aS'tagvis' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index d7ea947b..72fac875 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -31,8 +31,8 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); @@ -44,9 +44,9 @@ function CLKGotoTagVisibility() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index ebf3fd56..a7889058 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tag' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 5c1cb1be..8b537934 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -27,8 +27,8 @@ function DEMUX() { DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),exprs); @@ -40,9 +40,9 @@ function DEMUX() { message("Block must have at least 2 and at most 31 output ports"); var ok = false; } else { - var tmpvar0 = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,0,-transpose([1:this.out]),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } else { @@ -55,9 +55,9 @@ function DEMUX() { } else { var nin = sum(this.out); } - var tmpvar1 = check_io(this.model,graphics,nin,this.out.slice(),[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,nin,this.out.slice(),[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { this.out = size(this.out,"*"); @@ -65,9 +65,9 @@ function DEMUX() { } } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.out]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index b740b0b4..82c8d94b 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'out' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 6e04c129..7184e51c 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -27,8 +27,8 @@ function DEMUX_f() { DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),exprs); @@ -40,9 +40,9 @@ function DEMUX_f() { message("Block must have at least 2 and at most 8 output ports"); var ok = false; } else { - var tmpvar0 = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,0,-transpose([1:this.out]),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } else { @@ -55,9 +55,9 @@ function DEMUX_f() { } else { var nin = sum(this.out); } - var tmpvar1 = check_io(this.model,graphics,nin,this.out.slice(),[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,nin,this.out.slice(),[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { this.out = size(this.out,"*"); @@ -65,9 +65,9 @@ function DEMUX_f() { } } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.out]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index b740b0b4..82c8d94b 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'out' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 407c795b..b0c6d2dd 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -35,8 +35,8 @@ function ESELECT_f() { this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==1) { exprs[2-1] = string(1); } @@ -61,15 +61,15 @@ function ESELECT_f() { if (this.out<2) { message("Block must have at least two output ports"); } else { - var tmpvar0 = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,1,[],this.inh,[ones(this.out,1)]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.model.nmode = new ScilabDouble([this.nmod]); this.model.nzcross = new ScilabDouble([this.nmod]); this.x.model = this.model; diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index b97e8d58..9775491c 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nmod' p2 -aS'model' -p3 aS'inh' +p3 +aS'graphics' p4 -aS'nmod' +aS'x' p5 -aS'out' +aS'model' p6 -atp7 -Rp8 +aS'out' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index f08a5f15..5f999f43 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -26,8 +26,8 @@ function EXTRACTOR() { EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.ind,exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs); @@ -36,14 +36,14 @@ function EXTRACTOR() { } this.ind = int(this.ind); this.ind = this.ind.slice(); - var tmpvar0 = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[-1],size(this.ind,1),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble(this.ind); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index c3f89749..e8893247 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 42b351a1..5f3049dc 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -31,8 +31,8 @@ function FROM() { FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); @@ -44,10 +44,10 @@ function FROM() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; break; } } diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index 68df9c4d..a791941b 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tag' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index e80abb71..78f6bc51 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -34,8 +34,8 @@ function FROMMO() { FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); @@ -47,10 +47,10 @@ function FROMMO() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; break; } } diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 59258af9..a3976214 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tag' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 6f561aea..abed8429 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -33,8 +33,8 @@ function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); @@ -51,11 +51,11 @@ function GOTO() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; var arg1 = this.x; break; } diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index d80b82be..06f62621 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -10,8 +10,10 @@ aS'tag' p4 aS'tagvis' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index e6ea2dd2..f3998900 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -36,8 +36,8 @@ function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); @@ -54,11 +54,11 @@ function GOTOMO() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; var arg1 = this.x; break; } diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index 147b79bb..aaf02f69 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -10,8 +10,10 @@ aS'tag' p4 aS'tagvis' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 7f10aaa2..fc76df5b 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -31,8 +31,8 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); @@ -44,9 +44,9 @@ function GotoTagVisibility() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index ebf3fd56..a7889058 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tag' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 65c93537..91f935e4 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -31,8 +31,8 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); @@ -44,9 +44,9 @@ function GotoTagVisibilityMO() { var needcompile = 4; var y = needcompile; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index ebf3fd56..a7889058 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tag' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 4ae441a3..a4953e7b 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -31,8 +31,8 @@ function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs); @@ -42,14 +42,14 @@ function ISELECT_f() { if (this.z0>this.nout||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - var tmpvar0 = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0-1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index 9790452a..b64cb2f9 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -10,8 +10,10 @@ aS'z0' p4 aS'nout' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index ed09ed94..7b828ea8 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -41,8 +41,8 @@ function ISELECT_m() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.typ,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),exprs); @@ -60,14 +60,14 @@ function ISELECT_m() { if (ok) { var out = [-ones(this.nout,1),-2*ones(this.nout,1)]; var in1 = [-1,-2]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index f1b30901..e4aa840a 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'typ' p2 -aS'model' +aS'graphics' p3 -aS'z0' +aS'x' p4 -aS'typ' +aS'model' p5 -aS'nout' +aS'z0' p6 -atp7 -Rp8 +aS'nout' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 7d77713f..9bfc3ef9 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -25,8 +25,8 @@ function MUX() { MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),exprs); @@ -38,9 +38,9 @@ function MUX() { message("Block must have at least two input ports and at most 31"); var ok = false; } else { - var tmpvar0 = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-transpose([1:this.in1]),0,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } else { @@ -53,9 +53,9 @@ function MUX() { } else { var nout = sum(this.in1); } - var tmpvar1 = check_io(this.model,graphics,this.in1.slice(),nout,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,this.in1.slice(),nout,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { this.in1 = size(this.in1,"*"); @@ -63,9 +63,9 @@ function MUX() { } } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.in1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index 2dbb6528..bc3a11ca 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'in1' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index f3bedb89..ea6bf4f3 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -25,8 +25,8 @@ function MUX_f() { MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),exprs); @@ -38,9 +38,9 @@ function MUX_f() { message("Block must have at least two input ports and at most eight"); var ok = false; } else { - var tmpvar0 = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-transpose([1:this.in1]),0,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } else { @@ -53,9 +53,9 @@ function MUX_f() { } else { var nout = sum(this.in1); } - var tmpvar1 = check_io(this.model,graphics,this.in1.slice(),nout,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,this.in1.slice(),nout,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { this.in1 = size(this.in1,"*"); @@ -63,9 +63,9 @@ function MUX_f() { } } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.in1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index 2dbb6528..bc3a11ca 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'in1' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 3b75f7e2..9d893685 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -32,8 +32,8 @@ function M_SWITCH() { this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nin,this.base,this.rule,exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs); @@ -60,14 +60,14 @@ function M_SWITCH() { } var it = [[-1],[-2*ones(this.nin,1)]]; var ot = -2; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.base],[this.rule]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 2736cffb..b2f42465 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'rule' p3 aS'base' p4 -aS'nin' +aS'graphics' p5 -aS'rule' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index ae1cc248..b6a26ec8 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -26,21 +26,21 @@ function NRMSOM_f() { NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nin,exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs); if (!ok) { break; } - var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-ones(this.nin,1),-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 20fb9bc4..95b68196 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'nin' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 3052e95c..afb1673b 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -32,8 +32,8 @@ function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { @@ -44,14 +44,14 @@ function RELAY_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabString([this.z0-1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 8e77d212..cb090d13 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -10,8 +10,10 @@ aS'z0' p4 aS'nin' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index a775f16e..43d92954 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -25,8 +25,8 @@ function SCALAR2VECTOR() { SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nout,exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),exprs); @@ -39,14 +39,14 @@ function SCALAR2VECTOR() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[1],this.nout,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[1],this.nout,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index d1ff3945..ed70c2af 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'nout' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 9cca42a2..73bdc8eb 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -31,8 +31,8 @@ function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); @@ -42,14 +42,14 @@ function SELECT_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0-1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 8a09ab8c..33b87e7a 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -10,8 +10,10 @@ aS'z0' p4 aS'nin' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index af52a5b0..32e62c27 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -41,8 +41,8 @@ function SELECT_m() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.typ,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs); @@ -60,14 +60,14 @@ function SELECT_m() { if (ok) { var in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; var out = [-1,-2]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index 5c1a1a33..f9c2cfa9 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'typ' p3 -aS'z0' +aS'graphics' p4 -aS'typ' +aS'x' p5 -aS'nin' +aS'model' p6 -atp7 -Rp8 +aS'z0' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 3667651f..04f504b5 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -36,8 +36,8 @@ function SWITCH2() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),exprs); @@ -51,7 +51,7 @@ function SWITCH2() { if ((this.rule>2)) { this.rule = 2; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { @@ -61,7 +61,7 @@ function SWITCH2() { this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index 4fad17f0..c7e23169 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nzz' p2 -aS'model' +aS'rule' p3 -aS'nzz' +aS'thra' p4 -aS'rule' +aS'graphics' p5 -aS'thra' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 087fe226..798077ad 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -41,8 +41,8 @@ function SWITCH2_m() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.ot,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); @@ -56,7 +56,7 @@ function SWITCH2_m() { if ((this.rule>2)) { this.rule = 2; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { @@ -76,13 +76,13 @@ function SWITCH2_m() { it[3-1] = this.ot; var in1 = [this.model.in1,this.model.in2]; var out = [this.model.out,this.model.out2]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,this.ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 5b66bbf0..b798f56f 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -8,14 +8,16 @@ aS'rule' p3 aS'thra' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'ot' +aS'model' p7 -atp8 -Rp9 +aS'ot' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 87d7a165..68375cea 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -31,8 +31,8 @@ function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { @@ -43,14 +43,14 @@ function SWITCH_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-ones(this.nin,1),-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabString([this.z0-1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index aa8254c3..bd0fe2a2 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -10,8 +10,10 @@ aS'z0' p4 aS'nin' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 6a8c2211..bdd17ed1 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -59,8 +59,8 @@ function CCS() { } CCS.prototype.set = function CCS() { this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; return new BasicBlock(this.x); diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index 0dd41936..86117e01 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 98af660e..36aee0b6 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -59,8 +59,8 @@ function CVS() { } CVS.prototype.set = function CVS() { this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; return new BasicBlock(this.x); diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index 0dd41936..86117e01 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'arg1' p1 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index d39a9755..1c37b386 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -37,8 +37,8 @@ function Capacitor() { this.C = parseFloat(arguments[0]["C"]) this.v = parseFloat(arguments[0]["v"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.C,this.v,exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs); @@ -46,9 +46,9 @@ function Capacitor() { break; } this.model.rpar = new ScilabDouble([this.C]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.C]), new ScilabDouble([this.v])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.C]), new ScilabDouble([this.v])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 7c4bbd09..ecb39b69 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'C' -p4 aS'v' +p4 +aS'C' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 @@ -56,33 +58,33 @@ g8 sS'model.equations' p18 g8 -sS'model.equations.parameters[2]' -p19 -g15 sS'mo.outputs' -p20 +p19 g5 sS'x.graphics.out_implicit' -p21 +p20 g13 sS'model.rpar' -p22 +p21 S'matrix' -p23 +p22 sS'graphics.exprs' -p24 +p23 NsS'typ' -p25 +p24 g13 sS'model.blocktype' -p26 +p25 g5 sS'mo' -p27 +p26 g2 sS'model.dep_ut' -p28 +p27 g13 +sS'model.equations.parameters[2-1]' +p28 +g15 sS'exprs' p29 g5 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index d4693242..1191ac64 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -33,8 +33,8 @@ function ConstantVoltage() { ConstantVoltage.prototype.set = function ConstantVoltage() { this.V = parseFloat(arguments[0]["V"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.V,exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs); @@ -42,9 +42,9 @@ function ConstantVoltage() { break; } this.model.rpar = new ScilabDouble([this.V]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.V])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 61da6484..2de4f0ac 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'V' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 @@ -50,36 +52,36 @@ g5 sS'model.equations' p17 g8 -sS'model.equations.parameters[2]' -p18 -g15 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 +p19 g13 sS'model.rpar' -p21 +p20 g8 sS'V' -p22 +p21 g8 sS'typ' -p23 +p22 g13 sS'graphics' -p24 +p23 g2 sS'model.blocktype' -p25 +p24 g5 sS'mo' -p26 +p25 g8 sS'model.dep_ut' -p27 +p26 g13 +sS'model.equations.parameters[2-1]' +p27 +g15 sS'exprs' p28 g5 diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index d98e47e0..be762e26 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -43,8 +43,8 @@ function Diode() { this.Maxexp = parseFloat(arguments[0]["Maxexp"]) this.R = parseFloat(arguments[0]["R"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Ids,this.Vt,this.Maxexp,this.R,exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); @@ -53,8 +53,8 @@ function Diode() { } this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); this.model.equations.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index ca621468..0e45a349 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -2,20 +2,22 @@ c__builtin__ set p0 ((lp1 -S'Ids' +S'Maxexp' p2 -aS'Maxexp' +aS'Ids' p3 aS'R' p4 aS'Vt' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index aeba6720..1d717593 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -63,8 +63,8 @@ function Gyrator() { this.G1 = arguments[0]["G1"] this.G2 = arguments[0]["G2"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; var exprs = this.x.graphics.exprs; diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index 3902cab3..6de599d3 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -10,8 +10,10 @@ aS'G2' p4 aS'G1' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index df8ab379..f65858f6 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -61,8 +61,8 @@ function IdealTransformer() { IdealTransformer.prototype.set = function IdealTransformer() { this.N = arguments[0]["N"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; var exprs = this.x.graphics.exprs; diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 058113be..6420988c 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'N' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 2b9d4e20..b4f4c4bf 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -33,8 +33,8 @@ function Inductor() { Inductor.prototype.set = function Inductor() { this.L = parseFloat(arguments[0]["L"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.L,exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs); @@ -42,9 +42,9 @@ function Inductor() { break; } this.model.rpar = new ScilabDouble([this.L]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.L])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index 7ae983ab..6fd3d126 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'L' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 @@ -51,35 +53,35 @@ sS'model.equations' p16 S'double' p17 -sS'model.equations.parameters[2]' -p18 -g14 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 +p19 g8 sS'L' -p21 +p20 g17 sS'model.rpar' -p22 +p21 g17 sS'graphics.exprs' -p23 +p22 NsS'typ' -p24 +p23 g8 sS'model.blocktype' -p25 +p24 g5 sS'mo' -p26 +p25 g17 sS'model.dep_ut' -p27 +p26 g8 +sS'model.equations.parameters[2-1]' +p27 +g14 sS'exprs' p28 g5 diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 7e4d8ae2..d92186dd 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -57,17 +57,17 @@ function NMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { break; } - this.model.equations.parameters[2] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 92dc0817..9990c4ba 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -18,14 +18,16 @@ aS'Vt' p8 aS'W' p9 -aS'dW' +aS'graphics' p10 aS'x' p11 aS'model' p12 -atp13 -Rp14 +aS'dW' +p13 +atp14 +Rp15 .(dp0 S'arg1' p1 @@ -79,45 +81,45 @@ g7 sS'RDS' p21 g7 -sS'model.equations.parameters[2]' -p22 -g18 sS'mo.outputs' -p23 +p22 S'matrix' -p24 +p23 sS'x.graphics.out_implicit' -p25 -g24 +p24 +g23 sS'L' -p26 +p25 g7 sS'W' -p27 +p26 g7 sS'graphics.exprs' -p28 +p27 NsS'typ' -p29 +p28 g16 sS'dW' -p30 +p29 g7 sS'dL' -p31 +p30 g7 sS'model.blocktype' -p32 +p31 g5 sS'mo' -p33 +p32 g2 sS'model.dep_ut' -p34 +p33 g16 +sS'model.equations.parameters[2-1]' +p34 +g18 sS'exprs' p35 -g24 +g23 sS'gr_i' p36 g16 diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 1617b2f4..d2e8dde1 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -93,8 +93,8 @@ function NPN() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; var exprs = this.x.graphics.exprs; diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index 36212a2e..8930541b 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -34,14 +34,16 @@ aS'Vt' p16 aS'Br' p17 -aS'EMinMax' +aS'graphics' p18 -aS'x' +aS'EMinMax' p19 -aS'model' +aS'x' p20 -atp21 -Rp22 +aS'model' +p21 +atp22 +Rp23 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index a2bedf1e..fc529cb8 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -39,17 +39,17 @@ function OpAmp() { this.SatH = arguments[0]["SatH"] this.SatL = arguments[0]["SatL"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (false) { [ok,this.OLGain,this.SatH,this.SatL,exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { break; } - this.model.equations.parameters[2] = list(new ScilabDouble([this.OLGain]), new ScilabDouble([this.SatH]), new ScilabDouble([this.SatL])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.OLGain]), new ScilabDouble([this.SatH]), new ScilabDouble([this.SatL])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index 32c77948..4ca97336 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'SatH' +S'OLGain' p2 -aS'x' +aS'graphics' p3 -aS'model' +aS'SatH' p4 -aS'SatL' +aS'x' p5 -aS'OLGain' +aS'model' p6 -atp7 -Rp8 +aS'SatL' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 @@ -55,48 +57,48 @@ g5 sS'model.equations' p17 g8 -sS'model.equations.parameters[2]' -p18 -g15 sS'mo.outputs' -p19 +p18 S'vector' -p20 +p19 sS'x.graphics.out_implicit' -p21 -g20 +p20 +g19 sS'model.rpar' -p22 -g20 +p21 +g19 sS'S' -p23 -g20 +p22 +g19 sS'graphics.exprs' -p24 +p23 NsS'Z' -p25 -g20 +p24 +g19 sS'typ' -p26 -g20 +p25 +g19 sS'model.blocktype' -p27 +p26 g5 sS'mo' -p28 +p27 g2 sS'model.dep_ut' +p28 +g19 +sS'model.equations.parameters[2-1]' p29 -g20 +g15 sS'exprs' p30 g5 sS'gr_i' p31 -g20 +g19 sS'y' p32 -g20 +g19 sS'x' p33 g8 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 59dc456b..f783dab0 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -57,17 +57,17 @@ function PMOS() { this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { break; } - this.model.equations.parameters[2] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 92dc0817..9990c4ba 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -18,14 +18,16 @@ aS'Vt' p8 aS'W' p9 -aS'dW' +aS'graphics' p10 aS'x' p11 aS'model' p12 -atp13 -Rp14 +aS'dW' +p13 +atp14 +Rp15 .(dp0 S'arg1' p1 @@ -79,45 +81,45 @@ g7 sS'RDS' p21 g7 -sS'model.equations.parameters[2]' -p22 -g18 sS'mo.outputs' -p23 +p22 S'matrix' -p24 +p23 sS'x.graphics.out_implicit' -p25 -g24 +p24 +g23 sS'L' -p26 +p25 g7 sS'W' -p27 +p26 g7 sS'graphics.exprs' -p28 +p27 NsS'typ' -p29 +p28 g16 sS'dW' -p30 +p29 g7 sS'dL' -p31 +p30 g7 sS'model.blocktype' -p32 +p31 g5 sS'mo' -p33 +p32 g2 sS'model.dep_ut' -p34 +p33 g16 +sS'model.equations.parameters[2-1]' +p34 +g18 sS'exprs' p35 -g24 +g23 sS'gr_i' p36 g16 diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 8cccbb43..4166537b 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -93,8 +93,8 @@ function PNP() { this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; var exprs = this.x.graphics.exprs; diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index 36212a2e..8930541b 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -34,14 +34,16 @@ aS'Vt' p16 aS'Br' p17 -aS'EMinMax' +aS'graphics' p18 -aS'x' +aS'EMinMax' p19 -aS'model' +aS'x' p20 -atp21 -Rp22 +aS'model' +p21 +atp22 +Rp23 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index ebbfc7d4..381dc950 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -33,8 +33,8 @@ function Resistor() { Resistor.prototype.set = function Resistor() { this.R = parseFloat(arguments[0]["R"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.R,exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs); @@ -42,9 +42,9 @@ function Resistor() { break; } this.model.rpar = new ScilabDouble([this.R]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.R])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.R])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index 6b547a6b..c7940c9a 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'R' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 @@ -51,35 +53,35 @@ g5 sS'model.equations' p17 g8 -sS'model.equations.parameters[2]' -p18 -g15 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 +p19 g13 sS'model.rpar' -p21 +p20 g8 sS'R' -p22 +p21 g8 sS'graphics.exprs' -p23 +p22 NsS'typ' -p24 +p23 g13 sS'model.blocktype' -p25 +p24 g5 sS'mo' -p26 +p25 g2 sS'model.dep_ut' -p27 +p26 g13 +sS'model.equations.parameters[2-1]' +p27 +g15 sS'exprs' p28 g5 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 56ac2b5c..c479539f 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -46,8 +46,8 @@ function SineVoltage() { this.offset = parseFloat(arguments[0]["offset"]) this.start = parseFloat(arguments[0]["start"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.V,this.ph,this.frq,this.offset,this.start,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); @@ -55,9 +55,9 @@ function SineVoltage() { break; } this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.V]), new ScilabDouble([this.ph]), new ScilabDouble([this.frq]), new ScilabDouble([this.offset]), new ScilabDouble([this.start])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V]), new ScilabDouble([this.ph]), new ScilabDouble([this.frq]), new ScilabDouble([this.offset]), new ScilabDouble([this.start])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 43dfea75..db2b83d2 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -2,22 +2,24 @@ c__builtin__ set p0 ((lp1 -S'V' +S'graphics' p2 -aS'start' +aS'offset' p3 -aS'frq' +aS'start' p4 -aS'offset' +aS'frq' p5 -aS'x' +aS'V' p6 -aS'model' +aS'x' p7 -aS'ph' +aS'model' p8 -atp9 -Rp10 +aS'ph' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 @@ -71,36 +73,36 @@ g4 sS'model.equations' p21 g4 -sS'model.equations.parameters[2]' -p22 -g18 sS'mo.outputs' -p23 +p22 g6 sS'x.graphics.out_implicit' -p24 +p23 g9 sS'model.rpar' -p25 +p24 S'matrix' -p26 +p25 sS'graphics.exprs' -p27 +p26 NsS'typ' -p28 +p27 g9 sS'model.blocktype' -p29 +p28 g6 sS'graphics' -p30 +p29 g2 sS'model.dep_ut' -p31 +p30 g9 +sS'model.equations.parameters[2-1]' +p31 +g18 sS'exprs' p32 -g26 +g25 sS'gr_i' p33 g9 diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index e922c86e..927bd912 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -39,17 +39,17 @@ function Switch() { this.Ron = parseFloat(arguments[0]["Ron"]) this.Roff = parseFloat(arguments[0]["Roff"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Ron,this.Roff,exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs); if (!ok) { break; } - this.model.equations.parameters[2] = list(new ScilabDouble([this.Ron]), new ScilabDouble([this.Roff])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Ron]), new ScilabDouble([this.Roff])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index c5cb0a1a..478106f5 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -10,8 +10,10 @@ aS'Roff' p4 aS'Ron' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 @@ -53,54 +55,54 @@ g5 sS'model.equations' p17 g8 -sS'model.equations.parameters[2]' -p18 -g15 sS'mo.outputs' -p19 +p18 g5 sS'x.graphics.out_implicit' -p20 +p19 S'vector' -p21 +p20 sS'model.rpar' -p22 +p21 g8 sS'S' -p23 +p22 g12 sS'graphics.exprs' -p24 +p23 NsS'Z' -p25 +p24 g8 sS'typ' -p26 -g21 +p25 +g20 sS'model.blocktype' -p27 +p26 g5 sS'Roff' -p28 +p27 g8 sS'Ron' -p29 +p28 g8 sS'mo' -p30 +p29 g2 sS'model.dep_ut' +p30 +g20 +sS'model.equations.parameters[2-1]' p31 -g21 +g15 sS'exprs' p32 g5 sS'gr_i' p33 -g21 +g20 sS'y' p34 -g21 +g20 sS'x' p35 g8 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 8938dc9c..755932ea 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -35,8 +35,8 @@ function VVsourceAC() { VVsourceAC.prototype.set = function VVsourceAC() { this.FR = parseFloat(arguments[0]["FR"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs); @@ -44,9 +44,9 @@ function VVsourceAC() { break; } this.model.rpar = new ScilabDouble([this.FR]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.FR])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.FR])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index 37940c47..0d8e9a0a 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'FR' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'FR' p1 @@ -58,32 +60,32 @@ g2 sS'model.equations' p20 g2 -sS'model.equations.parameters[2]' -p21 -g18 sS'mo.outputs' -p22 +p21 g4 sS'x.graphics.out_implicit' -p23 +p22 g11 sS'model.rpar' -p24 +p23 g11 sS'graphics.exprs' -p25 +p24 NsS'typ' -p26 +p25 g11 sS'model.blocktype' -p27 +p26 g4 sS'mo' -p28 +p27 g2 sS'model.dep_ut' -p29 +p28 g11 +sS'model.equations.parameters[2-1]' +p29 +g18 sS'exprs' p30 g11 diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index b96151e9..6ed2395b 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -37,8 +37,8 @@ function VsourceAC() { this.VA = parseFloat(arguments[0]["VA"]) this.FR = parseFloat(arguments[0]["FR"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.VA,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs); @@ -46,9 +46,9 @@ function VsourceAC() { break; } this.model.rpar = new ScilabDouble([this.VA],[this.FR]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.VA]), new ScilabDouble([this.FR])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.VA]), new ScilabDouble([this.FR])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 20868c5c..59a36993 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'FR' -p4 aS'VA' +p4 +aS'FR' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'FR' p1 @@ -59,36 +61,36 @@ g2 sS'model.equations' p19 g2 -sS'model.equations.parameters[2]' -p20 -g17 sS'mo.outputs' -p21 +p20 g4 sS'x.graphics.out_implicit' -p22 +p21 g11 sS'model.rpar' -p23 +p22 S'matrix' -p24 +p23 sS'graphics.exprs' -p25 +p24 NsS'typ' -p26 +p25 g11 sS'model.blocktype' -p27 +p26 g4 sS'mo' -p28 +p27 g2 sS'model.dep_ut' -p29 +p28 g11 +sS'model.equations.parameters[2-1]' +p29 +g17 sS'exprs' p30 -g24 +g23 sS'gr_i' p31 g11 diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 24848fcb..4a6d30f3 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -26,8 +26,8 @@ function END_c() { END_c.prototype.set = function END_c() { this.tf = parseFloat(arguments[0]["tf"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tf,exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),exprs); @@ -35,9 +35,9 @@ function END_c() { break; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.tf]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle index 2ea5b116..a4f46284 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index a4a6f941..2efd3fc3 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -30,8 +30,8 @@ function EVTDLY_c() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.dt,this.ff,exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs); @@ -43,10 +43,10 @@ function EVTDLY_c() { var ok = false; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.firing = new ScilabDouble([this.ff]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle index 47f20274..60b471e4 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -10,8 +10,10 @@ aS'dt' p4 aS'ff' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index eb531d9c..dff6dabd 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -30,8 +30,8 @@ function EVTDLY_f() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.dt,this.ff,exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs); @@ -43,10 +43,10 @@ function EVTDLY_f() { var ok = false; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.ff]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle index 9668c749..55d2d19b 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -10,8 +10,10 @@ aS'dt' p4 aS'ff' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 6d387826..19c40114 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -25,19 +25,19 @@ function EVTGEN_f() { EVTGEN_f.prototype.set = function EVTGEN_f() { this.tt = parseFloat(arguments[0]["tt"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tt,exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); if (this.model.firing!=this.tt) { this.model.firing = new ScilabDouble([this.tt]); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle index b39db62c..50c53ccb 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'tt' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 2855497c..2116f270 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -26,17 +26,17 @@ function EVTVARDLY() { EVTVARDLY.prototype.set = function EVTVARDLY() { this.fir = arguments[0]["fir"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.fir,exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.fir]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index 8c91c11d..9d2598f9 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index f3796ca3..e891d796 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -26,8 +26,8 @@ function HALT_f() { HALT_f.prototype.set = function HALT_f() { this.n = parseFloat(arguments[0]["n"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.n,exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),exprs); @@ -35,9 +35,9 @@ function HALT_f() { break; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.n]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle index eea3c5a5..e639bd1c 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'n' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index a43df50f..be1e07ee 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -32,8 +32,8 @@ function IFTHEL_f() { this.inh = inverse(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (exprs==[]) { var exprs = string(1); @@ -53,17 +53,17 @@ function IFTHEL_f() { if (this.inh!=1) { this.inh = []; } - var tmpvar0 = check_io(this.model,graphics,1,[],this.inh,[[1],[1]]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,1,[],this.inh,[[1],[1]]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabString([exprs]); this.model.evtin = new ScilabDouble(this.inh); - this.model.sim[2] = new ScilabDouble([-1]); + this.model.sim[2-1] = new ScilabDouble([-1]); this.model.nmode = new ScilabDouble([this.nmod]); this.model.nzcross = new ScilabDouble([this.nmod]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index 39f28732..d2685e9e 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -10,8 +10,10 @@ aS'inh' p4 aS'nmod' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 @@ -72,12 +74,12 @@ g16 sS'model.nzcross' p24 g6 -sS'model.sim[2]' -p25 -g6 sS'model.blocktype' -p26 +p25 g16 +sS'model.sim[2-1]' +p26 +g6 sS'model.dep_ut' p27 g8 diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 65b4b868..333c096e 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -32,8 +32,8 @@ function MFCLCK_f() { this.dt = parseFloat(arguments[0]["dt"]) this.nn = parseFloat(arguments[0]["nn"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; [ok,this.dt,this.nn,exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),exprs); if (ok) { @@ -42,8 +42,8 @@ function MFCLCK_f() { var hh = this.model.firing; hh[2-1] = 0; this.model.firing = new ScilabDouble(hh); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; } return new BasicBlock(this.x); diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle index ef1a472e..ecb4e072 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -10,8 +10,10 @@ aS'dt' p4 aS'nn' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index b76b3d94..1b969936 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -29,9 +29,9 @@ function M_freq() { this.frequ = inverse(arguments[0]["frequ"]) this.offset = inverse(arguments[0]["offset"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),exprs); if (!ok) { @@ -50,32 +50,32 @@ function M_freq() { var ok = false; } if (ok) { - var tmpvar0 = mfrequ_clk(this.frequ,this.offset) - var m = tmpvar0[0] - var den = tmpvar0[1] - var off = tmpvar0[2] - var count = tmpvar0[3] - var m1 = tmpvar0[4] - var fir = tmpvar0[5] - this.frequ = tmpvar0[6] - this.offset = tmpvar0[7] + var tmpvar0 = mfrequ_clk(this.frequ,this.offset); + var m = tmpvar0[0]; + var den = tmpvar0[1]; + var off = tmpvar0[2]; + var count = tmpvar0[3]; + var m1 = tmpvar0[4]; + var fir = tmpvar0[5]; + this.frequ = tmpvar0[6]; + this.offset = tmpvar0[7]; var ok = tmpvar0[8]; } if (ok) { this.model.opar = list(m, new ScilabDouble([double(den)]), new ScilabDouble([off]), new ScilabDouble([count])); var mn = (2^size(m1,"*"))-1; - var tmpvar1 = set_io(this.model,graphics,list(),list(),1,ones(mn,1)) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = set_io(this.model,this.graphics,list(),list(),1,ones(mn,1)); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (mn>3) { - graphics.sz = [40+(mn-3)*10,40]; + this.graphics.sz = new ScilabDouble([40+(mn-3)*10,40]); } else { - graphics.sz = [50,40]; + this.graphics.sz = new ScilabDouble([50,40]); } this.model.firing = new ScilabDouble([fir]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle index 1b907d36..806b7dbd 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -8,14 +8,16 @@ aS'of' p3 aS'frequ' p4 -aS'offset' +aS'graphics' p5 -aS'x' +aS'offset' p6 -aS'model' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 7c42fa2a..06413e1f 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -13,61 +13,61 @@ function freq_div() { scs_m_1.objs[9-1] = scicos_link(); scs_m_1.objs[10-1] = scicos_link(); var blk = scs_m_1.objs[1-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [0,-100]; - graphics.sz = [60,40]; - graphics.exprs = [["0"],["3"]]; + this.graphics.orig = new ScilabDouble([0,-100]); + this.graphics.sz = new ScilabDouble([60,40]); + this.graphics.exprs = new ScilabDouble(["0"],["3"]); this.model.dstate = new ScilabDouble([3]); this.model.ipar = new ScilabDouble([3]); - graphics.pout = 7; - graphics.pein = 10; - blk.graphics = graphics; + this.graphics.pout = new ScilabDouble([7]); + this.graphics.pein = new ScilabDouble([10]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[1-1] = blk; var blk = scs_m_1.objs[2-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [120,0]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([120,0]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.peout = 6; - blk.graphics = graphics; + this.graphics.peout = new ScilabDouble([6]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[2-1] = blk; var blk = scs_m_1.objs[3-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [130,-160]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([130,-160]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.pein = 8; - blk.graphics = graphics; + this.graphics.pein = new ScilabDouble([8]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[3-1] = blk; var blk = scs_m_1.objs[4-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [100,-100]; - graphics.sz = [60,40]; - graphics.exprs = [["1"],["0"]]; + this.graphics.orig = new ScilabDouble([100,-100]); + this.graphics.sz = new ScilabDouble([60,40]); + this.graphics.exprs = new ScilabDouble(["1"],["0"]); this.model.ipar = new ScilabDouble([1]); - graphics.pin = 7; - graphics.pein = 9; - graphics.peout = [[0],[8]]; - blk.graphics = graphics; + this.graphics.pin = new ScilabDouble([7]); + this.graphics.pein = new ScilabDouble([9]); + this.graphics.peout = new ScilabDouble([0],[8]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[4-1] = blk; var blk = scs_m_1.objs[5-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [127,-33]; - graphics.sz = [7,7]; - graphics.pein = 6; - graphics.peout = [[9],[10]]; - blk.graphics = graphics; + this.graphics.orig = new ScilabDouble([127,-33]); + this.graphics.sz = new ScilabDouble([7,7]); + this.graphics.pein = new ScilabDouble([6]); + this.graphics.peout = new ScilabDouble([9],[10]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[5-1] = blk; var lnk = scs_m_1.objs[6-1]; @@ -136,8 +136,8 @@ function freq_div() { spath[$+1-1] = path; var xx = arg1[spath-1]; var xxn = xx; - var graphics = xx.graphics; - var exprs = graphics.exprs; + this.graphics = xx.graphics; + var exprs = this.graphics.exprs; this.model = xx.model; while (true) { [ok,%ph,%df,exprs] = scicos_getvalue("Set frequency division block parameters",["Phase (0 to division factor -1)","Division factor"],list("vec",1,"vec",1),exprs); @@ -152,10 +152,10 @@ function freq_div() { if (%ph>%df-1) { %ph = %df-1; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble(exprs); this.model.ipar = new ScilabDouble([%df]); this.model.dstate = new ScilabDouble([%ph]); - xxn.graphics = graphics; + xxn.graphics = this.graphics; xxn.model = this.model; break; } diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle index ff28fc58..f58dd424 100644 --- a/js/Events/freq_div.pickle +++ b/js/Events/freq_div.pickle @@ -10,8 +10,10 @@ aS'%df' p4 aS'%ph' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'lnk.ct' p1 diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 68683e2e..b961911e 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -62,8 +62,8 @@ function Bache() { this.T0 = parseFloat(arguments[0]["T0"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); @@ -71,9 +71,9 @@ function Bache() { break; } this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index e0877648..f8030454 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -18,14 +18,16 @@ aS'ze1' p8 aS'p_rho' p9 -aS'x' +aS'graphics' p10 -aS'model' +aS'x' p11 -aS'Patm' +aS'model' p12 -atp13 -Rp14 +aS'Patm' +p13 +atp14 +Rp15 .(dp0 S'arg1' p1 @@ -86,44 +88,44 @@ g5 sS'model.equations' p24 g8 -sS'model.equations.parameters[2]' -p25 -g20 sS'mo.outputs' -p26 +p25 g16 sS'x.graphics.out_implicit' -p27 +p26 g18 sS'in1' -p28 +p27 g8 sS'model.rpar' -p29 +p28 g18 sS'ze2' -p30 +p29 g8 sS'ze1' -p31 +p30 g8 sS'T0' -p32 +p31 g8 sS'graphics.exprs' -p33 +p32 NsS'typ' -p34 +p33 g16 sS'model.blocktype' -p35 +p34 g5 sS'mo' -p36 +p35 g2 sS'model.dep_ut' -p37 +p36 g16 +sS'model.equations.parameters[2-1]' +p37 +g20 sS'exprs' p38 g18 diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index e5efb188..170c1783 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -60,8 +60,8 @@ function Flowmeter() { Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; var exprs = this.x.graphics.exprs; diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 10b11b97..7abe7995 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'Qini' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 4a57604e..06572f67 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -51,8 +51,8 @@ function PerteDP() { this.z2 = parseFloat(arguments[0]["z2"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); @@ -60,9 +60,9 @@ function PerteDP() { break; } this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index 000a85a3..01934a26 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -8,18 +8,20 @@ aS'L' p3 aS'p_rho' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'z1' +aS'model' p7 -aS'z2' +aS'z1' p8 -aS'lambda' +aS'z2' p9 -atp10 -Rp11 +aS'lambda' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 @@ -64,45 +66,45 @@ g8 sS'D' p18 g8 -sS'model.equations.parameters[2]' -p19 -g15 sS'mo.outputs' -p20 +p19 g5 sS'x.graphics.out_implicit' -p21 +p20 g13 sS'L' -p22 +p21 g8 sS'model.rpar' -p23 +p22 S'matrix' -p24 +p23 sS'graphics.exprs' -p25 +p24 NsS'typ' -p26 +p25 g13 sS'z1' -p27 +p26 g8 sS'z2' -p28 +p27 g8 sS'model.blocktype' -p29 +p28 g5 sS'mo' -p30 +p29 g2 sS'model.dep_ut' -p31 +p30 g13 +sS'model.equations.parameters[2-1]' +p31 +g15 sS'exprs' p32 -g24 +g23 sS'gr_i' p33 g13 diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index ab5be777..6d995c71 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -40,8 +40,8 @@ function PuitsP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); @@ -49,9 +49,9 @@ function PuitsP() { break; } this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index 6a1af8f4..11b085ba 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -8,14 +8,16 @@ aS'H0' p3 aS'T0' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'option_temperature' +aS'model' p7 -atp8 -Rp9 +aS'option_temperature' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 @@ -60,33 +62,33 @@ g8 sS'model.equations' p18 g8 -sS'model.equations.parameters[2]' -p19 -g15 sS'model.rpar' -p20 +p19 S'matrix' -p21 +p20 sS'T0' -p22 +p21 g8 sS'graphics.exprs' -p23 +p22 NsS'typ' -p24 +p23 g11 sS'model.blocktype' -p25 +p24 g5 sS'mo' -p26 +p25 g2 sS'model.dep_ut' -p27 +p26 g11 +sS'model.equations.parameters[2-1]' +p27 +g15 sS'exprs' p28 -g21 +g20 sS'gr_i' p29 g11 diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index b622899e..66944673 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -42,8 +42,8 @@ function SourceP() { this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); @@ -51,9 +51,9 @@ function SourceP() { break; } this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index b4fa048c..083335be 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -8,14 +8,16 @@ aS'H0' p3 aS'T0' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'option_temperature' +aS'model' p7 -atp8 -Rp9 +aS'option_temperature' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 @@ -60,39 +62,39 @@ g8 sS'model.equations' p18 g8 -sS'model.equations.parameters[2]' -p19 -g15 sS'mo.outputs' -p20 +p19 g12 sS'x.graphics.out_implicit' -p21 +p20 g12 sS'model.rpar' -p22 +p21 S'matrix' -p23 +p22 sS'T0' -p24 +p23 g8 sS'graphics.exprs' -p25 +p24 NsS'typ' -p26 +p25 g12 sS'model.blocktype' -p27 +p26 g5 sS'mo' -p28 +p27 g2 sS'model.dep_ut' -p29 +p28 g12 +sS'model.equations.parameters[2-1]' +p29 +g15 sS'exprs' p30 -g23 +g22 sS'gr_i' p31 g12 diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 1810e7f5..27e498a2 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -39,8 +39,8 @@ function VanneReglante() { this.Cvmax = parseFloat(arguments[0]["Cvmax"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Cvmax,this.p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs); @@ -48,9 +48,9 @@ function VanneReglante() { break; } this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); - this.model.equations.parameters[2] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho])); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho])); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index 6e112bf2..ceb85ccf 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -10,8 +10,10 @@ aS'p_rho' p4 aS'Cvmax' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 @@ -57,32 +59,32 @@ g5 sS'model.equations' p19 g7 -sS'model.equations.parameters[2]' -p20 -g17 sS'mo.outputs' -p21 +p20 g5 sS'x.graphics.out_implicit' -p22 +p21 g13 sS'model.rpar' -p23 +p22 g15 sS'graphics.exprs' -p24 +p23 NsS'typ' -p25 +p24 g13 sS'model.blocktype' -p26 +p25 g5 sS'mo' -p27 +p26 g2 sS'model.dep_ut' -p28 +p27 g13 +sS'model.equations.parameters[2-1]' +p28 +g17 sS'exprs' p29 g15 diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 864bfaf7..63406fca 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -31,8 +31,8 @@ function BITCLEAR() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs); @@ -81,15 +81,15 @@ function BITCLEAR() { var it = this.Datatype; var ot = this.Datatype; var out = [1,1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index fc60b980..24c58589 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'bit' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index fd52e1bb..fa66ce48 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -31,8 +31,8 @@ function BITSET() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs); @@ -79,15 +79,15 @@ function BITSET() { var it = this.Datatype; var ot = this.Datatype; var out = [1,1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index fc60b980..24c58589 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'bit' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 94be655f..76f957bb 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -35,9 +35,9 @@ function CONVERT() { this.ot = parseFloat(arguments[0]["ot"]) this.np = arguments[0]["np"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.it,this.ot,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { @@ -368,14 +368,14 @@ function CONVERT() { var in1 = [this.model.in1,this.model.in2]; var out = [this.model.out,this.model.out2]; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(out,this.ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index b4be3cad..7e1aaf37 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'np' +S'it' p2 -aS'x' +aS'graphics' p3 -aS'model' +aS'np' p4 -aS'ot' +aS'x' p5 -aS'it' +aS'model' p6 -atp7 -Rp8 +aS'ot' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 4b6510ec..30036458 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -36,8 +36,8 @@ function EXTRACTBITS() { this.bit = parseFloat(arguments[0]["bit"]) this.scal = arguments[0]["scal"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.Datatype,this.rule,this.bit,this.scal,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),exprs); @@ -228,15 +228,15 @@ function EXTRACTBITS() { var it = this.Datatype; var ot = this.Datatype; var out = [1,1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index 08b5b345..c47eb37f 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -8,14 +8,16 @@ aS'Datatype' p3 aS'rule' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'bit' +aS'model' p7 -atp8 -Rp9 +aS'bit' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index e15748d6..1b704f2e 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -33,9 +33,9 @@ function INTMUL() { this.Datatype = arguments[0]["Datatype"] this.np = arguments[0]["np"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.Datatype,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),exprs); if (!ok) { @@ -101,15 +101,15 @@ function INTMUL() { var in1 = [this.model.in1,this.model.in2]; var out = [this.model.out,this.model.out2]; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.ipar = new ScilabDouble([this.np]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index 2a3298b8..187761c9 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'np' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 752d1d85..d8cb71c0 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -83,7 +83,7 @@ function JKFLIPFLOP() { } if (ok) { xx.graphics.exprs[1-1] = this.exprs0; - this.model.odstate[1] = new ScilabDouble([this.init]); + this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; arg1.model.rpar.objs[path-1] = xx; break; diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index 25ffe935..29deca35 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -13,201 +13,201 @@ p5 atp6 Rp7 .(dp0 -S'model.odstate[1]' +S'xx.model' p1 -S'double' +S'object' p2 -sS'xx.model' +sS'model.sim' p3 -S'object' +S'string' p4 -sS'model.sim' +sS'arg1' p5 -S'string' +g2 +sS'scs_m_1.objs[6-1]' p6 -sS'arg1' +S'double' p7 -g4 -sS'scs_m_1.objs[6-1]' -p8 -g2 sS'scs_m_1.objs[3-1]' +p8 +g7 +sS'xx.graphics' p9 g2 -sS'xx.graphics' -p10 -g4 sS'model.out' -p11 +p10 S'matrix' -p12 +p11 sS'xx' -p13 -g4 +p12 +g2 sS'o' -p14 -g4 -sS'scs_m_1.objs[7-1]' -p15 +p13 g2 +sS'scs_m_1.objs[7-1]' +p14 +g7 sS'xx.graphics.exprs[1-1]' -p16 +p15 NsS'scs_m.objs[20-1]' -p17 -g2 +p16 +g7 sS'scs_m.objs[2-1]' -p18 -g2 +p17 +g7 sS'scs_m.objs[5-1]' -p19 -g2 +p18 +g7 sS'scs_m.objs[10-1]' -p20 -g2 +p19 +g7 sS'scs_m' -p21 -g2 +p20 +g7 sS'model.in1' -p22 -g12 +p21 +g11 sS'scs_m.objs[19-1]' -p23 -g2 +p22 +g7 sS'scs_m.objs[1-1]' -p24 -g2 +p23 +g7 sS'scs_m.objs[18-1]' -p25 -g2 +p24 +g7 sS'model.dep_ut' -p26 +p25 S'vector' -p27 +p26 sS'newpar[size(newpar)+1-1]' -p28 -g2 +p27 +g7 sS'init' -p29 -g2 +p28 +g7 sS'scs_m_1' -p30 -g2 +p29 +g7 sS'scs_m.objs[22-1]' -p31 -g2 +p30 +g7 sS'scs_m_1.objs[2-1]' -p32 -g2 +p31 +g7 sS'init_old' -p33 -g2 +p32 +g7 sS'scs_m.objs[13-1]' -p34 -g2 +p33 +g7 sS'model.firing' -p35 +p34 S'boolean' -p36 +p35 sS'newpar' -p37 +p36 S'list' -p38 +p37 sS'model.in2' -p39 -g12 +p38 +g11 sS'scs_m.objs[6-1]' -p40 -g2 +p39 +g7 sS'scs_m.objs[9-1]' +p40 +g7 +sS'model.odstate[1-1]' p41 -g2 +g7 sS'model.out2' p42 -g12 +g11 sS'model.intyp' p43 -g27 +g26 sS'model.rpar' p44 -g2 +g7 sS'scs_m.objs[3-1]' p45 -g2 +g7 sS'scs_m_1.objs[4-1]' p46 -g2 +g7 sS'scs_m.objs[16-1]' p47 -g2 +g7 sS'scs_m.objs[11-1]' p48 -g2 +g7 sS'scs_m.objs[14-1]' p49 -g2 +g7 sS'scs_m.objs[17-1]' p50 -g2 +g7 sS'scs_m_1.objs[5-1]' p51 -g2 +g7 sS'path' p52 NsS'scs_m.objs[4-1]' p53 -g2 +g7 sS'scs_m.objs[7-1]' p54 -g2 +g7 sS'typ' p55 -g38 +g37 sS'model.outtyp' p56 -g27 +g26 sS'needcompile' p57 -g2 +g7 sS'arg1.model' p58 -g4 +g2 sS'model.blocktype' p59 -g6 +g4 sS'scs_m.objs[8-1]' p60 -g2 +g7 sS'scs_m.objs[15-1]' p61 -g2 +g7 sS'scs_m.objs[21-1]' p62 -g2 +g7 sS'scs_m_1.objs[1-1]' p63 -g2 +g7 sS'arg1.model.rpar.objs[path-1]' p64 -g4 +g2 sS'exprs' p65 -g2 +g7 sS'gr_i' p66 -g27 +g26 sS'scs_m.objs[12-1]' p67 -g2 +g7 sS'y' p68 -g2 +g7 sS'x' p69 -g2 +g7 sS'model' p70 -g4 +g2 sS'arg1.model.rpar' p71 -g4 +g2 s.
\ No newline at end of file diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 97898c8d..4c7ca2f2 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -34,8 +34,8 @@ function LOGIC() { this.mat = inverse(arguments[0]["mat"]) this.herit = arguments[0]["herit"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.mat,this.herit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),exprs); @@ -60,16 +60,16 @@ function LOGIC() { var out = [ones(nout,1),ones(nout,1)]; var it = 5*ones(1,nin); var ot = 5*ones(1,nout); - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.mat = int8(this.mat); this.model.opar = list(new ScilabDouble([this.mat])); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index 383d01ee..c2e52def 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -10,8 +10,10 @@ aS'herit' p4 aS'mat' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 5b6a4188..0096da1b 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -36,9 +36,9 @@ function SHIFT() { this.nb = arguments[0]["nb"] this.np = arguments[0]["np"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.Datatype,this.nb,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { @@ -118,15 +118,15 @@ function SHIFT() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([-1,-2],it),list([-1,-2],ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 0f8af58b..c5cb2ddf 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'nb' p3 -aS'model' +aS'graphics' p4 aS'np' p5 -aS'nb' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'OPER' p1 diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index db4dc223..6f9ade74 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -67,7 +67,7 @@ function SRFLIPFLOP() { } if (ok) { xx.graphics.exprs[1-1] = this.exprs0; - this.model.odstate[1] = new ScilabDouble([this.init]); + this.model.odstate[1-1] = new ScilabDouble([this.init]); xx.model = this.model; arg1.model.rpar.objs[path-1] = xx; break; diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index ceaa93a4..4bf38a8b 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -13,152 +13,152 @@ p5 atp6 Rp7 .(dp0 -S'model.odstate[1]' +S'xx.model' p1 -S'double' +S'object' p2 -sS'xx.model' +sS'model.sim' p3 -S'object' +S'string' p4 -sS'model.sim' +sS'arg1' p5 -S'string' +g2 +sS'xx.graphics' p6 -sS'arg1' +g2 +sS'model.out' p7 -g4 -sS'xx.graphics' +S'matrix' p8 -g4 -sS'model.out' +sS'xx' p9 -S'matrix' +g2 +sS'o' p10 -sS'xx' +g2 +sS'xx.graphics.exprs[1-1]' p11 -g4 -sS'o' +NsS'scs_m.objs[2-1]' p12 -g4 -sS'xx.graphics.exprs[1-1]' +S'double' p13 -NsS'scs_m.objs[2-1]' -p14 -g2 sS'scs_m.objs[5-1]' -p15 -g2 +p14 +g13 sS'scs_m.objs[10-1]' -p16 -g2 +p15 +g13 sS'scs_m' -p17 -g2 +p16 +g13 sS'model.in1' -p18 -g10 +p17 +g8 sS'scs_m.objs[1-1]' -p19 -g2 +p18 +g13 sS'model.dep_ut' -p20 +p19 S'vector' -p21 +p20 sS'newpar[size(newpar)+1-1]' -p22 +p21 NsS'init' -p23 -g2 +p22 +g13 sS'scs_m.objs[12-1]' -p24 -g2 +p23 +g13 sS'init_old' -p25 -g2 +p24 +g13 sS'scs_m.objs[13-1]' -p26 -g2 +p25 +g13 sS'newpar' -p27 +p26 S'list' -p28 +p27 sS'model.in2' -p29 -g10 +p28 +g8 sS'scs_m.objs[6-1]' -p30 -g2 +p29 +g13 sS'scs_m.objs[9-1]' +p30 +g13 +sS'model.odstate[1-1]' p31 -g2 +g13 sS'model.out2' p32 -g10 +g8 sS'model.intyp' p33 -g21 +g20 sS'model.rpar' p34 -g2 +g13 sS'scs_m.objs[3-1]' p35 -g2 +g13 sS'model.outtyp' p36 -g21 +g20 sS'scs_m.objs[11-1]' p37 -g2 +g13 sS'scs_m.objs[14-1]' p38 -g2 +g13 sS'path' p39 NsS'scs_m.objs[4-1]' p40 -g2 +g13 sS'scs_m.objs[7-1]' p41 -g2 +g13 sS'typ' p42 -g28 +g27 sS'needcompile' p43 -g2 +g13 sS'arg1.model' p44 -g4 +g2 sS'model.blocktype' p45 -g6 +g4 sS'scs_m.objs[8-1]' p46 -g2 +g13 sS'arg1.model.rpar.objs[path-1]' p47 -g4 +g2 sS'exprs' p48 -g2 +g13 sS'gr_i' p49 -g21 +g20 sS'model.firing' p50 S'boolean' p51 sS'y' p52 -g2 +g13 sS'x' p53 -g2 +g13 sS'model' p54 -g4 +g2 sS'arg1.model.rpar' p55 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index b0a75d52..1a8f47b6 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -25,23 +25,23 @@ function BIGSOM_f() { BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.sgn,exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),exprs); if (!ok) { break; } var in1 = -ones(size(this.sgn,"*"),1); - var tmpvar0 = check_io(this.model,graphics,in1,-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,in1,-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index a4b3bc4b..dab5333b 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'sgn' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'sgn' p1 diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 5edba5dd..2eb7da63 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -33,8 +33,8 @@ function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -54,14 +54,14 @@ function CLR() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; var rpar = [[matrix(A,ns1*ns1,1)],[matrix(B,ns1,1)],[matrix(C,ns1,1)],[D]]; if (norm(D,1)!=0) { @@ -79,7 +79,7 @@ function CLR() { } this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index a0c8eaad..26e70f19 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 0d56c799..86f80362 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -33,8 +33,8 @@ function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -54,14 +54,14 @@ function CLR_f() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; var rpar = [[matrix(A,ns1*ns1,1)],[matrix(B,ns1,1)],[matrix(C,ns1,1)],[D]]; if (norm(D,1)!=0) { @@ -79,7 +79,7 @@ function CLR_f() { } this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index a0c8eaad..26e70f19 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 3c095238..1d417592 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -41,8 +41,8 @@ function CLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -60,8 +60,8 @@ function CLSS() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; var okD = true; if (size(this.D,"*")!=size(this.C,1)*size(this.B,2)) { @@ -76,12 +76,12 @@ function CLSS() { if (ms!=ns||!okD) { message(_("Matrix A is not square or D has wrong dimension")); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -97,7 +97,7 @@ function CLSS() { } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 321fe50f..fd7725aa 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 09f6465f..de3fd53e 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -41,8 +41,8 @@ function CLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -60,18 +60,18 @@ function CLSS_f() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -87,7 +87,7 @@ function CLSS_f() { } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 5800baa1..1746730e 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 6e3ada84..fe839f0d 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -37,8 +37,8 @@ function DELAYV_f() { this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.nin = this.model.in1[1-1]; var z0 = this.model.dstate; @@ -58,16 +58,16 @@ function DELAYV_f() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[[this.nin],[1]],this.nin,1,[[1],[1]]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[[this.nin],[1]],this.nin,1,[[1],[1]]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.zz0.slice()],[told]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index caf0384e..b7b3bf9b 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'zz0' p3 -aS'nin' -p4 aS'T' +p4 +aS'graphics' p5 -aS'zz0' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 057264bf..8f18e1a8 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -28,8 +28,8 @@ function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; @@ -50,11 +50,11 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 6422fab4..89e4ed9e 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'x0' -p4 aS'xd0' +p4 +aS'x0' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 2f686ae0..d28ee566 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -34,8 +34,8 @@ function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); @@ -52,14 +52,14 @@ function DLR() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); @@ -77,7 +77,7 @@ function DLR() { if (or(this.model.dep_ut!=mmm)) { this.model.dep_ut = new ScilabDouble(mmm); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index 8a5f2aa6..fb9f58b1 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index f2702d0e..07b4f8c7 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -34,8 +34,8 @@ function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); @@ -52,14 +52,14 @@ function DLR_f() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); @@ -77,7 +77,7 @@ function DLR_f() { if (or(this.model.dep_ut!=mmm)) { this.model.dep_ut = new ScilabDouble(mmm); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 44d413c7..78175358 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index eb201209..c3145a36 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -40,8 +40,8 @@ function DLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -59,8 +59,8 @@ function DLSS() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; var okD = true; if (size(this.D,"*")!=size(this.C,1)*size(this.B,2)) { @@ -75,12 +75,12 @@ function DLSS() { if (ms!=ns||!okD) { message(_("Matrix A is not square or D has wrong dimension")); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -96,7 +96,7 @@ function DLSS() { } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 2dfb7e72..00de4180 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 84024be5..6842290e 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -40,8 +40,8 @@ function DLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -59,18 +59,18 @@ function DLSS_f() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -86,7 +86,7 @@ function DLSS_f() { } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index c8c627de..d32ef081 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 15ecd057..4d0a382c 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -31,8 +31,8 @@ function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<2) { exprs[2-1] = "0"; @@ -86,14 +86,14 @@ function DOLLAR() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 032d6ef5..3b29c2b1 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'inh' p3 -aS'model' +aS'graphics' p4 -aS'inh' +aS'x' p5 -aS'type' +aS'model' p6 -atp7 -Rp8 +aS'type' +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index bdc2ea92..e9ef5da5 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -31,8 +31,8 @@ function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<2) { exprs[2-1] = "0"; @@ -48,17 +48,17 @@ function DOLLAR_f() { } var in1 = out; if (ok) { - var tmpvar0 = check_io(this.model,graphics,-1,-1,ones(1-this.inh,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-1,-1,ones(1-this.inh,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index 3693edac..2d4dde29 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'inh' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 34d93154..fa02bcf1 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -31,8 +31,8 @@ function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<2) { exprs[2-1] = "0"; @@ -86,14 +86,14 @@ function DOLLAR_m() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 032d6ef5..3b29c2b1 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'inh' p3 -aS'model' +aS'graphics' p4 -aS'inh' +aS'x' p5 -aS'type' +aS'model' p6 -atp7 -Rp8 +aS'type' +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index e84f60ef..3cdb1087 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -34,8 +34,8 @@ function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==1) { var exprs = [[exprs],[sci2exp(0)]]; @@ -137,24 +137,24 @@ function GAINBLK() { this.model.opar = list(this.gain.slice()); } if (ok) { - var tmpvar0 = size(this.gain) - var out = tmpvar0[0] + var tmpvar0 = size(this.gain); + var out = tmpvar0[0]; var in1 = tmpvar0[1]; if (out*in1!=1) { - var tmpvar1 = set_io(this.model,graphics,list([in1,-1],ot),list([out,-1],ot),[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = set_io(this.model,this.graphics,list([in1,-1],ot),list([out,-1],ot),[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; } else { - var tmpvar2 = set_io(this.model,graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]) - this.model = tmpvar2[0] - var graphics = tmpvar2[1] + var tmpvar2 = set_io(this.model,this.graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]); + this.model = tmpvar2[0]; + this.graphics = tmpvar2[1]; var ok = tmpvar2[2]; } } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index 4d9f0cbf..f102ec25 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -10,8 +10,10 @@ aS'over' p4 aS'gain' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 614fc461..a2525140 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -28,8 +28,8 @@ function GAINBLK_f() { GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); @@ -39,17 +39,17 @@ function GAINBLK_f() { if (this.gain==[]) { message("Gain must have at least one element"); } else { - var tmpvar0 = size(this.gain) - var out = tmpvar0[0] + var tmpvar0 = size(this.gain); + var out = tmpvar0[0]; var in1 = tmpvar0[1]; - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index c9ead743..093ec5d1 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'gain' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 25b99662..d6f8880f 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -28,8 +28,8 @@ function GAIN_f() { GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); @@ -39,17 +39,17 @@ function GAIN_f() { if (this.gain==[]) { message("Gain must have at least one element"); } else { - var tmpvar0 = size(this.gain) - var out = tmpvar0[0] + var tmpvar0 = size(this.gain); + var out = tmpvar0[0]; var in1 = tmpvar0[1]; - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index e204ca44..f5ef8591 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'gain' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 9fc1fc16..177029f6 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -38,8 +38,8 @@ function INTEGRAL() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); @@ -82,14 +82,14 @@ function INTEGRAL() { if (ok) { this.model.rpar = new ScilabDouble(rpar); this.model.state = new ScilabDouble(this.x0); - var tmpvar0 = check_io(this.model,graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 7fadba67..715932be 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -10,14 +10,16 @@ aS'satur' p4 aS'lowp' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 5c4b7197..4c0836d1 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -25,17 +25,17 @@ function INTEGRAL_f() { INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 6112b9f9..9f391ce4 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'x0' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 75ed7a6f..2cc71ad9 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -39,8 +39,8 @@ function INTEGRAL_m() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); @@ -124,15 +124,15 @@ function INTEGRAL_m() { if (ok) { var in1 = [size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,2)*[[1],[ones(this.reinit,1)]]]; var out = size(this.x0); - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.reinit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(this.reinit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 7538823d..70608a46 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -10,14 +10,16 @@ aS'satur' p4 aS'lowp' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 54f732f1..0a5a8d40 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -29,8 +29,8 @@ function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,1)==1) { var exprs = [[exprs],[sci2exp(1)]]; @@ -77,14 +77,14 @@ function REGISTER() { } if (ok) { var in1 = [1,1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 7d82ed1e..2798b374 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -10,8 +10,10 @@ aS'z0' p4 aS'it' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index da798aa3..e0e94fb4 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -26,8 +26,8 @@ function REGISTER_f() { REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.z0,exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),exprs); @@ -39,9 +39,9 @@ function REGISTER_f() { var ok = false; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index 961e104f..f2f06042 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'z0' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 7d183a79..1dc31704 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -30,8 +30,8 @@ function SAMPHOLD_m() { this.it = arguments[0]["it"] this.x = arg1; this.x.model.firing = []; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.it,exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); @@ -44,13 +44,13 @@ function SAMPHOLD_m() { } if (ok) { var in1 = [this.model.in1,this.model.in2]; - var tmpvar0 = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index c7f11ba6..3b628187 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'it' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index d7450565..2cd2b7bf 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -24,16 +24,16 @@ function SOM_f() { } SOM_f.prototype.set = function SOM_f() { this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; } if (size(exprs,"*")!=3) { var exprs = string(this.model.rpar); } - if (graphics.flip) { + if (this.graphics.flip) { var labs = ["down","left","up"]; } else { var labs = ["down","right","up"]; diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 4663fc19..4b1a3d37 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 96182040..4f8390c6 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -32,9 +32,9 @@ function SUMMATION() { this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; if (size(exprs,1)==1) { var exprs = [[sci2exp(1)],[exprs],[sci2exp(0)]]; } else if (size(exprs,1)==2) { @@ -133,16 +133,16 @@ function SUMMATION() { } } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.rpar = new ScilabDouble([this.satur]); this.model.ipar = new ScilabDouble([this.sgn]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 9645ce38..a06d452b 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'graphics' p3 -aS'model' -p4 aS'satur' -p5 +p4 aS'sgn' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 552810c5..980ca35b 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -43,8 +43,8 @@ function TCLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; @@ -62,18 +62,18 @@ function TCLSS() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,[[in1],[ms]],out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,[[in1],[ms]],out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -94,7 +94,7 @@ function TCLSS() { } else { this.model.sim = list(new ScilabString(["tcsltj4"]), new ScilabDouble([4])); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index 24d42f9f..bea58fef 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index da69f8aa..fbed9355 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -43,8 +43,8 @@ function TCLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; @@ -62,18 +62,18 @@ function TCLSS_f() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,[[in1],[ms]],out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,[[in1],[ms]],out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -94,7 +94,7 @@ function TCLSS_f() { } else { this.model.sim = list(new ScilabString(["tcsltj"]), new ScilabDouble([1])); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index 24d42f9f..bea58fef 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index a4cee6f2..157612ae 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -34,8 +34,8 @@ function TIME_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { @@ -52,17 +52,17 @@ function TIME_DELAY() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[-1],-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[-1],-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabDouble([false,true]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index b4c2bf5b..6c948019 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'N' p2 -aS'model' -p3 aS'init' -p4 +p3 aS'T' +p4 +aS'graphics' p5 -aS'N' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index ef78520f..35b7cff9 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -34,8 +34,8 @@ function VARIABLE_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { @@ -52,16 +52,16 @@ function VARIABLE_DELAY() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[[-1],[1]],-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[[-1],[1]],-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 7f7ec489..8960040c 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'N' p2 -aS'model' -p3 aS'init' -p4 +p3 aS'T' +p4 +aS'graphics' p5 -aS'N' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 08dc68c9..84ce2655 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -41,8 +41,8 @@ function CUMSUM() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -89,16 +89,16 @@ function CUMSUM() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 071f5cfc..338fcc0d 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'graphics' p3 -aS'typ' +aS'x' p4 -aS'lab' +aS'model' p5 -aS'decomptyp' +aS'typ' p6 -atp7 -Rp8 +aS'decomptyp' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 9839cb99..4085179b 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -41,8 +41,8 @@ function EXTRACT() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -90,13 +90,13 @@ function EXTRACT() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index 3ab6adf0..6c926aa4 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'b' p3 -aS'model' +aS'graphics' p4 -aS'b' +aS'x' p5 -aS'typ' +aS'model' p6 -atp7 -Rp8 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 28ad3677..73389965 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -41,8 +41,8 @@ function EXTTRI() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -86,16 +86,16 @@ function EXTTRI() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 2c5c8a8f..3ea8ad2d 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'graphics' p3 -aS'typ' +aS'x' p4 -aS'lab' +aS'model' p5 -aS'decomptyp' +aS'typ' p6 -atp7 -Rp8 +aS'decomptyp' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 3e5efd96..a9c5926d 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -37,8 +37,8 @@ function MATBKSL() { MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATBKSL() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index d6584a86..9b1a505d 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 7eb28d79..a7998608 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -39,8 +39,8 @@ function MATCATH() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; } @@ -54,15 +54,15 @@ function MATCATH() { var out = [-1,0]; var it = -1*(ones(this.nin,1)); var ot = -1; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index 47afdfa1..e22f5432 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -10,8 +10,10 @@ aS'nin' p4 aS'lab' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index dfe4cfcd..8b8e49b2 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -40,8 +40,8 @@ function MATCATV() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; } @@ -55,15 +55,15 @@ function MATCATV() { var it = -ones(this.nin,1); var ot = -1; var out = [0,-1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { var funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index ead836c3..797f7102 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -10,8 +10,10 @@ aS'nin' p4 aS'lab' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index f3a4fa9d..1a429089 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -37,8 +37,8 @@ function MATDET() { MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATDET() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 42a969d6..c3b2baef 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index a9775a91..4d4fc28f 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -37,8 +37,8 @@ function MATDIAG() { MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATDIAG() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 42a969d6..c3b2baef 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index c43b1e89..d8452298 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -37,8 +37,8 @@ function MATDIV() { MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATDIV() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index d6584a86..9b1a505d 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 1e605fd8..f41bc778 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -41,8 +41,8 @@ function MATEIG() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -87,16 +87,16 @@ function MATEIG() { var in1 = [-1,-1]; var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index fa38deab..9432c5b4 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'graphics' p3 -aS'typ' +aS'x' p4 -aS'lab' +aS'model' p5 -aS'decomptyp' +aS'typ' p6 -atp7 -Rp8 +aS'decomptyp' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index a01ec75a..ad5d0d01 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -37,8 +37,8 @@ function MATEXPM() { MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATEXPM() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 42a969d6..c3b2baef 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 3986609c..a99b1d51 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -37,8 +37,8 @@ function MATINV() { MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATINV() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 42a969d6..c3b2baef 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 63965b50..db897eb0 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -39,8 +39,8 @@ function MATLU() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -62,16 +62,16 @@ function MATLU() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = this.lab; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([this.lab]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index afb20bf7..56af5dd5 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -10,8 +10,10 @@ aS'typ' p4 aS'lab' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 93992460..af24ba07 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -39,8 +39,8 @@ function MATMAGPHI() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -68,16 +68,16 @@ function MATMAGPHI() { } var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 689495ae..df67a466 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -10,8 +10,10 @@ aS'lab' p4 aS'decomptyp' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index fac108ea..e30a6e2c 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -30,8 +30,8 @@ function MATMUL() { this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) this.x = arg1; - var graphics = this.x.graphics; - var label = graphics.exprs; + this.graphics = this.x.graphics; + var label = this.graphics.exprs; this.model = this.x.model; if (this.model.ipar==[]) { this.model.ipar = new ScilabDouble([1]); @@ -146,16 +146,16 @@ function MATMUL() { var in1 = [[-1,-2],[1,1]]; var out = [-1,-2]; } - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { var label = exprs; this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([kmin],[kmax]); - graphics.exprs = label; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + this.x.graphics = this.graphics; this.x.model = this.model; var arg1 = this.x; break; diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index 31523949..5c93b78c 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'np' +S'dtype' p2 -aS'x' +aS'rule' p3 -aS'model' +aS'graphics' p4 -aS'rule' +aS'np' p5 -aS'dtype' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 41dcdc64..d0a39209 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -37,8 +37,8 @@ function MATPINV() { MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -65,13 +65,13 @@ function MATPINV() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 42a969d6..c3b2baef 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index a369ebfe..4fdeb46d 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -43,8 +43,8 @@ function MATRESH() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -91,16 +91,16 @@ function MATRESH() { } if (ok) { var label = this.lab; - var tmpvar0 = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(this.l1,it),list(this.out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index f8f86478..7ad4ecdc 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -2,20 +2,22 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'graphics' p2 -aS'l1' +aS'lab' p3 -aS'x' +aS'l1' p4 -aS'model' +aS'x' p5 -aS'typ' +aS'model' p6 -aS'out' +aS'typ' p7 -atp8 -Rp9 +aS'out' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 217bfa44..8e14ea57 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -41,8 +41,8 @@ function MATSING() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -90,16 +90,16 @@ function MATSING() { } var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index fa38deab..9432c5b4 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'graphics' p3 -aS'typ' +aS'x' p4 -aS'lab' +aS'model' p5 -aS'decomptyp' +aS'typ' p6 -atp7 -Rp8 +aS'decomptyp' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 41531c10..a95a6c39 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -41,8 +41,8 @@ function MATSUM() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -91,16 +91,16 @@ function MATSUM() { var in1 = [this.model.in1,this.model.in2]; var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 071f5cfc..338fcc0d 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'graphics' p3 -aS'typ' +aS'x' p4 -aS'lab' +aS'model' p5 -aS'decomptyp' +aS'typ' p6 -atp7 -Rp8 +aS'decomptyp' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index c731d6ba..6f907f60 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -27,8 +27,8 @@ function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==1) { label[2-1] = sci2exp(1); @@ -59,13 +59,13 @@ function MATTRAN() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index c78ddced..74052d9a 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -10,8 +10,10 @@ aS'typ' p4 aS'rule' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 9aa71803..f49bd4ef 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -39,8 +39,8 @@ function MATZREIM() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -68,16 +68,16 @@ function MATZREIM() { } var funtyp = 4; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 9e408e2d..c93ae0ba 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -10,8 +10,10 @@ aS'lab' p4 aS'decomptyp' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 8ab320ba..6de43443 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -39,8 +39,8 @@ function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -55,14 +55,14 @@ function RICC() { var it = [1,1,1]; var ot = 1; var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble([this.tpe],[this.mod]); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 57262a2c..fe948957 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'tpe' -p4 aS'mod' +p4 +aS'tpe' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 661b496d..9a3dfdf0 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -39,8 +39,8 @@ function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -67,13 +67,13 @@ function ROOTCOEF() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 22aed3f5..a97ea3e1 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -10,8 +10,10 @@ aS'typ' p4 aS'inp' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 3f6acb79..69eaf16c 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -27,8 +27,8 @@ function SQRT() { SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.typ,exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); @@ -50,13 +50,13 @@ function SQRT() { var funtyp = 4; if (ok) { var label = exprs; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index 9d3a8e10..3955b075 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index ce83e0f3..473b975f 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -47,8 +47,8 @@ function SUBMAT() { this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); @@ -96,13 +96,13 @@ function SUBMAT() { var funtyp = 4; var label = exprs; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 2889adb4..1f58e269 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -12,14 +12,16 @@ aS'd' p5 aS'inp' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'x' p8 -aS'typ' +aS'model' p9 -atp10 -Rp11 +aS'typ' +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 8d6bbe78..08e86247 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -37,8 +37,8 @@ function AUTOMAT() { } AUTOMAT.prototype.set = function AUTOMAT() { this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var NMode = ipar[1-1]; @@ -74,8 +74,8 @@ function AUTOMAT() { messagebox("the size of intial continuous-time states should be NX="+string(NX),"modal","error"); var ModifEncore = true; } - var tmpvar0 = size(this.XP) - var rXP = tmpvar0[0] + var tmpvar0 = size(this.XP); + var rXP = tmpvar0[0]; var cXP = tmpvar0[1]; if (cXP!=NX) { messagebox("Xproperty matrix is not valid: it should have NX="+string(NX)+" columns","modal","error"); @@ -122,18 +122,18 @@ function AUTOMAT() { } } if (!ModifEncore) { - var tmpvar1 = check_io(this.model,graphics,INP,OUT,[],[1]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,INP,OUT,[],[1]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; this.ok = tmpvar1[2]; if (!this.ok) { break; } this.model.nzcross = new ScilabDouble([nzcross]); this.model.state = new ScilabDouble([ones(2*NX,1)]); - graphics.gr_i[1-1][1-1] = "txt=[\'Automaton\';\'nM="+string(NMode)+",nX="+string(NX)+"\'];"; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Automaton\';\'nM="+string(NMode)+",nX="+string(NX)+"\'];"]); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); this.x.model = this.model; diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index 2ff4f2eb..c3ca7ffb 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -6,16 +6,18 @@ S'ok' p2 aS'X0' p3 -aS'x' +aS'graphics' p4 -aS'XP' +aS'x' p5 -aS'model' +aS'XP' p6 -aS'Minitial' +aS'model' p7 -atp8 -Rp9 +aS'Minitial' +p8 +atp9 +Rp10 .(dp0 S'NMode_old' p1 diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index e28d371d..cfa11318 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -30,8 +30,8 @@ function BACKLASH() { this.gap = arguments[0]["gap"] this.zcr = arguments[0]["zcr"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; while (true) { @@ -40,7 +40,7 @@ function BACKLASH() { break; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); rpar[1-1] = this.ini; rpar[2-1] = this.gap; if (this.zcr!=0) { @@ -49,7 +49,7 @@ function BACKLASH() { this.model.nzcross = new ScilabDouble([0]); } this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle index 83e5a744..fcfc7b0f 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gap' p2 -aS'model' -p3 aS'ini' -p4 +p3 aS'zcr' +p4 +aS'graphics' p5 -aS'gap' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index ab517e1f..0f4e7ea3 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -66,8 +66,8 @@ function BOUNCE() { this.g = parseFloat(arguments[0]["g"]) this.C = parseFloat(arguments[0]["C"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<9) { exprs[8-1] = "9.81"; @@ -102,9 +102,9 @@ function BOUNCE() { if (!ok) { break; } - var tmpvar0 = check_io(this.model,graphics,[],[n,n],[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[],[n,n],[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { var k = 1; @@ -123,8 +123,8 @@ function BOUNCE() { var state = transpose(state); this.model.state = new ScilabDouble(state.slice()); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index 18a1958e..2cc8bc69 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -16,16 +16,18 @@ aS'rpar1' p7 aS'rpar2' p8 -aS'y' +aS'graphics' p9 -aS'x' +aS'y' p10 -aS'model' +aS'x' p11 -aS'xt' +aS'model' p12 -atp13 -Rp14 +aS'xt' +p13 +atp14 +Rp15 .(dp0 S'arg1' p1 diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 826790d9..5935fb23 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -61,8 +61,8 @@ function BOUNCEXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { @@ -104,8 +104,8 @@ function BOUNCEXY() { this.model.dstate = new ScilabDouble(z); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle index 4e5411e5..62742bd1 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -4,26 +4,28 @@ p0 ((lp1 S'clrs' p2 -aS'siz' +aS'imode' p3 aS'ymax' p4 -aS'imode' +aS'win' p5 -aS'xmax' +aS'graphics' p6 -aS'win' +aS'xmax' p7 -aS'xmin' +aS'siz' p8 -aS'x' +aS'xmin' p9 -aS'model' +aS'x' p10 -aS'ymin' +aS'model' p11 -atp12 -Rp13 +aS'ymin' +p12 +atp13 +Rp14 .(dp0 S'clrs' p1 diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index f708c217..4a57274b 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -45,8 +45,8 @@ function BPLATFORM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { @@ -72,8 +72,8 @@ function BPLATFORM() { } else { var rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; this.model.rpar = new ScilabDouble(rpar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle index 911c5338..2987ee09 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -8,20 +8,22 @@ aS'ymax' p3 aS'csiz' p4 -aS'xmax' +aS'graphics' p5 -aS'plen' +aS'xmax' p6 -aS'xmin' +aS'plen' p7 -aS'x' +aS'xmin' p8 -aS'model' +aS'x' p9 -aS'ymin' +aS'model' p10 -atp11 -Rp12 +aS'ymin' +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index b8371ec1..56d861f1 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -72,8 +72,8 @@ function CBLOCK() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.i,this.o,this.ci,this.co,this.xx,this.ng,this.z,this.rpar,this.ipar,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block2 block parameters",["simulation function","is block implicit? (y,n)","input ports sizes","output ports sizes","input event ports sizes","output events ports sizes","initial continuous state","number of zero crossing surfaces","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label[1-1]); if (!ok) { @@ -126,18 +126,18 @@ function CBLOCK() { } var tt = label[2-1]; while (true) { - var tmpvar0 = CFORTR2(funam,tt) - var ok = tmpvar0[0] - var tt = tmpvar0[1] + var tmpvar0 = CFORTR2(funam,tt); + var ok = tmpvar0[0]; + var tt = tmpvar0[1]; var cancel = tmpvar0[2]; if (!ok) { if (cancel) { break; } } else { - var tmpvar1 = check_io(this.model,graphics,this.i,this.o,this.ci,this.co) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,this.i,this.o,this.ci,this.co); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); @@ -154,8 +154,8 @@ function CBLOCK() { this.model.nzcross = new ScilabDouble([this.ng]); label[2-1] = tt; this.x.model = this.model; - graphics.exprs = label; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index 3aefc656..30384555 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -28,16 +28,18 @@ aS'lab' p13 aS'ipar' p14 -aS'x' +aS'graphics' p15 -aS'model' +aS'x' p16 -aS'z' +aS'model' p17 -aS'function_name' +aS'z' p18 -atp19 -Rp20 +aS'function_name' +p19 +atp20 +Rp21 .(dp0 S'ci' p1 diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 5858a1a8..6eb3e3f8 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -66,8 +66,8 @@ function CBLOCK4() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.in1,this.it,this.out,this.ot,this.ci,this.co,this.xx,this.z,this.oz,this.rpar,this.ipar,this.opar,this.nmode,this.nzcr,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block4 block parameters",["Simulation function","Is block implicit? (y,n)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label[1-1]); if (!ok) { @@ -117,16 +117,16 @@ function CBLOCK4() { var tt = []; } var tt = label[2-1]; - var tmpvar0 = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { while (true) { - var tmpvar1 = CC4(funam,tt) - var ok = tmpvar1[0] - var tt = tmpvar1[1] + var tmpvar1 = CC4(funam,tt); + var ok = tmpvar1[0]; + var tt = tmpvar1[1]; var cancel = tmpvar1[2]; if (!ok) { if (cancel) { @@ -146,8 +146,8 @@ function CBLOCK4() { this.model.dep_ut = new ScilabDouble(dep_ut); label[2-1] = tt; this.x.model = this.model; - graphics.exprs = label; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index 791d370c..3d6d9b19 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -22,32 +22,34 @@ aS'lab' p10 aS'it' p11 -aS'nmode' +aS'graphics' p12 -aS'z' +aS'nmode' p13 -aS'xx' +aS'z' p14 -aS'nzcr' +aS'xx' p15 -aS'depu' +aS'nzcr' p16 -aS'dept' +aS'depu' p17 -aS'opar' +aS'dept' p18 -aS'oz' +aS'opar' p19 -aS'ipar' +aS'oz' p20 -aS'x' +aS'ipar' p21 -aS'model' +aS'x' p22 -aS'ot' +aS'model' p23 -atp24 -Rp25 +aS'ot' +p24 +atp25 +Rp26 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 7c2b0af5..46f2c4d7 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -33,8 +33,8 @@ function CONSTRAINT2_c() { this.xd0 = inverse(arguments[0]["xd0"]) this.id = inverse(arguments[0]["id"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; @@ -69,12 +69,12 @@ function CONSTRAINT2_c() { } } if (!ask_again) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); this.model.in1 = new ScilabDouble([N]); this.model.ipar = new ScilabDouble(this.id); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index 548ac2ec..7a2e7cce 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'id' +S'graphics' p2 -aS'x' +aS'x0' p3 -aS'model' +aS'xd0' p4 -aS'x0' +aS'x' p5 -aS'xd0' +aS'model' p6 -atp7 -Rp8 +aS'id' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 52113803..fa704f34 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -26,8 +26,8 @@ function CONSTRAINT_c() { CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { this.x0 = inverse(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),exprs); @@ -39,17 +39,17 @@ function CONSTRAINT_c() { if (N<=0) { message("number of states (constraints) must be > 0 "); } else { - var tmpvar0 = check_io(this.model,graphics,N,N,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,N,N,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); this.model.ipar = new ScilabDouble([-1*ones(N,1)]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 25921f7b..a9334e1a 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'x0' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index b4bab67a..151ee357 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -34,8 +34,8 @@ function DEADBAND() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); @@ -54,8 +54,8 @@ function DEADBAND() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle index 85a82e98..19b594d5 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'minp' +S'zeroc' p2 -aS'x' +aS'maxp' p3 -aS'model' +aS'graphics' p4 -aS'zeroc' +aS'minp' p5 -aS'maxp' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index fd7e7507..7f507143 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -19,12 +19,12 @@ function DEBUG() { } DEBUG.prototype.set = function DEBUG() { this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; var textmp = exprs[2-1]; var ok = true; while (1==1) { - var tmpvar0 = dialog([["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]],textmp) + var tmpvar0 = dialog([["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]],textmp); var txt = tmpvar0[0]; if (txt!=[]) { var tt = ["block=debug_scicos(block,flag)"]; @@ -47,8 +47,8 @@ function DEBUG() { } } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; } return new BasicBlock(this.x); } diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle index f87b24a9..6259a30b 100644 --- a/js/Misc/DEBUG.pickle +++ b/js/Misc/DEBUG.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'TMPDIR' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'exprs[2-1]' p1 diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js index 96f7b940..8400a7cd 100644 --- a/js/Misc/DEBUG_SCICOS.js +++ b/js/Misc/DEBUG_SCICOS.js @@ -14,9 +14,9 @@ function DEBUG_SCICOS() { } DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { arg1.gui = "DEBUG"; - var tmpvar0 = DEBUG("set",arg1) - this.x = tmpvar0[0] - var y = tmpvar0[1] + var tmpvar0 = DEBUG("set",arg1); + this.x = tmpvar0[0]; + var y = tmpvar0[1]; var typ = tmpvar0[2]; return new BasicBlock(this.x); } diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 9edcc7fb..0c07503e 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -28,17 +28,17 @@ function DIFF_f() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = arguments[0]["xd0"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0.slice()],[this.xd0.slice()]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle index 3dc2a15d..358c5b5d 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'x0' -p4 aS'xd0' +p4 +aS'x0' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index eaed8a54..53a54e4c 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -14,23 +14,23 @@ function DSUPER() { DSUPER.prototype.set = function DSUPER() { var y = this.needcompile; var typ = list(); - var graphics = arg1.graphics; - if ((length(graphics.exprs)==0)) { + this.graphics = arg1.graphics; + if ((length(this.graphics.exprs)==0)) { warnBlockByUID(arg1.model.label,"Invalid masked block."); this.x = arg1; return; } - var exprs = graphics.exprs[1-1]; - var exprs0 = graphics.exprs[2-1][1-1]; - var btitre = graphics.exprs[2-1][2-1][1-1]; - var bitems = graphics.exprs[2-1][2-1].slice(2-1,$); + var exprs = this.graphics.exprs[1-1]; + var exprs0 = this.graphics.exprs[2-1][1-1]; + var btitre = this.graphics.exprs[2-1][2-1][1-1]; + var bitems = this.graphics.exprs[2-1][2-1].slice(2-1,$); if (exprs0==[]) { this.x = arg1; return; } var context = [arg1.model.rpar.props.context]; - var tmpvar0 = script2var(context,PREVAR_scicos_context) - var PREVAR_scicos_context = tmpvar0[0] + var tmpvar0 = script2var(context,PREVAR_scicos_context); + var PREVAR_scicos_context = tmpvar0[0]; var ierr = tmpvar0[1]; if (ierr!=0) { this.x = arg1; @@ -40,17 +40,17 @@ function DSUPER() { for (i=2;i<=size(exprs0,1);i+=1) { var tt = tt+",scicos_context."+exprs0[i-1]; } - var ss = graphics.exprs[2-1][3-1]; + var ss = this.graphics.exprs[2-1][3-1]; var scicos_context = PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); if (this.ok) { this.x = arg1; var PREVAR_scicos_context = scicos_context; var sblock = this.x.model.rpar; - var tmpvar1 = do_eval(sblock,list(),scicos_context) - var sblock = tmpvar1[0] - %w = tmpvar1[1] - var needcompile2 = tmpvar1[2] + var tmpvar1 = do_eval(sblock,list(),scicos_context); + var sblock = tmpvar1[0]; + %w = tmpvar1[1]; + var needcompile2 = tmpvar1[2]; this.ok = tmpvar1[3]; var y = max(2,this.needcompile,needcompile2); this.x.graphics.exprs[1-1] = exprs; diff --git a/js/Misc/DSUPER.pickle b/js/Misc/DSUPER.pickle index 24d918fc..dfa49f7f 100644 --- a/js/Misc/DSUPER.pickle +++ b/js/Misc/DSUPER.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'ok' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'bitems' p1 diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 36e4f317..f0de2468 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -28,8 +28,8 @@ function EDGETRIGGER() { EDGETRIGGER.prototype.set = function EDGETRIGGER() { this.edge = parseFloat(arguments[0]["edge"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.edge,exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),exprs); @@ -37,8 +37,8 @@ function EDGETRIGGER() { break; } this.model.ipar = new ScilabDouble([sign(this.edge)]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index 724b4274..eed22757 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'edge' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 24c39990..01cc340e 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -10,51 +10,51 @@ function EDGE_TRIGGER() { scs_m_1.objs[6-1] = scicos_link(); scs_m_1.objs[7-1] = scicos_link(); var blk = scs_m_1.objs[1-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [60,0]; - graphics.sz = [60,40]; - graphics.exprs = "0"; + this.graphics.orig = new ScilabDouble([60,0]); + this.graphics.sz = new ScilabDouble([60,40]); + this.graphics.exprs = new ScilabString(["0"]); this.model.ipar = new ScilabDouble([0]); - graphics.pin = 5; - graphics.pout = 6; - blk.graphics = graphics; + this.graphics.pin = new ScilabDouble([5]); + this.graphics.pout = new ScilabDouble([6]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[1-1] = blk; var blk = scs_m_1.objs[2-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [160,0]; - graphics.sz = [60,40]; - graphics.exprs = [["0"],["0"]]; + this.graphics.orig = new ScilabDouble([160,0]); + this.graphics.sz = new ScilabDouble([60,40]); + this.graphics.exprs = new ScilabDouble(["0"],["0"]); this.model.evtin = new ScilabDouble([]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); - graphics.pin = 6; - graphics.peout = [[7],[0]]; - blk.graphics = graphics; + this.graphics.pin = new ScilabDouble([6]); + this.graphics.peout = new ScilabDouble([7],[0]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[2-1] = blk; var blk = scs_m_1.objs[3-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [0,10]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([0,10]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.pout = 5; - blk.graphics = graphics; + this.graphics.pout = new ScilabDouble([5]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[3-1] = blk; var blk = scs_m_1.objs[4-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [170,-60]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([170,-60]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.pein = 7; - blk.graphics = graphics; + this.graphics.pein = new ScilabDouble([7]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[4-1] = blk; var lnk = scs_m_1.objs[5-1]; diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle index c11caf42..5601c50f 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'xxn' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'lnk.ct' p1 diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index 1ea1772c..f1744afe 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -2,24 +2,26 @@ c__builtin__ set p0 ((lp1 -S'PREVAR_foo' +S'%nin' p2 -aS'getfield' +aS'PREVAR_foo' p3 -aS'PREVAR_scicos_context' +aS'getfield' p4 -aS'%exx' +aS'PREVAR_scicos_context' p5 -aS'%nin' +aS'%exx' p6 -aS'x' +aS'%usenz' p7 -aS'model' +aS'graphics' p8 -aS'%usenz' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 16e98353..2385bc51 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -11,49 +11,49 @@ function Extract_Activation() { scs_m_1.objs[7-1] = scicos_link(); scs_m_1.objs[8-1] = scicos_link(); var blk = scs_m_1.objs[1-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [80,0]; - graphics.sz = [60,40]; - graphics.exprs = [["0"],["0"]]; + this.graphics.orig = new ScilabDouble([80,0]); + this.graphics.sz = new ScilabDouble([60,40]); + this.graphics.exprs = new ScilabDouble(["0"],["0"]); this.model.evtin = new ScilabDouble([]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); - graphics.pin = 7; - graphics.peout = [[5],[6]]; - blk.graphics = graphics; + this.graphics.pin = new ScilabDouble([7]); + this.graphics.peout = new ScilabDouble([5],[6]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[1-1] = blk; var blk = scs_m_1.objs[2-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [80,-80]; - graphics.sz = [80,40]; - graphics.pein = [[5],[6]]; - graphics.peout = 8; - blk.graphics = graphics; + this.graphics.orig = new ScilabDouble([80,-80]); + this.graphics.sz = new ScilabDouble([80,40]); + this.graphics.pein = new ScilabDouble([5],[6]); + this.graphics.peout = new ScilabDouble([8]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[2-1] = blk; var blk = scs_m_1.objs[3-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [0,10]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([0,10]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.pout = 7; - blk.graphics = graphics; + this.graphics.pout = new ScilabDouble([7]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[3-1] = blk; var blk = scs_m_1.objs[4-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [110,-140]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([110,-140]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.pein = 8; - blk.graphics = graphics; + this.graphics.pein = new ScilabDouble([8]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[4-1] = blk; var lnk = scs_m_1.objs[5-1]; diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle index 401a10ed..9278cfaa 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'lnk.ct' p1 diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 981bbdfe..c3018391 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -39,8 +39,8 @@ function HYSTHERESIS() { this.out_low = arguments[0]["out_low"] this.nzz = parseFloat(arguments[0]["nzz"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); @@ -50,13 +50,13 @@ function HYSTHERESIS() { if (this.low_lim>this.high_lim) { message("switch on value must be larger than switch off value"); } else { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(transpose([this.high_lim,this.low_lim,this.out_high,this.out_low])); if (this.nzz>0) { this.nzz = 2; } this.model.nzcross = new ScilabDouble([this.nzz]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle index 140dbf57..82d4a7f2 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -8,16 +8,18 @@ aS'out_low' p3 aS'nzz' p4 -aS'out_high' +aS'graphics' p5 -aS'high_lim' +aS'out_high' p6 -aS'x' +aS'high_lim' p7 -aS'model' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 4664dae5..2b79cc39 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -34,8 +34,8 @@ function LOGICAL_OP() { this.Datatype = arguments[0]["Datatype"] this.tp = parseFloat(arguments[0]["tp"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,1)==2) { var exprs = [[exprs],[sci2exp(1)],[sci2exp(0)]]; @@ -93,15 +93,15 @@ function LOGICAL_OP() { var in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; if ((this.rule!=5)&&(this.nin==1)) { var out = [1,1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } else { var out = [-1,-2]; - var tmpvar1 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; } } @@ -119,9 +119,9 @@ function LOGICAL_OP() { } else if (this.rule==5) { var label = "NOT"; } - graphics.exprs = exprs; - graphics.style = ["blockWithLabel;displayedLabel="+label]; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.style = new ScilabDouble(["blockWithLabel;displayedLabel="+label]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 5537fa7c..41d014ca 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -6,16 +6,18 @@ S'nin' p2 aS'Datatype' p3 -aS'tp' -p4 aS'rule' +p4 +aS'tp' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index b0ceb11f..f0da699e 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -58,8 +58,8 @@ function MBLOCK() { this.lab_1 = arguments[0]["lab_1"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (this.type[exprs-1]==15) { var paramv = list(); this.pprop = []; @@ -171,9 +171,9 @@ function MBLOCK() { } } if (ok) { - var tmpvar0 = fileparts(this.funam) - var dirF = tmpvar0[0] - var nameF = tmpvar0[1] + var tmpvar0 = fileparts(this.funam); + var dirF = tmpvar0[0]; + var nameF = tmpvar0[1]; var extF = tmpvar0[2]; if ((extF!=""&&extF!=".mo")||(dirF!=""&&extF!=".mo")) { messagebox("Filename extention should be \'.mo \' !","modal","error"); @@ -183,9 +183,9 @@ function MBLOCK() { if (ok) { var intypex = find(this.intype=="I"); var outtypex = find(this.outtype=="I"); - var tmpvar1 = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = set_io(this.model,this.graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; } if (ok) { @@ -245,8 +245,8 @@ function MBLOCK() { var tt = []; } } - var tmpvar2 = MODCOM(this.funam,tt,this.in1,this.out,param,paramv,this.pprop) - var ok = tmpvar2[0] + var tmpvar2 = MODCOM(this.funam,tt,this.in1,this.out,param,paramv,this.pprop); + var ok = tmpvar2[0]; var tt = tmpvar2[1]; if (!ok) { break; @@ -267,7 +267,7 @@ function MBLOCK() { for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } - this.model.sim[1] = new ScilabDouble([this.funam]); + this.model.sim[1-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]; @@ -289,11 +289,11 @@ function MBLOCK() { exprs.nameF = this.lab_1[7-1]; exprs.funtxt = tt; this.x.model = this.model; - graphics.gr_i[1-1][1-1] = "txt=[\'Modelica\';\' "+nameF+" \'];"; - graphics.in_implicit = this.intype; - graphics.out_implicit = this.outtype; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]); + this.graphics.in_implicit = new ScilabDouble(this.intype); + this.graphics.out_implicit = new ScilabDouble(this.outtype); + this.graphics.exprs = exprs; + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index b85e0353..0f22e232 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -20,22 +20,24 @@ aS'Tout' p9 aS'pprop' p10 -aS'funam' +aS'graphics' p11 -aS'x' +aS'funam' p12 -aS'model' +aS'x' p13 -aS'out' +aS'model' p14 -aS'type' +aS'out' p15 -aS'Tintype' +aS'type' p16 -aS'Tfunam' +aS'Tintype' p17 -atp18 -Rp19 +aS'Tfunam' +p18 +atp19 +Rp20 .(dp0 S'rhs_txt' p1 @@ -131,75 +133,75 @@ g20 sS'x.graphics.in_implicit' p36 g20 -sS'model.sim[1]' +sS'mo.parameters' p37 -NsS'mo.parameters' -p38 g4 sS'Tparam_sz' -p39 +p38 g10 sS'pprop' -p40 +p39 g23 sS'model.out' -p41 +p40 g10 sS'exprs.in1' -p42 +p41 g10 sS'model.equations' -p43 +p42 g6 sS'mo.outputs' -p44 +p43 g23 sS'intype' -p45 +p44 g20 sS'x.graphics.out_implicit' -p46 +p45 g23 sS'in1' -p47 +p46 g20 sS'model.rpar' -p48 +p47 g23 sS'model.in1' -p49 +p48 g10 sS'lhs_txt' -p50 +p49 g2 sS'outtype' -p51 +p50 g23 sS'graphics' -p52 +p51 g6 sS'intypex' -p53 +p52 g10 sS'lab_1' -p54 +p53 g4 sS'lab_2' -p55 +p54 NsS'paramv[$+1-1]' -p56 +p55 g2 sS'ok' -p57 +p56 S'boolean' -p58 +p57 sS'model.blocktype' -p59 +p58 g2 sS'exprs.param' -p60 +p59 g10 -sS'mo' +sS'model.sim[1-1]' +p60 +NsS'mo' p61 g6 sS'x.graphics' @@ -222,7 +224,7 @@ p67 g2 sS'r' p68 -g58 +g57 sS'lab_txt' p69 g2 diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 43faface..a9f54a89 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -31,8 +31,8 @@ function MEMORY_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.a,this.inh,exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),exprs); @@ -44,9 +44,9 @@ function MEMORY_f() { } else { this.inh = 1; } - var tmpvar0 = check_io(this.model,graphics,-1,-1,this.inh,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-1,-1,this.inh,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; var out = size(this.a,"*"); if (out==0) { @@ -55,11 +55,11 @@ function MEMORY_f() { } var in1 = out; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index e262d11d..da5cef6a 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'inh' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 01cecbc4..a783ecfb 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -43,8 +43,8 @@ function MPBLOCK() { MPBLOCK.prototype.set = function MPBLOCK() { this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (this.type[exprs-1]==15) { var paramv = list(); var pprop = []; @@ -57,15 +57,15 @@ function MPBLOCK() { var lab_1 = list(exprs.in1,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); var lab_2 = exprs.paramv; while (true) { - var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1) - var ok = tmpvar0[0] - var Tin = tmpvar0[1] - var Tintype = tmpvar0[2] - var Tout = tmpvar0[3] - var Touttype = tmpvar0[4] - var Tparam = tmpvar0[5] - var pprop = tmpvar0[6] - var Tfunam = tmpvar0[7] + var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1); + var ok = tmpvar0[0]; + var Tin = tmpvar0[1]; + var Tintype = tmpvar0[2]; + var Tout = tmpvar0[3]; + var Touttype = tmpvar0[4]; + var Tparam = tmpvar0[5]; + var pprop = tmpvar0[6]; + var Tfunam = tmpvar0[7]; var lab_1 = tmpvar0[8]; if (!ok) { break; @@ -165,9 +165,9 @@ function MPBLOCK() { } } if (ok) { - var tmpvar1 = fileparts(this.funam) - var dirF = tmpvar1[0] - var nameF = tmpvar1[1] + var tmpvar1 = fileparts(this.funam); + var dirF = tmpvar1[0]; + var nameF = tmpvar1[1]; var extF = tmpvar1[2]; if ((extF!="")||(dirF!="")) { x_message("Invalid model name!"); @@ -177,9 +177,9 @@ function MPBLOCK() { if (ok) { var intypex = find(this.intype=="I"); var outtypex = find(this.outtype=="I"); - var tmpvar2 = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex) - this.model = tmpvar2[0] - var graphics = tmpvar2[1] + var tmpvar2 = set_io(this.model,this.graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); + this.model = tmpvar2[0]; + this.graphics = tmpvar2[1]; var ok = tmpvar2[2]; } if (ok) { @@ -251,7 +251,7 @@ function MPBLOCK() { for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } - this.model.sim[1] = new ScilabDouble([this.funam]); + this.model.sim[1-1] = new ScilabDouble([this.funam]); exprs.in1 = lab_1[1-1]; exprs.intype = lab_1[2-1]; exprs.out = lab_1[3-1]; @@ -273,11 +273,11 @@ function MPBLOCK() { exprs.nameF = lab_1[7-1]; exprs.funtxt = ""; this.x.model = this.model; - graphics.gr_i[1-1][1-1] = "txt=[\' "+nameF+" \'];"; - graphics.in_implicit = this.intype; - graphics.out_implicit = this.outtype; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\' "+nameF+" \'];"]); + this.graphics.in_implicit = new ScilabDouble(this.intype); + this.graphics.out_implicit = new ScilabDouble(this.outtype); + this.graphics.exprs = exprs; + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index f46d2426..f70422fe 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -8,18 +8,20 @@ aS'in1' p3 aS'outtype' p4 -aS'funam' +aS'graphics' p5 -aS'x' +aS'funam' p6 -aS'model' +aS'x' p7 -aS'type' +aS'model' p8 -aS'out' +aS'type' p9 -atp10 -Rp11 +aS'out' +p10 +atp11 +Rp12 .(dp0 S'rhs_txt' p1 @@ -115,75 +117,75 @@ g30 sS'x.graphics.in_implicit' p36 g30 -sS'model.sim[1]' +sS'mo.parameters' p37 -NsS'mo.parameters' -p38 g4 sS'Tparam_sz' -p39 +p38 g6 sS'pprop' -p40 +p39 g30 sS'model.out' -p41 +p40 g6 sS'exprs.in1' -p42 +p41 g6 sS'model.equations' -p43 +p42 g8 sS'mo.outputs' -p44 +p43 g22 sS'intype' -p45 +p44 g30 sS'x.graphics.out_implicit' -p46 +p45 g22 sS'in1' -p47 +p46 g30 sS'model.rpar' -p48 +p47 g22 sS'model.in1' -p49 +p48 g6 sS'lhs_txt' -p50 +p49 g2 sS'outtype' -p51 +p50 g22 sS'graphics' -p52 +p51 g8 sS'intypex' -p53 +p52 g6 sS'lab_1' -p54 +p53 g4 sS'lab_2' -p55 +p54 NsS'paramv[$+1-1]' -p56 +p55 g2 sS'ok' -p57 +p56 S'boolean' -p58 +p57 sS'model.blocktype' -p59 +p58 g2 sS'exprs.param' -p60 +p59 g6 -sS'mo' +sS'model.sim[1-1]' +p60 +NsS'mo' p61 g8 sS'x.graphics' @@ -206,7 +208,7 @@ p67 g2 sS'r' p68 -g58 +g57 sS'lab_txt' p69 g2 diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 5a70057c..58177753 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -24,10 +24,10 @@ function PAL_f() { return options; } PAL_f.prototype.set = function PAL_f() { - var tmpvar0 = scicos(arg1.model.rpar) - this.x = tmpvar0[0] - var newparameters = tmpvar0[1] - var needcompile = tmpvar0[2] + var tmpvar0 = scicos(arg1.model.rpar); + this.x = tmpvar0[0]; + var newparameters = tmpvar0[1]; + var needcompile = tmpvar0[2]; var edited = tmpvar0[3]; arg1.graphics.id = this.x.props.title[1-1]; arg1.model.rpar = this.x; diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 05758ed8..55ab73f7 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -45,8 +45,8 @@ function PENDULUM_ANIM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { @@ -72,8 +72,8 @@ function PENDULUM_ANIM() { } else { var rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; this.model.rpar = new ScilabDouble(rpar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle index 911c5338..2987ee09 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -8,20 +8,22 @@ aS'ymax' p3 aS'csiz' p4 -aS'xmax' +aS'graphics' p5 -aS'plen' +aS'xmax' p6 -aS'xmin' +aS'plen' p7 -aS'x' +aS'xmin' p8 -aS'model' +aS'x' p9 -aS'ymin' +aS'model' p10 -atp11 -Rp12 +aS'ymin' +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index d7f88eff..35287585 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -30,8 +30,8 @@ function RATELIMITER() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),exprs); @@ -43,8 +43,8 @@ function RATELIMITER() { } else { var rpar = [[this.maxp],[this.minp]]; this.model.rpar = new ScilabDouble(rpar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle index c75701ef..8e7301aa 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'maxp' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index bd7da970..48de0bf5 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -32,8 +32,8 @@ function RELATIONALOP() { this.zcr = parseFloat(arguments[0]["zcr"]) this.Datatype = arguments[0]["Datatype"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,1)==2) { var exprs = [[exprs],[sci2exp(1)]]; @@ -74,9 +74,9 @@ function RELATIONALOP() { var ot = this.Datatype; var in1 = [[-1,-2],[-1,-2]]; var out = [-1,-2]; - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -93,12 +93,12 @@ function RELATIONALOP() { } else if (this.rule==5) { var label = "≥"; } - graphics.exprs = exprs; - graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; + this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.style = new ScilabDouble(["fontSize=13;fontStyle=1;displayedLabel="+label]); this.model.ipar = new ScilabDouble([this.rule]); this.model.nzcross = new ScilabDouble([this.zcr]); this.model.nmode = new ScilabDouble([this.zcr]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 3d35c336..179d5848 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'rule' p3 -aS'model' -p4 aS'zcr' +p4 +aS'graphics' p5 -aS'rule' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index f3b95620..85b433f9 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -8,11 +8,11 @@ function TEXT_f() { this.model.rpar = new ScilabString(["Text"]); this.model.ipar = new ScilabDouble([this.font],[this.siz]); var exprs = [["Text"],[string(this.font)],[string(this.siz)]]; - var graphics = scicos_graphics(); - graphics.orig = [0,0]; - graphics.sz = [2,1]; - graphics.exprs = exprs; - this.x = mlist(["Text","graphics","model","void","gui"],graphics,this.model," ","TEXT_f"); + this.graphics = scicos_graphics(); + this.graphics.orig = new ScilabDouble([0,0]); + this.graphics.sz = new ScilabDouble([2,1]); + this.graphics.exprs = new ScilabDouble(exprs); + this.x = mlist(["Text","graphics","model","void","gui"],this.graphics,this.model," ","TEXT_f"); return new TextBlock(this.x); } TEXT_f.prototype.details = function TEXT_f() { @@ -31,9 +31,9 @@ function TEXT_f() { this.font = parseFloat(arguments[0]["font"]) this.siz = parseFloat(arguments[0]["siz"]) this.x = arg1; - var graphics = arg1.graphics; - var orig = graphics.orig; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var orig = this.graphics.orig; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==1) { var exprs = [[exprs],["3"],["1"]]; @@ -52,7 +52,7 @@ function TEXT_f() { var ok = false; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble(exprs); var gh_winpal = gca(); var default_font_style = gh_winpal.font_style; var default_font_size = gh_winpal.font_size; @@ -64,8 +64,8 @@ function TEXT_f() { gh_winpal.font_size = default_font_size; gh_winpal.font_color = default_font_color; var sz = r.slice(3-1,4); - graphics.sz = sz; - this.x.graphics = graphics; + this.graphics.sz = new ScilabDouble(sz); + this.x.graphics = this.graphics; var ipar = [[this.font],[this.siz]]; this.model.rpar = new ScilabDouble([this.txt]); this.model.ipar = new ScilabDouble(ipar); diff --git a/js/Misc/TEXT_f.pickle b/js/Misc/TEXT_f.pickle index 0f0dda2e..b2499d4f 100644 --- a/js/Misc/TEXT_f.pickle +++ b/js/Misc/TEXT_f.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'font' +S'txt' p2 -aS'x' +aS'siz' p3 -aS'model' +aS'graphics' p4 -aS'txt' +aS'x' p5 -aS'siz' +aS'model' p6 -atp7 -Rp8 +aS'font' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index fd3573df..095a6fa1 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -49,8 +49,8 @@ function c_block() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set C_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); if (!ok) { @@ -69,23 +69,23 @@ function c_block() { if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } - var tmpvar0 = CFORTR(this.funam,tt,this.i,this.o) - var ok = tmpvar0[0] + var tmpvar0 = CFORTR(this.funam,tt,this.i,this.o); + var ok = tmpvar0[0]; var tt = tmpvar0[1]; if (!ok) { break; } - var tmpvar1 = check_io(this.model,graphics,this.i,this.o,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,this.i,this.o,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.model.sim[1] = new ScilabString([this.funam]); + this.model.sim[1-1] = new ScilabString([this.funam]); this.model.rpar = new ScilabDouble(this.rpar); label[2-1] = tt; this.x.model = this.model; - graphics.exprs = label; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 26a3af97..6845a147 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -10,14 +10,16 @@ aS'rpar' p4 aS'lab' p5 -aS'funam' +aS'graphics' p6 -aS'x' +aS'funam' p7 -aS'model' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'label[1-1]' p1 @@ -77,53 +79,53 @@ p22 sS'model.evtin' p23 g3 -sS'model.sim[1]' +sS'model.firing' p24 -NsS'model.firing' -p25 g3 sS'model.sim' -p26 +p25 g22 sS'model.evtout' -p27 +p26 g3 sS'clkout' -p28 +p27 g3 sS'auto' -p29 +p28 g3 sS'label[2-1]' -p30 +p29 g3 sS'in1' -p31 +p30 g9 sS'model.rpar' -p32 +p31 g3 sS'model.state' -p33 +p32 g3 sS'graphics.exprs' -p34 +p33 NsS'x0' -p35 +p34 g3 sS'model.ipar' -p36 +p35 g9 sS'typ' -p37 +p36 g13 sS'model.blocktype' -p38 +p37 g13 sS'i' -p39 +p38 g9 -sS'no' +sS'model.sim[1-1]' +p39 +NsS'no' p40 g9 sS'o' diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index f04ff321..3b56e06e 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -40,8 +40,8 @@ function fortran_block() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set fortran_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); if (!ok) { @@ -60,23 +60,23 @@ function fortran_block() { if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } - var tmpvar0 = FORTR(this.funam,tt,this.i,this.o) - var ok = tmpvar0[0] + var tmpvar0 = FORTR(this.funam,tt,this.i,this.o); + var ok = tmpvar0[0]; var tt = tmpvar0[1]; if (!ok) { break; } - var tmpvar1 = check_io(this.model,graphics,this.i,this.o,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,this.i,this.o,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.model.sim[1] = new ScilabString([this.funam]); + this.model.sim[1-1] = new ScilabString([this.funam]); this.model.rpar = new ScilabDouble(this.rpar); label[2-1] = tt; this.x.model = this.model; - graphics.exprs = label; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index d1773d92..9de91dea 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -10,14 +10,16 @@ aS'rpar' p4 aS'lab' p5 -aS'funam' +aS'graphics' p6 -aS'x' +aS'funam' p7 -aS'model' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'label[1-1]' p1 @@ -68,41 +70,41 @@ p19 sS'model.evtin' p20 g3 -sS'model.sim[1]' +sS'model.firing' p21 -NsS'model.firing' -p22 g3 sS'model.sim' -p23 +p22 g19 sS'model.evtout' -p24 +p23 g3 sS'label[2-1]' -p25 +p24 g3 sS'model.rpar' -p26 +p25 g3 sS'model.state' -p27 +p26 g3 sS'graphics.exprs' -p28 +p27 NsS'model.ipar' -p29 +p28 g13 sS'typ' -p30 +p29 g3 sS'model.blocktype' -p31 +p30 g9 sS'i' -p32 +p31 g13 -sS'no' +sS'model.sim[1-1]' +p32 +NsS'no' p33 g13 sS'o' diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index ef6dffca..197225db 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -22,19 +22,19 @@ function func_block() { } func_block.prototype.set = function func_block() { this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.x = arg1; this.model = this.x.model; - var tmpvar0 = genfunc(exprs) - var ok = tmpvar0[0] - var mac = tmpvar0[1] + var tmpvar0 = genfunc(exprs); + var ok = tmpvar0[0]; + var mac = tmpvar0[1]; var exprs = tmpvar0[2]; if (ok) { this.model.sim = new ScilabDouble([mac]); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; } return new BasicBlock(this.x); } diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle index ea703ec1..e2ed9d64 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index e3a2ae82..8a02e104 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -59,8 +59,8 @@ function generic_block() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -104,9 +104,9 @@ function generic_block() { } var dep_ut = [this.depu,this.dept]; if (ok) { - var tmpvar0 = check_io(this.model,graphics,this.i,this.o,this.ci,this.co) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,this.i,this.o,this.ci,this.co); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -121,8 +121,8 @@ function generic_block() { this.model.firing = new ScilabDouble([this.auto0]); this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index f90f00f7..a1061530 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -26,16 +26,18 @@ aS'lab' p12 aS'ipar' p13 -aS'x' +aS'graphics' p14 -aS'model' +aS'x' p15 -aS'z' +aS'model' p16 -aS'function_name' +aS'z' p17 -atp18 -Rp19 +aS'function_name' +p18 +atp19 +Rp20 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 2e4880cc..bbec134a 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -63,8 +63,8 @@ function generic_block2() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -108,9 +108,9 @@ function generic_block2() { } var dep_ut = [this.depu,this.dept]; if (ok) { - var tmpvar0 = check_io(this.model,graphics,this.i,this.o,this.ci,this.co) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,this.i,this.o,this.ci,this.co); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -127,8 +127,8 @@ function generic_block2() { this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index 4d36465d..3eaae94d 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -28,18 +28,20 @@ aS'lab' p13 aS'ipar' p14 -aS'x' +aS'graphics' p15 -aS'model' +aS'x' p16 -aS'z' +aS'model' p17 -aS'nmode' +aS'z' p18 -aS'function_name' +aS'nmode' p19 -atp20 -Rp21 +aS'function_name' +p20 +atp21 +Rp22 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 24888cb8..28b5c5ab 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -67,8 +67,8 @@ function generic_block3() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -118,9 +118,9 @@ function generic_block3() { } var dep_ut = [this.depu,this.dept]; if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -139,8 +139,8 @@ function generic_block3() { this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; - graphics.exprs = label; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + arg1.graphics = this.graphics; this.x = arg1; break; } diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index c9d9390b..2d480e2d 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -24,32 +24,34 @@ aS'in1' p11 aS'lab' p12 -aS'nmode' +aS'graphics' p13 -aS'z' +aS'nmode' p14 -aS'xx' +aS'z' p15 -aS'nzcr' +aS'xx' p16 -aS'depu' +aS'nzcr' p17 -aS'dept' +aS'depu' p18 -aS'opar' +aS'dept' p19 -aS'oz' +aS'opar' p20 -aS'ipar' +aS'oz' p21 -aS'x' +aS'ipar' p22 -aS'model' +aS'x' p23 -aS'ot' +aS'model' p24 -atp25 -Rp26 +aS'ot' +p25 +atp26 +Rp27 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 96ddc1f3..f5715e61 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -60,8 +60,8 @@ function scifunc_block() { var needcompile = 0; this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs[1-1],"*")==8) { exprs[1-1][9-1] = "0"; } @@ -83,17 +83,17 @@ function scifunc_block() { var nci = size(this.ci,1); this.co = int(this.co.slice()); var nco = size(this.co,1); - var tmpvar0 = genfunc1(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c") - var ok = tmpvar0[0] - var tt = tmpvar0[1] + var tmpvar0 = genfunc1(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var ok = tmpvar0[0]; + var tt = tmpvar0[1]; var dep_ut = tmpvar0[2]; dep_ut[2-1] = (1==this.deptime); if (!ok) { break; } - var tmpvar1 = check_io(this.model,graphics,this.i,this.o,this.ci,this.co) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,this.i,this.o,this.ci,this.co); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; @@ -112,8 +112,8 @@ function scifunc_block() { this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; exprs[2-1] = tt; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index d55b8523..8544551d 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -20,14 +20,16 @@ aS'xx' p9 aS'lab' p10 -aS'x' +aS'graphics' p11 -aS'model' +aS'x' p12 -aS'z' +aS'model' p13 -atp14 -Rp15 +aS'z' +p14 +atp15 +Rp16 .(dp0 S'exprs[1-1]' p1 diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 3b54ace1..ad411fa4 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -65,8 +65,8 @@ function scifunc_block_m() { var needcompile = 0; this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]); if (!ok) { @@ -85,17 +85,17 @@ function scifunc_block_m() { var nci = size(this.ci,1); this.co = int(this.co.slice()); var nco = size(this.co,1); - var tmpvar0 = genfunc2(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c") - var ok = tmpvar0[0] - var tt = tmpvar0[1] + var tmpvar0 = genfunc2(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var ok = tmpvar0[0]; + var tt = tmpvar0[1]; var dep_ut = tmpvar0[2]; dep_ut[2-1] = (1==this.deptime); if (!ok) { break; } - var tmpvar1 = set_io(this.model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = set_io(this.model,this.graphics,list(this.i,it),list(this.o,ot),this.ci,this.co); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; @@ -114,8 +114,8 @@ function scifunc_block_m() { this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; exprs[2-1] = tt; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; break; } } diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index e943163b..bd1bc27d 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -20,14 +20,16 @@ aS'xx' p9 aS'lab' p10 -aS'x' +aS'graphics' p11 -aS'model' +aS'x' p12 -aS'z' +aS'model' p13 -atp14 -Rp15 +aS'z' +p14 +atp15 +Rp16 .(dp0 S'exprs[1-1]' p1 diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 3b4b3aff..868dd610 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -27,15 +27,15 @@ function ABS_VALUE() { ABS_VALUE.prototype.set = function ABS_VALUE() { this.zcr = arguments[0]["zcr"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); if (ok) { if (this.zcr!=0) { this.model.nmode = new ScilabDouble([-1]); @@ -44,7 +44,7 @@ function ABS_VALUE() { this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index 7500fad3..9c94a754 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'zcr' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index a5e1aa61..6562a428 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -45,8 +45,8 @@ function DLRADAPT_f() { this.last_u = inverse(arguments[0]["last_u"]) this.last_y = inverse(arguments[0]["last_y"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs); @@ -54,8 +54,8 @@ function DLRADAPT_f() { break; } var m = size(this.rn,2); - var tmpvar0 = size(this.rd) - var npt = tmpvar0[0] + var tmpvar0 = size(this.rd); + var npt = tmpvar0[0]; var n = tmpvar0[1]; if (m>=n) { message("Transfer must be strictly proper"); @@ -67,8 +67,8 @@ function DLRADAPT_f() { this.model.dstate = new ScilabDouble([this.last_u.slice()],[this.last_y.slice()]); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index 4e1549e0..b513715b 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -12,14 +12,16 @@ aS'rd' p5 aS'p' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'x' p8 -aS'rn' +aS'model' p9 -atp10 -Rp11 +aS'rn' +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 8b273fb9..0162f5ff 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -26,8 +26,8 @@ function EXPBLK_f() { EXPBLK_f.prototype.set = function EXPBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; @@ -40,9 +40,9 @@ function EXPBLK_f() { if (or(this.a<=0)) { message("a^u : a must be positive"); } else { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index d1f963e2..38028473 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index f10f3ad9..72cd885a 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -30,8 +30,8 @@ function EXPBLK_m() { EXPBLK_m.prototype.set = function EXPBLK_m() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; @@ -44,9 +44,9 @@ function EXPBLK_m() { if (or(this.a<=0)) { message("a^u : a must be positive"); } else { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index a4c95bf7..64a42830 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 9c4c0f6f..37b2eac9 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -33,8 +33,8 @@ function INTRP2BLK_f() { this.b = inverse(arguments[0]["b"]) this.c = inverse(arguments[0]["c"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.a,this.b,this.c,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs); @@ -47,10 +47,10 @@ function INTRP2BLK_f() { message("X and Y must be strictly increasing"); } else { if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()],[this.c.slice()]); this.model.ipar = new ScilabDouble([size(this.a,"*")],[size(this.b,"*")]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index aed750a4..1faaf822 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'c' p3 -aS'model' -p4 aS'b' +p4 +aS'graphics' p5 -aS'c' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'a' p1 diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 1583e329..69e5382f 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -29,8 +29,8 @@ function INTRPLBLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.a,this.b,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),exprs); @@ -43,9 +43,9 @@ function INTRPLBLK_f() { message("X must be strictly increasing"); } else { if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index 89166c16..d26f9032 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'b' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'a' p1 diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 87f7b64f..86ebbd9a 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -26,8 +26,8 @@ function LOGBLK_f() { LOGBLK_f.prototype.set = function LOGBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; @@ -41,9 +41,9 @@ function LOGBLK_f() { message("Basis must be larger than 1"); } else { if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index f54919a2..f07254d3 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 86705715..dd6cde5a 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -42,8 +42,8 @@ function LOOKUP2D() { this.graf = arguments[0]["graf"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -68,14 +68,14 @@ function LOOKUP2D() { if (!Ask_again) { this.xx = this.xx.slice(); this.yy = this.yy.slice(); - var tmpvar0 = size(this.xx) - var nx = tmpvar0[0] + var tmpvar0 = size(this.xx); + var nx = tmpvar0[0]; var mx = tmpvar0[1]; - var tmpvar1 = size(this.yy) - var ny = tmpvar1[0] + var tmpvar1 = size(this.yy); + var ny = tmpvar1[0]; var my = tmpvar1[1]; - var tmpvar2 = size(this.zz) - var nz = tmpvar2[0] + var tmpvar2 = size(this.zz); + var nz = tmpvar2[0]; var mz = tmpvar2[1]; if (((nx<=1)||(ny<=1))) { x_message("input row/column data size should be greater than one"); @@ -85,13 +85,13 @@ function LOOKUP2D() { x_message("incompatible size of x and y"); var Ask_again = true; } - var tmpvar3 = test_increasing(this.xx) + var tmpvar3 = test_increasing(this.xx); var ok = tmpvar3[0]; if ((!ok)) { x_message("Row input values must be monotonically increasing"); var Ask_again = true; } - var tmpvar4 = test_increasing(this.yy) + var tmpvar4 = test_increasing(this.yy); var ok = tmpvar4[0]; if ((!ok)) { x_message("Column input values must be monotonically increasing"); @@ -111,9 +111,9 @@ function LOOKUP2D() { } this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([nx],[ny],[mtd]); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; break; } } diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index 9caba996..d4217e44 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -10,16 +10,18 @@ aS'xx' p4 aS'zz' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'Method' +aS'model' p8 -aS'graf' +aS'Method' p9 -atp10 -Rp11 +aS'graf' +p10 +atp11 +Rp12 .(dp0 S'exprs[4-1]' p1 diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index c569f4d7..112c8e02 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -47,8 +47,8 @@ function LOOKUP_c() { this.graf = arguments[0]["graf"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -81,11 +81,11 @@ function LOOKUP_c() { if (!Ask_again) { this.xx = this.xx.slice(); this.yy = this.yy.slice(); - var tmpvar0 = size(this.xx) - var nx = tmpvar0[0] + var tmpvar0 = size(this.xx); + var nx = tmpvar0[0]; var mx = tmpvar0[1]; - var tmpvar1 = size(this.yy) - var ny = tmpvar1[0] + var tmpvar1 = size(this.yy); + var ny = tmpvar1[0]; var my = tmpvar1[1]; if (!((nx==ny)&&(mx==my))) { x_message("incompatible size of x and y"); @@ -94,7 +94,7 @@ function LOOKUP_c() { } if (!Ask_again) { this.xy = [this.xx,this.yy]; - var tmpvar2 = cleandata(this.xy) + var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); exprs[5-1] = "n"; @@ -107,9 +107,9 @@ function LOOKUP_c() { } var save_curwin = this.curwin; this.curwin = max(winsid())+1; - var tmpvar3 = poke_point(this.xy,ipar,rpar) - var orpar = tmpvar3[0] - var oipar = tmpvar3[1] + var tmpvar3 = poke_point(this.xy,ipar,rpar); + var orpar = tmpvar3[0]; + var oipar = tmpvar3[1]; var ok = tmpvar3[2]; this.curwin = save_curwin; if (!ok) { @@ -142,9 +142,9 @@ function LOOKUP_c() { } var SaveExit = true; } else { - var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1],this.xy[$-1][1-1],this.xy[1-1][1-1],0) - var Xdummy = tmpvar4[0] - var Ydummy = tmpvar4[1] + var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1],this.xy[$-1][1-1],this.xy[1-1][1-1],0); + var Xdummy = tmpvar4[0]; + var Ydummy = tmpvar4[1]; var orpar = tmpvar4[2]; if ((METHOD=="periodic")) { this.xy[N-1][2-1] = this.xy[1-1][2-1]; @@ -170,9 +170,9 @@ function LOOKUP_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; break; } } diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index 1d90ff33..8ec3e322 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -10,7 +10,7 @@ aS'inrpar' p4 aS'extrapo' p5 -aS'offset' +aS'graphics' p6 aS'Pd3' p7 @@ -60,7 +60,7 @@ aS'sAmp2' p29 aS'zok' p30 -aS'iipar' +aS'offset' p31 aS'yt' p32 @@ -108,42 +108,44 @@ aS'wp' p53 aS'phase' p54 -aS'min5' +aS'iipar' p55 -aS'mok' +aS'min5' p56 -aS'Pw3' +aS'mok' p57 -aS'sheetN' +aS'Pw3' p58 -aS'xgetmouse' +aS'sheetN' p59 -aS'max5' +aS'xgetmouse' p60 -aS'rparin' +aS'max5' p61 -aS'sample4' +aS'rparin' p62 -aS'Cy' +aS'sample4' p63 -aS'sTp2' +aS'Cy' p64 -aS'yy' +aS'sTp2' p65 -aS'x' +aS'yy' p66 -aS'model' +aS'x' p67 -aS'ORDER2' +aS'model' p68 -aS'irpar' +aS'ORDER2' p69 -aS'graf' +aS'irpar' p70 -aS'xye' +aS'graf' p71 -atp72 -Rp73 +aS'xye' +p72 +atp73 +Rp74 .(dp0 S'mean4' p1 diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 81a00e6c..644d53bc 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -22,8 +22,8 @@ function LOOKUP_f() { } LOOKUP_f.prototype.set = function LOOKUP_f() { this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; var n = size(rpar,"*")/2; @@ -32,10 +32,10 @@ function LOOKUP_f() { while (true) { [ln,fun]=where() if (!or(fun=="do_eval")) { - var tmpvar0 = edit_curv(xx,yy,"axy") - var xx = tmpvar0[0] - var yy = tmpvar0[1] - var ok = tmpvar0[2] + var tmpvar0 = edit_curv(xx,yy,"axy"); + var xx = tmpvar0[0]; + var yy = tmpvar0[1]; + var ok = tmpvar0[2]; var gc = tmpvar0[3]; } else { var ok = true; @@ -50,7 +50,7 @@ function LOOKUP_f() { } if (ok) { this.model.rpar = new ScilabDouble([xx.slice()],[yy.slice()]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 0a9d52d0..bc3d2e3b 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 53de8ae6..dd33e64a 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -30,8 +30,8 @@ function MAXMIN() { this.nin = arguments[0]["nin"] this.zcr = parseFloat(arguments[0]["zcr"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.mm,this.nin,this.zcr,exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs); @@ -50,14 +50,14 @@ function MAXMIN() { } if (ok) { if (this.nin==1) { - var tmpvar0 = check_io(this.model,graphics,-1,1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-1,1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } else { - var tmpvar1 = check_io(this.model,graphics,[-1,-1],-1,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,[-1,-1],-1,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; } } @@ -74,9 +74,9 @@ function MAXMIN() { } else { var label = "MAX"; } - graphics.style = "MAXMIN;displayedLabel="+label; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.style = new ScilabString(["MAXMIN;displayedLabel="+label]); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index 71538e9d..80bf6393 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'mm' +S'nin' p2 -aS'x' +aS'mm' p3 -aS'model' +aS'zcr' p4 -aS'nin' +aS'graphics' p5 -aS'zcr' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index 39c01eeb..59af138e 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -26,8 +26,8 @@ function POWBLK_f() { POWBLK_f.prototype.set = function POWBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; @@ -37,7 +37,7 @@ function POWBLK_f() { if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); if (this.a==int(this.a)) { this.model.ipar = new ScilabDouble([this.a]); this.model.rpar = new ScilabDouble([]); @@ -46,7 +46,7 @@ function POWBLK_f() { this.model.ipar = new ScilabDouble([]); } this.model.firing = new ScilabDouble([]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index a9f0ac38..07b394df 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 0b180388..0b15d8d8 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -25,9 +25,9 @@ function PRODUCT() { PRODUCT.prototype.set = function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.sgn,exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),exprs); if (!ok) { @@ -57,15 +57,15 @@ function PRODUCT() { } } if (ok) { - var tmpvar0 = check_io(this.model,graphics,in1,nout,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,in1,nout,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.ipar = new ScilabDouble([this.sgn]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 53adad8f..b56abb21 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'sgn' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 557cb3fa..0342e720 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -30,8 +30,8 @@ function QUANT_f() { this.pas = parseFloat(arguments[0]["pas"]) this.meth = parseFloat(arguments[0]["meth"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.pas,this.meth,exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),exprs); @@ -54,8 +54,8 @@ function QUANT_f() { case 4: this.model.sim = new ScilabString(["qzcel"]); } - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index aac3fdf6..9cbf36b1 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -10,8 +10,10 @@ aS'pas' p4 aS'meth' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index f89b0fb7..9641e15c 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -34,8 +34,8 @@ function SATURATION() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); @@ -54,8 +54,8 @@ function SATURATION() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index 85a82e98..19b594d5 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'minp' +S'zeroc' p2 -aS'x' +aS'maxp' p3 -aS'model' +aS'graphics' p4 -aS'zeroc' +aS'minp' p5 -aS'maxp' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 52c4bef4..2252cb52 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -34,8 +34,8 @@ function SAT_f() { this.maxp = parseFloat(arguments[0]["maxp"]) this.pente = arguments[0]["pente"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.minp,this.maxp,this.pente,exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),exprs); @@ -50,8 +50,8 @@ function SAT_f() { var rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]]; this.model.rpar = new ScilabDouble(rpar); this.model.firing = new ScilabDouble([]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index 7c2ee447..f573fc63 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'minp' +S'maxp' p2 -aS'x' +aS'pente' p3 -aS'model' +aS'graphics' p4 -aS'maxp' +aS'minp' p5 -aS'pente' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'slope' p1 diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 41c6823f..6f59a566 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -27,15 +27,15 @@ function SIGNUM() { SIGNUM.prototype.set = function SIGNUM() { this.zcr = arguments[0]["zcr"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); if (ok) { if (this.zcr!=0) { this.model.nmode = new ScilabDouble([-1]); @@ -44,7 +44,7 @@ function SIGNUM() { this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index 7500fad3..9c94a754 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'zcr' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index ea1e576c..8dcc2737 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -23,8 +23,8 @@ function TrigFun() { TrigFun.prototype.set = function TrigFun() { this.fun = arguments[0]["fun"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]]; var PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]]; @@ -36,9 +36,9 @@ function TrigFun() { if (find(PREVAR_FF==this.fun)==[]) { message("Sorry but "+this.fun+" is not in the list!"); } else { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); execstr("model.sim=list(\'"+this.fun+"_blk\',4)"); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index 7f90e982..525f10cf 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -8,8 +8,10 @@ aS'x' p3 aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 91816b22..f114e5a0 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -27,85 +27,85 @@ function PDE() { this.rdnom = arguments[0]["rdnom"] this.lab = arguments[0]["lab"] this.x = arg1; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; var params_pde = label[1-1]; while (true) { [ln,fun]=where() if (!or(fun=="do_eval")) { - var tmpvar0 = IHM_EDP(params_pde) - var ok = tmpvar0[0] - var a_domaine = tmpvar0[1] - var b_domaine = tmpvar0[2] - var discr = tmpvar0[3] - var signe = tmpvar0[4] - var choix = tmpvar0[5] - var type_meth = tmpvar0[6] - var degre = tmpvar0[7] - var Nbr_maillage = tmpvar0[8] - var CI = tmpvar0[9] - var CI1 = tmpvar0[10] - var CLa_type = tmpvar0[11] - var CLa_exp = tmpvar0[12] - var CLb_type = tmpvar0[13] - var CLb_exp = tmpvar0[14] - var oper = tmpvar0[15] - var a1 = tmpvar0[16] - var b1 = tmpvar0[17] - var a2 = tmpvar0[18] - var b2 = tmpvar0[19] - var a3 = tmpvar0[20] - var b3 = tmpvar0[21] - var a4 = tmpvar0[22] - var b4 = tmpvar0[23] - var a5 = tmpvar0[24] - var b5 = tmpvar0[25] - var a6 = tmpvar0[26] - var b6 = tmpvar0[27] - var a7 = tmpvar0[28] - var b7 = tmpvar0[29] - var k = tmpvar0[30] - var mesures = tmpvar0[31] + var tmpvar0 = IHM_EDP(params_pde); + var ok = tmpvar0[0]; + var a_domaine = tmpvar0[1]; + var b_domaine = tmpvar0[2]; + var discr = tmpvar0[3]; + var signe = tmpvar0[4]; + var choix = tmpvar0[5]; + var type_meth = tmpvar0[6]; + var degre = tmpvar0[7]; + var Nbr_maillage = tmpvar0[8]; + var CI = tmpvar0[9]; + var CI1 = tmpvar0[10]; + var CLa_type = tmpvar0[11]; + var CLa_exp = tmpvar0[12]; + var CLb_type = tmpvar0[13]; + var CLb_exp = tmpvar0[14]; + var oper = tmpvar0[15]; + var a1 = tmpvar0[16]; + var b1 = tmpvar0[17]; + var a2 = tmpvar0[18]; + var b2 = tmpvar0[19]; + var a3 = tmpvar0[20]; + var b3 = tmpvar0[21]; + var a4 = tmpvar0[22]; + var b4 = tmpvar0[23]; + var a5 = tmpvar0[24]; + var b5 = tmpvar0[25]; + var a6 = tmpvar0[26]; + var b6 = tmpvar0[27]; + var a7 = tmpvar0[28]; + var b7 = tmpvar0[29]; + var k = tmpvar0[30]; + var mesures = tmpvar0[31]; var params_pde = tmpvar0[32]; if (ok) { return; } } else { if (exists("%scicos_context")) { - var tmpvar1 = setvalue_IHM_EDP(params_pde) - var ok = tmpvar1[0] - var a_domaine = tmpvar1[1] - var b_domaine = tmpvar1[2] - var discr = tmpvar1[3] - var signe = tmpvar1[4] - var choix = tmpvar1[5] - var type_meth = tmpvar1[6] - var degre = tmpvar1[7] - var Nbr_maillage = tmpvar1[8] - var CI = tmpvar1[9] - var CI1 = tmpvar1[10] - var CLa_type = tmpvar1[11] - var CLa_exp = tmpvar1[12] - var CLb_type = tmpvar1[13] - var CLb_exp = tmpvar1[14] - var oper = tmpvar1[15] - var a1 = tmpvar1[16] - var b1 = tmpvar1[17] - var a2 = tmpvar1[18] - var b2 = tmpvar1[19] - var a3 = tmpvar1[20] - var b3 = tmpvar1[21] - var a4 = tmpvar1[22] - var b4 = tmpvar1[23] - var a5 = tmpvar1[24] - var b5 = tmpvar1[25] - var a6 = tmpvar1[26] - var b6 = tmpvar1[27] - var a7 = tmpvar1[28] - var b7 = tmpvar1[29] - var k = tmpvar1[30] - var mesures = tmpvar1[31] + var tmpvar1 = setvalue_IHM_EDP(params_pde); + var ok = tmpvar1[0]; + var a_domaine = tmpvar1[1]; + var b_domaine = tmpvar1[2]; + var discr = tmpvar1[3]; + var signe = tmpvar1[4]; + var choix = tmpvar1[5]; + var type_meth = tmpvar1[6]; + var degre = tmpvar1[7]; + var Nbr_maillage = tmpvar1[8]; + var CI = tmpvar1[9]; + var CI1 = tmpvar1[10]; + var CLa_type = tmpvar1[11]; + var CLa_exp = tmpvar1[12]; + var CLb_type = tmpvar1[13]; + var CLb_exp = tmpvar1[14]; + var oper = tmpvar1[15]; + var a1 = tmpvar1[16]; + var b1 = tmpvar1[17]; + var a2 = tmpvar1[18]; + var b2 = tmpvar1[19]; + var a3 = tmpvar1[20]; + var b3 = tmpvar1[21]; + var a4 = tmpvar1[22]; + var b4 = tmpvar1[23]; + var a5 = tmpvar1[24]; + var b5 = tmpvar1[25]; + var a6 = tmpvar1[26]; + var b6 = tmpvar1[27]; + var a7 = tmpvar1[28]; + var b7 = tmpvar1[29]; + var k = tmpvar1[30]; + var mesures = tmpvar1[31]; var params_pde = tmpvar1[32]; } } @@ -151,10 +151,10 @@ function PDE() { } var type_meth = arbre_decision(delta); } - var tmpvar2 = translate(CI,CI1,CLa_type,CLa_exp,CLb_type,CLb_exp,oper,type_meth,degre,a_domaine,b_domaine,Nbr_maillage,a1,b1,a2,b2,a3,b3,a4,b4,a5,b5,a6,b6,a7,b7,this.rdnom,mesures) - var flag_type = tmpvar2[0] - this.rdnom = tmpvar2[1] - var DF_type = tmpvar2[2] + var tmpvar2 = translate(CI,CI1,CLa_type,CLa_exp,CLb_type,CLb_exp,oper,type_meth,degre,a_domaine,b_domaine,Nbr_maillage,a1,b1,a2,b2,a3,b3,a4,b4,a5,b5,a6,b6,a7,b7,this.rdnom,mesures); + var flag_type = tmpvar2[0]; + this.rdnom = tmpvar2[1]; + var DF_type = tmpvar2[2]; var tt = tmpvar2[3]; var Nbr = Nbr_maillage; if (((CLa_type==1)&&(DF_type==0||DF_type==1))||((CLb_type==1)&&(DF_type==0||DF_type==2))) { @@ -192,21 +192,21 @@ function PDE() { } } } - var tmpvar3 = CFORTREDP(this.rdnom,tt) + var tmpvar3 = CFORTREDP(this.rdnom,tt); var ok1 = tmpvar3[0]; if (!ok1) { break; } if (!ok) { - var tmpvar4 = check_io(this.model,graphics,ones(k,1),out.slice(),[],[]) - this.model = tmpvar4[0] - var graphics = tmpvar4[1] + var tmpvar4 = check_io(this.model,this.graphics,ones(k,1),out.slice(),[],[]); + this.model = tmpvar4[0]; + this.graphics = tmpvar4[1]; var ok = tmpvar4[2]; } label[1-1] = params_pde; label[2-1] = tt; - graphics.exprs = label; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([label]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index 6b7cf86c..ce7cc36e 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'okk' p2 -aS'model' +aS'lab' p3 -aS'okk' +aS'graphics' p4 -aS'lab' +aS'x' p5 -aS'rdnom' +aS'model' p6 -atp7 -Rp8 +aS'rdnom' +p7 +atp8 +Rp9 .(dp0 S'params_pde' p1 diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index ad6b0537..c6215ee9 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -47,8 +47,8 @@ function AFFICH_m() { this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -83,17 +83,17 @@ function AFFICH_m() { message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index 17d10152..2ac10bbb 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -12,16 +12,18 @@ aS'in1' p5 aS'fontsize' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'x' p8 -aS'font' +aS'model' p9 -aS'nt' +aS'font' p10 -atp11 -Rp12 +aS'nt' +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 6dba5c05..2420f48a 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -41,8 +41,8 @@ function BARXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.thickness = arguments[0]["thickness"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); @@ -67,8 +67,8 @@ function BARXY() { } else { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.thickness]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 690991ae..4f52b098 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -8,16 +8,18 @@ aS'thickness' p3 aS'xmax' p4 -aS'xmin' +aS'graphics' p5 -aS'x' +aS'xmin' p6 -aS'model' +aS'x' p7 -aS'ymin' +aS'model' p8 -atp9 -Rp10 +aS'ymin' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 063eb79a..06ca27bd 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -60,8 +60,8 @@ function CANIMXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -106,9 +106,9 @@ function CANIMXY() { } else { var in1 = this.nbr_curves*ones(2,1); var in2 = ones(2,1); - var tmpvar0 = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (this.wpos==[]) { this.wpos = [[-1],[-1]]; @@ -120,8 +120,8 @@ function CANIMXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index 806d781e..02f5d9a9 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -10,7 +10,7 @@ aS'ymax' p4 aS'wpos' p5 -aS'win' +aS'siz' p6 aS'wdim' p7 @@ -18,7 +18,7 @@ aS'N' p8 aS'xmax' p9 -aS'siz' +aS'graphics' p10 aS'xmin' p11 @@ -28,8 +28,10 @@ aS'model' p13 aS'nbr_curves' p14 -atp15 -Rp16 +aS'win' +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 87669164..f2b9d04f 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -60,8 +60,8 @@ function CANIMXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -122,9 +122,9 @@ function CANIMXY3D() { } else { var in1 = this.nbr_curves*ones(3,1); var in2 = ones(3,1); - var tmpvar0 = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (this.wpos==[]) { this.wpos = [[-1],[-1]]; @@ -137,8 +137,8 @@ function CANIMXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index 5f1b4c40..67189920 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -10,7 +10,7 @@ aS'wpos' p4 aS'vec_z' p5 -aS'win' +aS'siz' p6 aS'vec_x' p7 @@ -20,7 +20,7 @@ aS'param3ds' p9 aS'N' p10 -aS'siz' +aS'graphics' p11 aS'x' p12 @@ -28,8 +28,10 @@ aS'model' p13 aS'nbr_curves' p14 -atp15 -Rp16 +aS'win' +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index c46f6e3c..0bfb4c6e 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -41,8 +41,8 @@ function CEVENTSCOPE() { this.wdim = inverse(arguments[0]["wdim"]) this.per = parseFloat(arguments[0]["per"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,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),exprs); @@ -78,9 +78,9 @@ function CEVENTSCOPE() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(),list(),ones(this.nclock,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } else { message([["Some specified values are inconsistent:"],[" "],[mess]]); @@ -96,8 +96,8 @@ function CEVENTSCOPE() { var ipar = [[this.win],[1],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.slice()]]; this.model.rpar = new ScilabDouble([rpar]); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle index cbf1eae9..36f3ee38 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -8,18 +8,20 @@ aS'wpos' p3 aS'win' p4 -aS'per' -p5 aS'wdim' +p5 +aS'per' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'x' p8 -aS'nclock' +aS'model' p9 -atp10 -Rp11 +aS'nclock' +p10 +atp11 +Rp12 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 81823bcb..39b2a3c4 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -49,8 +49,8 @@ function CFSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.wu = arguments[0]["wu"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -108,8 +108,8 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle index 8d166b29..ee6af05a 100644 --- a/js/Sinks/CFSCOPE.pickle +++ b/js/Sinks/CFSCOPE.pickle @@ -10,22 +10,24 @@ aS'wpos' p4 aS'win' p5 -aS'per' +aS'wdim' p6 -aS'N' +aS'per' p7 -aS'wu' +aS'N' p8 -aS'wdim' +aS'wu' p9 -aS'x' +aS'graphics' p10 -aS'model' +aS'x' p11 -aS'ymin' +aS'model' p12 -atp13 -Rp14 +aS'ymin' +p13 +atp14 +Rp15 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index 03b1ce07..1b371a2b 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -24,9 +24,9 @@ function CLKOUTV_f() { CLKOUTV_f.prototype.set = function CLKOUTV_f() { this.prt = arguments[0]["prt"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),exprs); if (!ok) { @@ -38,8 +38,8 @@ function CLKOUTV_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } @@ -54,8 +54,8 @@ function CLKOUTV_f() { var typ = -ones(this.x); } CLKOUTV_f.prototype.getorigin = function CLKOUTV_f() { - var tmpvar0 = standard_origin(arg1) - this.x = tmpvar0[0] + var tmpvar0 = standard_origin(arg1); + this.x = tmpvar0[0]; var y = tmpvar0[1]; } CLKOUTV_f.prototype.getoutputs = function CLKOUTV_f() { diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle index 7cb2ea99..7bfad8e2 100644 --- a/js/Sinks/CLKOUTV_f.pickle +++ b/js/Sinks/CLKOUTV_f.pickle @@ -8,16 +8,18 @@ aS'default_color' p3 aS'prt' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'type' +aS'model' p7 -aS'options' +aS'type' p8 -atp9 -Rp10 +aS'options' +p9 +atp10 +Rp11 .(dp0 S'xo' p1 diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 0aecca3f..e94f0ce3 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -24,9 +24,9 @@ function CLKOUT_f() { CLKOUT_f.prototype.set = function CLKOUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; var exprs = exprs[1-1]; while (true) { [ok,this.prt,exprs] = scicos_getvalue("Set Event Output block parameters","Port number",list("vec",1),exprs); @@ -40,8 +40,8 @@ function CLKOUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); this.model.firing = new ScilabDouble([]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle index 4ffa6fb1..0297746c 100644 --- a/js/Sinks/CLKOUT_f.pickle +++ b/js/Sinks/CLKOUT_f.pickle @@ -2,14 +2,16 @@ c__builtin__ set p0 ((lp1 -S'x' +S'prt' p2 -aS'model' +aS'x' p3 -aS'prt' +aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 5ea42142..85aac47f 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -44,8 +44,8 @@ function CMAT3D() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,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),exprs); @@ -71,8 +71,8 @@ function CMAT3D() { var rpar = [[this.colormap.slice()],[this.vec_x.slice()],[this.vec_y.slice()]]; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle index 6035c95c..dfee6d03 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -2,22 +2,24 @@ c__builtin__ set p0 ((lp1 -S'cmin' +S'colormap' p2 aS'vec_x' p3 aS'vec_y' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'cmax' +aS'model' p7 -aS'colormap' +aS'cmax' p8 -atp9 -Rp10 +aS'cmin' +p9 +atp10 +Rp11 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index efc67f99..70e63a5d 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -38,8 +38,8 @@ function CMATVIEW() { this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.colormap,this.cmin,this.cmax,exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),exprs); @@ -63,8 +63,8 @@ function CMATVIEW() { var rpar = [[alpha_c],[beta_c],[this.colormap.slice()]]; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index f56928ee..bd5b84e9 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'cmin' p2 -aS'model' +aS'graphics' p3 -aS'cmax' +aS'x' p4 -aS'colormap' +aS'model' p5 -aS'cmin' +aS'cmax' p6 -atp7 -Rp8 +aS'colormap' +p7 +atp8 +Rp9 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 14377533..2ba39542 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -59,8 +59,8 @@ function CMSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -121,9 +121,9 @@ function CMSCOPE() { this.in1 = this.in1.slice(); var a = size(this.in1,1); var in2 = ones(a,1); - var tmpvar0 = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -144,9 +144,9 @@ function CMSCOPE() { this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); this.model.label = new ScilabDouble([this.nom]); - graphics.id = this.nom; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.id = new ScilabDouble([this.nom]); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index f4dc4e76..40dc6977 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -12,24 +12,26 @@ aS'wpos' p5 aS'win' p6 -aS'in1' +aS'wdim' p7 -aS'per' +aS'in1' p8 -aS'N' +aS'per' p9 -aS'wdim' +aS'N' p10 -aS'x' +aS'graphics' p11 -aS'model' +aS'x' p12 -aS'ymin' +aS'model' p13 -aS'heritance' +aS'ymin' p14 -atp15 -Rp16 +aS'heritance' +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 17b7c53a..46dbd86a 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -53,8 +53,8 @@ function CSCOPE() { this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -94,9 +94,9 @@ function CSCOPE() { message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -112,9 +112,9 @@ function CSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.label = new ScilabDouble([this.nom]); - graphics.id = this.nom; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.id = new ScilabDouble([this.nom]); + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index f28b8737..91210470 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -12,22 +12,24 @@ aS'wpos' p5 aS'win' p6 -aS'per' +aS'wdim' p7 -aS'N' +aS'per' p8 -aS'wdim' +aS'N' p9 -aS'x' +aS'graphics' p10 -aS'model' +aS'x' p11 -aS'ymin' +aS'model' p12 -aS'heritance' +aS'ymin' p13 -atp14 -Rp15 +aS'heritance' +p14 +atp15 +Rp16 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 1f2e5dc0..62151c21 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -59,8 +59,8 @@ function CSCOPXY() { this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -105,9 +105,9 @@ function CSCOPXY() { } else { var in1 = this.nbr_curves*ones(2,1); var in2 = ones(2,1); - var tmpvar0 = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (this.wpos==[]) { this.wpos = [[-1],[-1]]; @@ -119,8 +119,8 @@ function CSCOPXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index 1a1a92bd..a11b6b9c 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -10,7 +10,7 @@ aS'ymax' p4 aS'wpos' p5 -aS'win' +aS'siz' p6 aS'wdim' p7 @@ -18,7 +18,7 @@ aS'N' p8 aS'xmax' p9 -aS'siz' +aS'graphics' p10 aS'xmin' p11 @@ -28,8 +28,10 @@ aS'model' p13 aS'nbr_curves' p14 -atp15 -Rp16 +aS'win' +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index a0bca1af..eb25e569 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -59,8 +59,8 @@ function CSCOPXY3D() { this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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,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),exprs); @@ -115,9 +115,9 @@ function CSCOPXY3D() { if (ok) { var in1 = this.nbr_curves*ones(3,1); var in2 = ones(3,1); - var tmpvar0 = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (this.wpos==[]) { this.wpos = [[-1],[-1]]; @@ -130,8 +130,8 @@ function CSCOPXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } else { diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index 6ac1a115..3361fa70 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -10,7 +10,7 @@ aS'wpos' p4 aS'vec_z' p5 -aS'win' +aS'siz' p6 aS'vec_x' p7 @@ -20,7 +20,7 @@ aS'param3ds' p9 aS'N' p10 -aS'siz' +aS'graphics' p11 aS'x' p12 @@ -28,8 +28,10 @@ aS'model' p13 aS'nbr_curves' p14 -atp15 -Rp16 +aS'win' +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 6201233a..3f70a71e 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -30,8 +30,8 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.set = function OUTIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[1-1]; @@ -50,8 +50,8 @@ function OUTIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index e5dda12a..a4f815d4 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -2,14 +2,16 @@ c__builtin__ set p0 ((lp1 -S'x' +S'prt' p2 -aS'model' +aS'x' p3 -aS'prt' +aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 271dc87e..15588cd2 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -27,9 +27,9 @@ function OUT_f() { OUT_f.prototype.set = function OUT_f() { this.prt = parseFloat(arguments[0]["prt"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; if (size(exprs,"*")==2) { var exprs = exprs[1-1]; } @@ -43,8 +43,8 @@ function OUT_f() { block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected."); } else { this.model.ipar = new ScilabDouble([this.prt]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index 318c53a1..d77fba8a 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -2,14 +2,16 @@ c__builtin__ set p0 ((lp1 -S'x' +S'prt' p2 -aS'model' +aS'x' p3 -aS'prt' +aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.in2' p1 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 78d4a853..81a38af2 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -39,9 +39,9 @@ function TOWS_c() { this.varnam = arguments[0]["varnam"] this.herit = parseFloat(arguments[0]["herit"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.nz,this.varnam,this.herit,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),exprs); if (!ok) { @@ -59,9 +59,9 @@ function TOWS_c() { } execstr("if type("+this.varnam+") <> 17 | or(fieldnames("+this.varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch"); if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (this.herit==1) { this.model.blocktype = new ScilabString(["x"]); @@ -69,8 +69,8 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); } this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 4a87ca85..31ff78a2 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -6,16 +6,18 @@ S'herit' p2 aS'nz' p3 -aS'x' +aS'graphics' p4 -aS'model' +aS'x' p5 -aS'ascii' +aS'model' p6 -aS'varnam' +aS'ascii' p7 -atp8 -Rp9 +aS'varnam' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index f3a26efb..d87b4bdf 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -43,8 +43,8 @@ function WFILE_f() { var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); warnBlockByUID(arg1.model.label,warnXcosMessage); this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -69,9 +69,9 @@ function WFILE_f() { block_parameter_error("Wrong value for \'Output File Name\' parameter","You must provide a filename."); var ok = false; } else if (fileparts(this.fname1)!="") { - var tmpvar0 = fileparts(this.fname1) - var pa = tmpvar0[0] - var fn = tmpvar0[1] + var tmpvar0 = fileparts(this.fname1); + var pa = tmpvar0[0]; + var fn = tmpvar0[1]; var ex = tmpvar0[2]; if (!this.isdir[pa-1]) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter.","Output File Name"),msprintf("Directory \'%s\' does not exist",pa)); @@ -96,8 +96,8 @@ function WFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabDouble([true,false]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index 895c2b46..41c6ea25 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -6,20 +6,22 @@ S'isdir' p2 aS'_str2code' p3 -aS'in1' +aS'frmt1' p4 aS'fname1' p5 -aS'N' +aS'in1' p6 -aS'frmt1' +aS'graphics' p7 aS'x' p8 aS'model' p9 -atp10 -Rp11 +aS'N' +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 090fe131..e674dfed 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -35,8 +35,8 @@ function WRITEAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; @@ -68,8 +68,8 @@ function WRITEAU_f() { this.model.in1 = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index 82735ae7..45165388 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -6,16 +6,18 @@ S'_str2code' p2 aS'N' p3 -aS'alreadyran' +aS'swap' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'swap' +aS'model' p7 -atp8 -Rp9 +aS'alreadyran' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 49986ca7..1f7579b7 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -41,8 +41,8 @@ function WRITEC_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; @@ -71,9 +71,9 @@ function WRITEC_f() { } else if (this.fname1=="") { block_parameter_error(msprintf("Wrong value for \'%s\' parameter.","Output File Name"),"You must provide a filename."); } else if (fileparts(this.fname1)!="") { - var tmpvar0 = fileparts(this.fname1) - var pa = tmpvar0[0] - var fn = tmpvar0[1] + var tmpvar0 = fileparts(this.fname1); + var pa = tmpvar0[0]; + var fn = tmpvar0[1]; var ex = tmpvar0[2]; if (!this.isdir[pa-1]) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter.","Output File Name"),msprintf("Directory \'%s\' does not exist",pa)); @@ -98,8 +98,8 @@ function WRITEC_f() { this.model.in1 = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index 1b564164..1aa169a0 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -6,24 +6,26 @@ S'isdir' p2 aS'_str2code' p3 -aS'in1' +aS'frmt1' p4 aS'fname1' p5 -aS'N' +aS'in1' p6 -aS'frmt1' -p7 aS'swap' +p7 +aS'graphics' p8 aS'x' p9 aS'model' p10 -aS'alreadyran' +aS'N' p11 -atp12 -Rp13 +aS'alreadyran' +p12 +atp13 +Rp14 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 649c7258..d86618c9 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -25,9 +25,9 @@ function CLKINV_f() { CLKINV_f.prototype.set = function CLKINV_f() { this.prt = parseFloat(arguments[0]["prt"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; var exprs = exprs[1-1]; while (true) { [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),exprs); @@ -41,8 +41,8 @@ function CLKINV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle index bc5efd27..f8dde500 100644 --- a/js/Sources/CLKINV_f.pickle +++ b/js/Sources/CLKINV_f.pickle @@ -2,14 +2,16 @@ c__builtin__ set p0 ((lp1 -S'x' +S'prt' p2 -aS'model' +aS'x' p3 -aS'prt' +aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 8dec6a6a..849ee2f2 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -24,9 +24,9 @@ function CLKIN_f() { CLKIN_f.prototype.set = function CLKIN_f() { this.prt = parseFloat(arguments[0]["prt"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; var exprs = exprs[1-1]; while (true) { [ok,this.prt,exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),exprs); @@ -40,8 +40,8 @@ function CLKIN_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle index b7886c50..e733f1cb 100644 --- a/js/Sources/CLKIN_f.pickle +++ b/js/Sources/CLKIN_f.pickle @@ -2,14 +2,16 @@ c__builtin__ set p0 ((lp1 -S'x' +S'prt' p2 -aS'model' +aS'x' p3 -aS'prt' +aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index c6b97f93..81978c23 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -25,8 +25,8 @@ function CONST() { CONST.prototype.set = function CONST() { this.C = parseFloat(arguments[0]["C"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs); @@ -42,8 +42,8 @@ function CONST() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle index ca6f7e0c..ed25e5f0 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'C' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'sz' p1 diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 5f7bd3f7..8f809d66 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -25,8 +25,8 @@ function CONST_f() { CONST_f.prototype.set = function CONST_f() { this.C = parseFloat(arguments[0]["C"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs); @@ -39,8 +39,8 @@ function CONST_f() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle index 153597e4..4c58ae17 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'C' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 3305fcd1..69e37818 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -28,8 +28,8 @@ function CONST_m() { CONST_m.prototype.set = function CONST_m() { this.C = inverse(arguments[0]["C"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.C,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),exprs); @@ -66,12 +66,12 @@ function CONST_m() { } if (ok) { this.model.rpar = new ScilabDouble([]); - var tmpvar0 = set_io(this.model,graphics,list(),list(nout,ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(),list(nout,ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index 787cefcc..6b37f902 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -10,8 +10,10 @@ aS'type' p4 aS'C' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 7b67863e..a165bcb8 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -44,8 +44,8 @@ function CURVE_c() { this.graf = arguments[0]["graf"] this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -71,11 +71,11 @@ function CURVE_c() { if (!Ask_again) { this.xx = this.xx.slice(); this.yy = this.yy.slice(); - var tmpvar0 = size(this.xx) - var nx = tmpvar0[0] + var tmpvar0 = size(this.xx); + var nx = tmpvar0[0]; var mx = tmpvar0[1]; - var tmpvar1 = size(this.yy) - var ny = tmpvar1[0] + var tmpvar1 = size(this.yy); + var ny = tmpvar1[0]; var my = tmpvar1[1]; if (!((nx==ny)&&(mx==my))) { messagebox("Incompatible size of [x] and [y]","modal","error"); @@ -84,7 +84,7 @@ function CURVE_c() { } if (!Ask_again) { this.xy = [this.xx,this.yy]; - var tmpvar2 = cleandata(this.xy) + var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); exprs[5-1] = "n"; @@ -96,9 +96,9 @@ function CURVE_c() { } else { this.curwin = max(winsid())+1; } - var tmpvar3 = poke_point(this.xy,ipar,rpar) - var orpar = tmpvar3[0] - var oipar = tmpvar3[1] + var tmpvar3 = poke_point(this.xy,ipar,rpar); + var orpar = tmpvar3[0]; + var oipar = tmpvar3[1]; var ok = tmpvar3[2]; if (!ok) { break; @@ -130,9 +130,9 @@ function CURVE_c() { exprs[4-1] = perop; var SaveExit = true; } else { - var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]) - var Xdummy = tmpvar4[0] - var Ydummy = tmpvar4[1] + var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]); + var Xdummy = tmpvar4[0]; + var Ydummy = tmpvar4[1]; var orpar = tmpvar4[2]; if ((METHOD=="periodic")) { this.xy[N-1][2-1] = this.xy[1-1][2-1]; @@ -158,9 +158,9 @@ function CURVE_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; - this.x.graphics = graphics; + this.x.graphics = this.graphics; break; } } diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index 8aca82e4..19b20933 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -10,7 +10,7 @@ aS'inrpar' p4 aS'sok' p5 -aS'offset' +aS'graphics' p6 aS'Pd3' p7 @@ -60,7 +60,7 @@ aS'sAmp2' p29 aS'zok' p30 -aS'iipar' +aS'offset' p31 aS'yt' p32 @@ -108,42 +108,44 @@ aS'wp' p53 aS'phase' p54 -aS'min5' +aS'iipar' p55 -aS'mok' +aS'min5' p56 -aS'Pw3' +aS'mok' p57 -aS'sheetN' +aS'Pw3' p58 -aS'xgetmouse' +aS'sheetN' p59 -aS'max5' +aS'xgetmouse' p60 -aS'rparin' +aS'max5' p61 -aS'sample4' +aS'rparin' p62 -aS'Cy' +aS'sample4' p63 -aS'sTp2' +aS'Cy' p64 -aS'yy' +aS'sTp2' p65 -aS'x' +aS'yy' p66 -aS'model' +aS'x' p67 -aS'ORDER2' +aS'model' p68 -aS'irpar' +aS'ORDER2' p69 -aS'graf' +aS'irpar' p70 -aS'xye' +aS'graf' p71 -atp72 -Rp73 +aS'xye' +p72 +atp73 +Rp74 .(dp0 S'mean4' p1 diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 17889b60..e34977ec 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -30,7 +30,7 @@ function CURV_f() { CURV_f.prototype.set = function CURV_f() { this.x = arg1; this.model = arg1.model; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; var rpar = this.model.rpar; var ipar = this.model.ipar; var n = ipar[1-1]; @@ -40,10 +40,10 @@ function CURV_f() { while (true) { [ln,fun]=where() if (!or(fun=="do_eval")) { - var tmpvar0 = edit_curv(xx,yy,"axy",[" "," "," "],gc) - var xx = tmpvar0[0] - var yy = tmpvar0[1] - var ok = tmpvar0[2] + var tmpvar0 = edit_curv(xx,yy,"axy",[" "," "," "],gc); + var xx = tmpvar0[0]; + var yy = tmpvar0[1]; + var ok = tmpvar0[2]; var gc = tmpvar0[3]; } else { var ok = true; @@ -63,7 +63,7 @@ function CURV_f() { this.model.rpar = new ScilabDouble([xx.slice()],[yy.slice()],[rect.slice()]); var axisdata = gc[2-1]; this.model.ipar = new ScilabDouble([size(xx,"*")],[axisdata.slice()]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle index cd8f09a6..d4d844a0 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_f.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'arg1' p1 diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index d9461533..6b5c835b 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -34,8 +34,8 @@ function Counter() { this.maxim = parseFloat(arguments[0]["maxim"]) this.rule = parseFloat(arguments[0]["rule"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.minim,this.maxim,this.rule,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),exprs); @@ -49,10 +49,10 @@ function Counter() { } else if ((this.rule!=1&&this.rule!=2)) { block_parameter_error(msprintf("Wrong value for \'Rule\' parameter: %d",this.rule),msprintf("Must be in the interval %s.","[1,2]")); } else { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle index c377d262..eabc335f 100644 --- a/js/Sources/Counter.pickle +++ b/js/Sources/Counter.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'minim' p2 -aS'model' -p3 aS'maxim' -p4 +p3 aS'rule' +p4 +aS'graphics' p5 -aS'minim' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 5cf355cb..678deb94 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -39,8 +39,8 @@ function FROMWS_c() { this.ZC = parseFloat(arguments[0]["ZC"]) this.OutEnd = parseFloat(arguments[0]["OutEnd"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.varnam,this.Method,this.ZC,this.OutEnd,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),exprs); @@ -67,13 +67,13 @@ function FROMWS_c() { } if (ok) { this.model.ipar = new ScilabDouble([length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]); - var tmpvar0 = set_io(this.model,graphics,list(),list([-1,-2],-1),1,1) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(),list([-1,-2],-1),1,1); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle index ecf91390..e3017752 100644 --- a/js/Sources/FROMWS_c.pickle +++ b/js/Sources/FROMWS_c.pickle @@ -8,16 +8,18 @@ aS'ZC' p3 aS'OutEnd' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'x' p6 -aS'Method' +aS'model' p7 -aS'varnam' +aS'Method' p8 -atp9 -Rp10 +aS'varnam' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index ed9ffb75..5871d300 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -32,8 +32,8 @@ function GENSIN_f() { this.F = arguments[0]["F"] this.P = arguments[0]["P"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.M,this.F,this.P,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),exprs); @@ -45,15 +45,15 @@ function GENSIN_f() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[],1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[],1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.model.rpar = new ScilabDouble([this.M],[this.F],[this.P]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index 8787f4b9..2058c781 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'F' p2 -aS'model' -p3 aS'M' -p4 +p3 aS'P' +p4 +aS'graphics' p5 -aS'F' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 83d9d48c..9d5be45d 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -28,8 +28,8 @@ function GENSQR_f() { GENSQR_f.prototype.set = function GENSQR_f() { this.Amplitude = parseFloat(arguments[0]["Amplitude"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; @@ -39,11 +39,11 @@ function GENSQR_f() { if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle index b43e515b..b2ee098e 100644 --- a/js/Sources/GENSQR_f.pickle +++ b/js/Sources/GENSQR_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'Amplitude' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 17d47993..e6ba542c 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -66,8 +66,8 @@ function GEN_SQR() { var y = this.needcompile; arg1.model.ipar = 1; var typ = list(); - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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)"]]; @@ -82,14 +82,14 @@ function GEN_SQR() { } var PREVAR_scicos_context = scicos_context; var sblock = this.x.model.rpar; - var tmpvar0 = script2var(sblock.props.context,PREVAR_scicos_context) - var PREVAR_scicos_context = tmpvar0[0] + var tmpvar0 = script2var(sblock.props.context,PREVAR_scicos_context); + var PREVAR_scicos_context = tmpvar0[0]; var ierr = tmpvar0[1]; if (ierr==0) { - var tmpvar1 = do_eval(sblock,list()) - var sblock = tmpvar1[0] - %w = tmpvar1[1] - var needcompile2 = tmpvar1[2] + var tmpvar1 = do_eval(sblock,list()); + var sblock = tmpvar1[0]; + %w = tmpvar1[1]; + var needcompile2 = tmpvar1[2]; var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index 742ed299..2f6fdb8a 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -8,16 +8,18 @@ aS'scicos_context.Amax' p3 aS'scicos_context.rule' p4 -aS'x' +aS'graphics' p5 -aS'scicos_context.Amin' +aS'x' p6 -aS'scicos_context.F' +aS'scicos_context.Amin' p7 -aS'model' +aS'scicos_context.F' p8 -atp9 -Rp10 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'model.odstate' p1 diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index a74a358e..158e9b71 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -30,8 +30,8 @@ function INIMPL_f() { INIMPL_f.prototype.set = function INIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { var exprs = exprs[1-1]; @@ -50,8 +50,8 @@ function INIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle index a715bfa6..7a3db6b1 100644 --- a/js/Sources/INIMPL_f.pickle +++ b/js/Sources/INIMPL_f.pickle @@ -2,14 +2,16 @@ c__builtin__ set p0 ((lp1 -S'x' +S'prt' p2 -aS'model' +aS'x' p3 -aS'prt' +aS'model' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 35db0c40..756cf5cd 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -25,9 +25,9 @@ function IN_f() { } IN_f.prototype.set = function IN_f() { this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; if (size(exprs,"*")==2) { var exprs = exprs[1-1]; } @@ -35,11 +35,11 @@ function IN_f() { var exprs = [[exprs[1-1]],["[-1 -2]"],["-1"]]; } while (true) { - var tmpvar0 = getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),exprs) - var ok = tmpvar0[0] - var prt = tmpvar0[1] - var otsz = tmpvar0[2] - var ot = tmpvar0[3] + var tmpvar0 = getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),exprs); + var ok = tmpvar0[0]; + var prt = tmpvar0[1]; + var otsz = tmpvar0[2]; + var ot = tmpvar0[3]; var exprs = tmpvar0[4]; if (!ok) { break; @@ -61,8 +61,8 @@ function IN_f() { this.model.out = new ScilabDouble([otsz[1-1]]); this.model.out2 = new ScilabDouble([otsz[2-1]]); this.model.outtyp = new ScilabDouble([ot]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle index 71f9181e..3594fa55 100644 --- a/js/Sources/IN_f.pickle +++ b/js/Sources/IN_f.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'needcompile' p1 diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index fd47a64a..2ac3c14f 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -30,8 +30,8 @@ function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.ini_c,this.base,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),exprs); @@ -45,10 +45,10 @@ function Modulo_Count() { } else if (this.base<=0) { block_parameter_error(msprintf("Wrong values for \'Upper Limit\' parameter: %d.",this.base),"Strictly positive integer expected."); } else { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.base]); this.model.dstate = new ScilabDouble([this.ini_c]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle index b0b58fd4..5f0e8a6d 100644 --- a/js/Sources/Modulo_Count.pickle +++ b/js/Sources/Modulo_Count.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'base' -p4 aS'ini_c' +p4 +aS'base' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 5d571066..802851d4 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -61,8 +61,8 @@ function PULSE_SC() { var y = this.needcompile; arg1.model.ipar = 1; var typ = list(); - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var 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:"]]; @@ -77,14 +77,14 @@ function PULSE_SC() { } var PREVAR_scicos_context = scicos_context; var sblock = this.x.model.rpar; - var tmpvar0 = script2var(sblock.props.context,PREVAR_scicos_context) - var PREVAR_scicos_context = tmpvar0[0] + var tmpvar0 = script2var(sblock.props.context,PREVAR_scicos_context); + var PREVAR_scicos_context = tmpvar0[0]; var ierr = tmpvar0[1]; if (ierr==0) { - var tmpvar1 = do_eval(sblock,list()) - var sblock = tmpvar1[0] - %w = tmpvar1[1] - var needcompile2 = tmpvar1[2] + var tmpvar1 = do_eval(sblock,list()); + var sblock = tmpvar1[0]; + %w = tmpvar1[1]; + var needcompile2 = tmpvar1[2]; var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 8e427edb..40948305 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -6,18 +6,20 @@ S'needcompile' p2 aS'scicos_context.W' p3 -aS'x' +aS'graphics' p4 -aS'model' +aS'x' p5 -aS'scicos_context.A' +aS'model' p6 -aS'scicos_context.F' +aS'scicos_context.A' p7 -aS'scicos_context.E' +aS'scicos_context.F' p8 -atp9 -Rp10 +aS'scicos_context.E' +p9 +atp10 +Rp11 .(dp0 S'model.odstate' p1 diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 25aa112e..828bed9d 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -35,8 +35,8 @@ function RAMP() { this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.slope,this.stt,this.iout,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),exprs); @@ -47,8 +47,8 @@ function RAMP() { block_parameter_error(msprintf("Wrong value for \'Start Time\' parameter: %e.",this.stt),"Null or positive integer expected."); } else { this.model.rpar = new ScilabDouble([this.slope],[this.stt],[this.iout]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index 7dbb0ae5..90ce1880 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'slope' p2 -aS'x' +aS'iout' p3 -aS'model' +aS'stt' p4 -aS'iout' +aS'graphics' p5 -aS'stt' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'slope' p1 diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index ec4d7b4c..8799018e 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -38,8 +38,8 @@ function RAND_f() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==5) { var exprs = exprs.slice(1-1,3); @@ -56,12 +56,12 @@ function RAND_f() { message("flag must be equal to 1 or 0"); } else { var nout = size(this.a,"*"); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble(exprs); this.model.out = new ScilabDouble([nout]); this.model.ipar = new ScilabDouble([this.flag]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); this.model.dstate = new ScilabDouble([this.seed_c],[0*this.a.slice()]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle index 984969db..3810200f 100644 --- a/js/Sources/RAND_f.pickle +++ b/js/Sources/RAND_f.pickle @@ -10,12 +10,14 @@ aS'seed_c' p4 aS'flag' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index f25eacce..ff748381 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -49,8 +49,8 @@ function RAND_m() { this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==14) { exprs[9-1] = []; @@ -79,15 +79,15 @@ function RAND_m() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([],[]),list(out,ot),1,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([4])); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.flag]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index 530befda..06b6608f 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -10,14 +10,16 @@ aS'seed_c' p4 aS'flag' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'typ' +aS'model' p8 -atp9 -Rp10 +aS'typ' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index efd42ea1..c3db2463 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -41,8 +41,8 @@ function READAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var out = this.model.out; var dstate = this.model.dstate; @@ -74,9 +74,9 @@ function READAU_f() { } else if (this.swap!=0&&this.swap!=1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Swap Mode",this.swap),msprintf("Must be in the interval %s.","[0, 1]")); } else { - var tmpvar0 = check_io(this.model,graphics,[],1,1,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[],1,1,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; var frmt1 = part(frmt1,1,3); if (ok) { @@ -86,8 +86,8 @@ function READAU_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle index aef1d2b2..c112ea3e 100644 --- a/js/Sources/READAU_f.pickle +++ b/js/Sources/READAU_f.pickle @@ -8,16 +8,18 @@ aS'fname1' p3 aS'N' p4 -aS'alreadyran' +aS'swap' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'swap' +aS'model' p8 -atp9 -Rp10 +aS'alreadyran' +p9 +atp10 +Rp11 .(dp0 S'tmask' p1 diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 9dc47d51..2f818f23 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -56,8 +56,8 @@ function READC_f() { this.swap = parseFloat(arguments[0]["swap"]) this.x = arg1; this.model = this.x.model; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; @@ -113,9 +113,9 @@ function READC_f() { var outpt = 1; } var out = size(this.outmask,"*"); - var tmpvar0 = check_io(this.model,graphics,[],out,1,outpt) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[],out,1,outpt); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; this.frmt1 = part(this.frmt1,1,3); if (ok) { @@ -130,8 +130,8 @@ function READC_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle index 4656e4f2..635dc478 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -18,16 +18,18 @@ aS'swap' p8 aS'offset' p9 -aS'x' +aS'graphics' p10 -aS'model' +aS'x' p11 -aS'tmask1' +aS'model' p12 -aS'alreadyran' +aS'tmask1' p13 -atp14 -Rp15 +aS'alreadyran' +p14 +atp15 +Rp16 .(dp0 S'tmask' p1 diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 5f94def6..778ebced 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -45,8 +45,8 @@ function RFILE_f() { this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; var ipar = this.model.ipar; @@ -97,9 +97,9 @@ function RFILE_f() { var ievt = 1; var cout = 1; } - var tmpvar0 = check_io(this.model,graphics,[],nout,1,cout) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[],nout,1,cout); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { if (ievt==0) { @@ -113,8 +113,8 @@ function RFILE_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle index d07126d0..8be76902 100644 --- a/js/Sources/RFILE_f.pickle +++ b/js/Sources/RFILE_f.pickle @@ -12,14 +12,16 @@ aS'fname1' p5 aS'N' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'x' p8 -aS'tmask1' +aS'model' p9 -atp10 -Rp11 +aS'tmask1' +p10 +atp11 +Rp12 .(dp0 S'tmask' p1 diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 0ff3980a..10babc97 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -34,8 +34,8 @@ function STEP() { this.in1 = arguments[0]["in1"] this.fi = arguments[0]["fi"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.temps,this.in1,this.fi,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),exprs); @@ -57,9 +57,9 @@ function STEP() { if (ok) { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - var tmpvar0 = check_io(this.model,graphics,[],size(this.fi,"*"),1,1) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[],size(this.fi,"*"),1,1); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { @@ -70,8 +70,8 @@ function STEP() { var rpar = [[this.in1],[this.fi]]; } this.model.rpar = new ScilabDouble(rpar); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle index e025ae99..e49533dc 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'temps' +S'graphics' p2 -aS'x' +aS'in1' p3 -aS'model' +aS'temps' p4 -aS'in1' -p5 aS'fi' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 8f6209f0..7b98b38a 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -7,25 +7,25 @@ function STEP_FUNCTION() { scs_m_1.objs[3-1] = scicos_link(); scs_m_1.objs[4-1] = scicos_link(); var blk = scs_m_1.objs[1-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [0,0]; - graphics.sz = [40,40]; - graphics.pein = 4; - graphics.peout = 4; - graphics.pout = 3; - blk.graphics = graphics; + this.graphics.orig = new ScilabDouble([0,0]); + this.graphics.sz = new ScilabDouble([40,40]); + this.graphics.pein = new ScilabDouble([4]); + this.graphics.peout = new ScilabDouble([4]); + this.graphics.pout = new ScilabDouble([3]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[1-1] = blk; var blk = scs_m_1.objs[2-1]; - var graphics = blk.graphics; + this.graphics = blk.graphics; this.model = blk.model; - graphics.orig = [80,10]; - graphics.sz = [20,20]; - graphics.exprs = ["1"]; + this.graphics.orig = new ScilabDouble([80,10]); + this.graphics.sz = new ScilabDouble([20,20]); + this.graphics.exprs = new ScilabDouble(["1"]); this.model.ipar = new ScilabDouble([1]); - graphics.pin = 3; - blk.graphics = graphics; + this.graphics.pin = new ScilabDouble([3]); + blk.graphics = this.graphics; blk.model = this.model; scs_m_1.objs[2-1] = blk; var lnk = scs_m_1.objs[3-1]; diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle index 4c1ac5ae..50a906e4 100644 --- a/js/Sources/STEP_FUNCTION.pickle +++ b/js/Sources/STEP_FUNCTION.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'xxn' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'lnk.ct' p1 diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index f066d4b2..f09912f7 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -26,9 +26,9 @@ function SampleCLK() { this.frequ = arguments[0]["frequ"] this.offset = arguments[0]["offset"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs); if (!ok) { @@ -50,8 +50,8 @@ function SampleCLK() { this.model.rpar = new ScilabDouble([this.frequ],[this.offset]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle index 4cf41094..1f55629a 100644 --- a/js/Sources/SampleCLK.pickle +++ b/js/Sources/SampleCLK.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'frequ' -p4 aS'offset' +p4 +aS'frequ' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'needcompile' p1 diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index c5909fd1..68ea3bf2 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -32,14 +32,14 @@ function TKSCALE() { this.b = parseFloat(arguments[0]["b"]) this.f = parseFloat(arguments[0]["f"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; [ok,this.a,this.b,this.f,exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs); if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; } return new BasicBlock(this.x); diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle index 65a8742d..4547b11f 100644 --- a/js/Sources/TKSCALE.pickle +++ b/js/Sources/TKSCALE.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'b' p3 -aS'model' +aS'f' p4 -aS'b' +aS'graphics' p5 -aS'f' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'a' p1 diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 19d58b0f..7ad81a55 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -32,8 +32,8 @@ function GENERAL_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.out = parseFloat(arguments[0]["out"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; this.in1 = this.model.in1; @@ -42,9 +42,9 @@ function GENERAL_f() { var nout = sum(this.out); [ok,this.in1,this.out,exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),exprs); if (ok) { - var tmpvar0 = check_io(this.model,graphics,this.in1,[],[],ones(this.out,1)) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,this.in1,[],[],ones(this.out,1)); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { var nout1 = this.out; @@ -61,8 +61,8 @@ function GENERAL_f() { this.model.nzcross = new ScilabDouble([this.in1]); this.model.rpar = new ScilabDouble(rp.slice()); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; } } diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle index 7d76ade0..9b35bd87 100644 --- a/js/Threshold/GENERAL_f.pickle +++ b/js/Threshold/GENERAL_f.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'in1' -p4 aS'out' +p4 +aS'in1' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 6879424a..65bd428c 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -28,8 +28,8 @@ function ZCROSS_f() { ZCROSS_f.prototype.set = function ZCROSS_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.in1,exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),exprs); @@ -45,11 +45,11 @@ function ZCROSS_f() { var kk = kk+2^(this.in1+jj-1); } this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]); - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.in1 = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.firing = new ScilabDouble([-1]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle index f0d6b1a2..ece29a05 100644 --- a/js/Threshold/ZCROSS_f.pickle +++ b/js/Threshold/ZCROSS_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'in1' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 |