summaryrefslogtreecommitdiff
path: root/js/Events
diff options
context:
space:
mode:
Diffstat (limited to 'js/Events')
-rw-r--r--js/Events/ANDBLK.js14
-rw-r--r--js/Events/ANDLOG_f.js2
-rw-r--r--js/Events/CLKSOMV_f.js2
-rw-r--r--js/Events/CLKSOM_f.js2
-rw-r--r--js/Events/END_c.js8
-rw-r--r--js/Events/EVTDLY_c.js10
-rw-r--r--js/Events/EVTDLY_f.js10
-rw-r--r--js/Events/EVTGEN_f.js8
-rw-r--r--js/Events/EVTVARDLY.js8
-rw-r--r--js/Events/HALT_f.js8
-rw-r--r--js/Events/IFTHEL_f.js15
-rw-r--r--js/Events/IFTHEL_f.pickle25
-rw-r--r--js/Events/MCLOCK_f.js36
-rw-r--r--js/Events/MFCLCK_f.js10
-rw-r--r--js/Events/M_freq.js32
-rw-r--r--js/Events/M_freq.pickle106
-rw-r--r--js/Events/VirtualCLK0.js2
-rw-r--r--js/Events/freq_div.js80
18 files changed, 192 insertions, 186 deletions
diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js
index cfe72604..e98bb7ec 100644
--- a/js/Events/ANDBLK.js
+++ b/js/Events/ANDBLK.js
@@ -1,45 +1,45 @@
/* autogenerated from "macros/Events/ANDBLK.sci" */
function ANDBLK() {
ANDBLK.prototype.define = function ANDBLK() {
- andlog = ANDLOG_f("define");
+ var andlog = ANDLOG_f("define");
andlog.graphics.orig = [194,133];
andlog.graphics.sz = [60,60];
andlog.graphics.flip = true;
andlog.graphics.pout = 9;
andlog.graphics.pein = [[4],[11]];
- input_port1 = CLKIN_f("define");
+ var input_port1 = CLKIN_f("define");
input_port1.graphics.orig = [149,287];
input_port1.graphics.sz = [20,20];
input_port1.graphics.flip = true;
input_port1.graphics.exprs = "1";
input_port1.graphics.peout = 4;
input_port1.model.ipar = 1;
- output_port = CLKOUT_f("define");
+ var output_port = CLKOUT_f("define");
output_port.graphics.orig = [450,83];
output_port.graphics.sz = [20,20];
output_port.graphics.flip = true;
output_port.graphics.exprs = "1";
output_port.graphics.pein = 8;
output_port.model.ipar = 1;
- input_port2 = CLKIN_f("define");
+ var input_port2 = CLKIN_f("define");
input_port2.graphics.orig = [141,330];
input_port2.graphics.sz = [20,20];
input_port2.graphics.flip = true;
input_port2.graphics.exprs = "2";
input_port2.graphics.peout = 6;
input_port2.model.ipar = 2;
- ifthel = IFTHEL_f("define");
+ var ifthel = IFTHEL_f("define");
ifthel.graphics.orig = [331,137];
ifthel.graphics.sz = [60,60];
ifthel.graphics.flip = true;
ifthel.graphics.pin = 9;
ifthel.graphics.pein = 12;
ifthel.graphics.peout = [[8],[0]];
- split = CLKSPLIT_f("define");
+ var split = CLKSPLIT_f("define");
split.graphics.orig = [[234],[275.78348]];
split.graphics.pein = 6;
split.graphics.peout = [[11],[12]];
- diagram = scicos_diagram();
+ var diagram = scicos_diagram();
diagram.objs[1-1] = andlog;
diagram.objs[2-1] = input_port1;
diagram.objs[3-1] = output_port;
diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js
index 4a87edf3..ae7ce241 100644
--- a/js/Events/ANDLOG_f.js
+++ b/js/Events/ANDLOG_f.js
@@ -8,7 +8,7 @@ function ANDLOG_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [false,false];
- gr_i = [];
+ var gr_i = [];
this.x = standard_define([3,3],this.model,[],gr_i);
return new BasicBlock(this.x);
}
diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js
index fb09247c..43665ce3 100644
--- a/js/Events/CLKSOMV_f.js
+++ b/js/Events/CLKSOMV_f.js
@@ -8,7 +8,7 @@ function CLKSOMV_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = new ScilabDouble([-1]);
this.model.dep_ut = [false,false];
- gr_i = [];
+ var gr_i = [];
this.x = standard_define([2,2],this.model,[],gr_i);
return new BasicBlock(this.x);
}
diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js
index 18f8b9e9..10342a16 100644
--- a/js/Events/CLKSOM_f.js
+++ b/js/Events/CLKSOM_f.js
@@ -8,7 +8,7 @@ function CLKSOM_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = new ScilabDouble([-1]);
this.model.dep_ut = [false,false];
- gr_i = [];
+ var gr_i = [];
this.x = standard_define([1,1]/1.2,this.model,[],gr_i);
return new BasicBlock(this.x);
}
diff --git a/js/Events/END_c.js b/js/Events/END_c.js
index 9413584b..77911212 100644
--- a/js/Events/END_c.js
+++ b/js/Events/END_c.js
@@ -9,8 +9,8 @@ function END_c() {
this.model.firing = new ScilabDouble([this.tf]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
- exprs = string(this.tf);
- gr_i = [];
+ var exprs = string(this.tf);
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -26,8 +26,8 @@ function END_c() {
END_c.prototype.set = function END_c() {
this.tf = parseFloat(arguments[0]["tf"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = 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);
diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js
index f8f5780f..d535d0d6 100644
--- a/js/Events/EVTDLY_c.js
+++ b/js/Events/EVTDLY_c.js
@@ -11,8 +11,8 @@ function EVTDLY_c() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = new ScilabDouble([this.ff]);
this.model.dep_ut = [false,false];
- exprs = [[string(this.dt)],[sci2exp(this.ff)]];
- gr_i = [];
+ var exprs = [[string(this.dt)],[sci2exp(this.ff)]];
+ var gr_i = [];
this.x = standard_define([3,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -30,8 +30,8 @@ function EVTDLY_c() {
this.dt = parseFloat(arguments[0]["dt"])
this.ff = parseFloat(arguments[0]["ff"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = 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);
@@ -40,7 +40,7 @@ function EVTDLY_c() {
}
if (this.dt<=0) {
message("Delay must be positive");
- ok = false;
+ var ok = false;
}
if (ok) {
graphics.exprs = exprs;
diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js
index 75a2562a..e7fb881b 100644
--- a/js/Events/EVTDLY_f.js
+++ b/js/Events/EVTDLY_f.js
@@ -11,8 +11,8 @@ function EVTDLY_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = new ScilabDouble([this.ff]);
this.model.dep_ut = [false,false];
- exprs = [[string(this.dt)],[sci2exp(this.ff)]];
- gr_i = [];
+ var exprs = [[string(this.dt)],[sci2exp(this.ff)]];
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -30,8 +30,8 @@ function EVTDLY_f() {
this.dt = parseFloat(arguments[0]["dt"])
this.ff = parseFloat(arguments[0]["ff"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = 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);
@@ -40,7 +40,7 @@ function EVTDLY_f() {
}
if (this.dt<=0) {
message("Delay must be positive");
- ok = false;
+ var ok = false;
}
if (ok) {
graphics.exprs = exprs;
diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js
index 49aabdb2..e6073dbb 100644
--- a/js/Events/EVTGEN_f.js
+++ b/js/Events/EVTGEN_f.js
@@ -8,8 +8,8 @@ function EVTGEN_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = new ScilabDouble([this.tt]);
this.model.dep_ut = [false,false];
- exprs = string(this.tt);
- gr_i = [];
+ var exprs = string(this.tt);
+ var gr_i = [];
this.x = standard_define([3,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -25,8 +25,8 @@ function EVTGEN_f() {
EVTGEN_f.prototype.set = function EVTGEN_f() {
this.tt = parseFloat(arguments[0]["tt"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = graphics.exprs;
this.model = arg1.model;
while (true) {
[ok,this.tt,exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),exprs);
diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js
index 1359531e..36d2d1d6 100644
--- a/js/Events/EVTVARDLY.js
+++ b/js/Events/EVTVARDLY.js
@@ -10,8 +10,8 @@ function EVTVARDLY() {
this.model.firing = new ScilabDouble([-1]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
- exprs = string(this.model.firing);
- gr_i = [];
+ var exprs = string(this.model.firing);
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -26,8 +26,8 @@ function EVTVARDLY() {
EVTVARDLY.prototype.set = function EVTVARDLY() {
this.fir = arguments[0]["fir"]
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = 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);
diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js
index ede573fe..ee80ba4e 100644
--- a/js/Events/HALT_f.js
+++ b/js/Events/HALT_f.js
@@ -9,8 +9,8 @@ function HALT_f() {
this.model.ipar = new ScilabDouble([0]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
- exprs = string(this.n);
- gr_i = [];
+ var exprs = string(this.n);
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -26,8 +26,8 @@ function HALT_f() {
HALT_f.prototype.set = function HALT_f() {
this.n = parseFloat(arguments[0]["n"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = 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);
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index f4a14f8a..27452a38 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -13,8 +13,8 @@ function IFTHEL_f() {
this.model.dep_ut = [true,false];
this.model.nmode = new ScilabDouble([1]);
this.model.nzcross = new ScilabDouble([1]);
- gr_i = [];
- exprs = [[string(this.model.in1)],[string(this.model.nmode)]];
+ var gr_i = [];
+ var exprs = [[string(this.model.in1)],[string(this.model.nmode)]];
this.x = standard_define([3,3],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -32,11 +32,11 @@ function IFTHEL_f() {
this.inh = inverse(arguments[0]["inh"])
this.nmod = parseFloat(arguments[0]["nmod"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = graphics.exprs;
this.model = arg1.model;
if (exprs==[]) {
- exprs = string(1);
+ var exprs = string(1);
}
if (size(exprs,"*")==1) {
exprs[2-1] = string(1);
@@ -53,7 +53,10 @@ function IFTHEL_f() {
if (this.inh!=1) {
this.inh = [];
}
- [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[[1],[1]]);
+ var tmpvar0 = check_io(this.model,graphics,1,[],this.inh,[[1],[1]])
+ this.model = tmpvar0[0]
+ var graphics = tmpvar0[1]
+ var ok = tmpvar0[2];
if (ok) {
graphics.exprs = exprs;
this.model.evtin = this.inh;
diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle
index db2380f6..39f28732 100644
--- a/js/Events/IFTHEL_f.pickle
+++ b/js/Events/IFTHEL_f.pickle
@@ -63,40 +63,37 @@ sS'model.evtout'
p20
S'matrix'
p21
-sS'[this.model,graphics,ok]'
-p22
-g19
sS'model.nmode'
-p23
+p22
g6
sS'graphics.exprs'
-p24
+p23
g16
sS'model.nzcross'
-p25
+p24
g6
sS'model.sim[2]'
-p26
+p25
g6
sS'model.blocktype'
-p27
+p26
g16
sS'model.dep_ut'
-p28
+p27
g8
sS'exprs'
-p29
+p28
g21
sS'gr_i'
-p30
+p29
g8
sS'y'
-p31
+p30
g8
sS'x'
-p32
+p31
g6
sS'model'
-p33
+p32
g2
s. \ No newline at end of file
diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js
index 95bed535..81d7a1e3 100644
--- a/js/Events/MCLOCK_f.js
+++ b/js/Events/MCLOCK_f.js
@@ -1,10 +1,10 @@
/* autogenerated from "macros/Events/MCLOCK_f.sci" */
function MCLOCK_f() {
MCLOCK_f.prototype.define = function MCLOCK_f() {
- nn = 2;
- dt = 0.1;
- exprs = [[string(dt)],[string(nn)]];
- mfclck = MFCLCK_f("define");
+ var nn = 2;
+ var dt = 0.1;
+ var exprs = [[string(dt)],[string(nn)]];
+ var mfclck = MFCLCK_f("define");
mfclck.graphics.orig = [334,199];
mfclck.graphics.sz = [40,40];
mfclck.graphics.flip = true;
@@ -14,37 +14,37 @@ function MCLOCK_f() {
mfclck.model.rpar = 0.1;
mfclck.model.ipar = nn;
mfclck.model.firing = [-1,0];
- clksom = CLKSOM_f("define");
+ var clksom = CLKSOM_f("define");
clksom.graphics.orig = [457,161];
clksom.graphics.sz = [16.666667,16.666667];
clksom.graphics.flip = true;
clksom.graphics.exprs = [["0.1"],["0.1"]];
clksom.graphics.pein = [[4],[9],[0]];
clksom.graphics.peout = 5;
- output_port1 = CLKOUT_f("define");
+ var output_port1 = CLKOUT_f("define");
output_port1.graphics.orig = [509,261];
output_port1.graphics.sz = [20,20];
output_port1.graphics.flip = true;
output_port1.graphics.exprs = "1";
output_port1.graphics.pein = 10;
output_port1.model.ipar = 1;
- output_port2 = CLKOUT_f("define");
+ var output_port2 = CLKOUT_f("define");
output_port2.graphics.orig = [509,142];
output_port2.graphics.sz = [20,20];
output_port2.graphics.flip = true;
output_port2.graphics.exprs = "2";
output_port2.graphics.pein = 13;
output_port2.model.ipar = 2;
- split1 = CLKSPLIT_f("define");
+ var split1 = CLKSPLIT_f("define");
split1.graphics.orig = [[411.92504],[169.33333]];
split1.graphics.pein = 3;
split1.graphics.peout = [[9],[10]];
- split2 = CLKSPLIT_f("define");
+ var split2 = CLKSPLIT_f("define");
split2.graphics.orig = [[482.45315],[169.33333]];
split2.graphics.pein = 5;
split2.graphics.peout = [[12],[13]];
- gr_i = [];
- diagram = scicos_diagram();
+ var gr_i = [];
+ var diagram = scicos_diagram();
diagram.objs[1-1] = mfclck;
diagram.objs[2-1] = clksom;
diagram.objs[3-1] = scicos_link(xx=[[360.7],[360.7],[411.9]],yy=[[193.3],[169.3],[169.3]],ct=[10,-1],from=[1,2],to=[8,1]);
@@ -79,23 +79,23 @@ function MCLOCK_f() {
}
MCLOCK_f.prototype.set = function MCLOCK_f() {
for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
- o = arg1.model.rpar.objs[i-1];
+ var o = arg1.model.rpar.objs[i-1];
if (typeof(o)=="Block"&&o.gui=="MFCLCK_f") {
- path = i;
+ var path = i;
break;
}
}
- newpar = list();
- spath = list("model","rpar","objs",path);
- xx = arg1[spath-1];
+ var newpar = list();
+ var spath = list("model","rpar","objs",path);
+ var xx = arg1[spath-1];
execstr("xxn="+xx.gui+"(\'set\',xx)");
if (or(this.xxn!=xx)) {
arg1[spath-1] = this.xxn;
newpar[size(newpar)+1-1] = path;
}
this.x = arg1;
- y = 0;
- typ = newpar;
+ var y = 0;
+ var typ = newpar;
return new BasicBlock(this.x);
}
}
diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js
index 8a646014..ef618f72 100644
--- a/js/Events/MFCLCK_f.js
+++ b/js/Events/MFCLCK_f.js
@@ -13,8 +13,8 @@ function MFCLCK_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [-1,0];
this.model.dep_ut = [false,false];
- exprs = [[string(this.dt)],[string(this.nn)]];
- gr_i = [];
+ var exprs = [[string(this.dt)],[string(this.nn)]];
+ var gr_i = [];
this.x = standard_define([3,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -32,14 +32,14 @@ function MFCLCK_f() {
this.dt = parseFloat(arguments[0]["dt"])
this.nn = parseFloat(arguments[0]["nn"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = 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) {
this.model.ipar = new ScilabDouble([this.nn]);
this.model.rpar = new ScilabDouble([this.dt]);
- hh = this.model.firing;
+ var hh = this.model.firing;
hh[2-1] = 0;
this.model.firing = hh;
graphics.exprs = exprs;
diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js
index bb1ccae9..ba3dd675 100644
--- a/js/Events/M_freq.js
+++ b/js/Events/M_freq.js
@@ -10,8 +10,8 @@ function M_freq() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [0,-1,-1];
this.model.dep_ut = [false,false];
- exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]];
- gr_i = [];
+ var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]];
+ var gr_i = [];
this.x = standard_define([3,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -29,9 +29,9 @@ function M_freq() {
this.frequ = inverse(arguments[0]["frequ"])
this.offset = inverse(arguments[0]["offset"])
this.x = arg1;
- graphics = arg1.graphics;
+ var graphics = arg1.graphics;
this.model = arg1.model;
- exprs = graphics.exprs;
+ var exprs = 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) {
@@ -41,21 +41,33 @@ function M_freq() {
this.frequ = this.frequ.slice();
if ((size(this.frequ,"*"))!=(size(this.offset,"*"))) {
message("offset and frequency must have the same size");
- ok = false;
+ var ok = false;
} else if (or(this.frequ<0)) {
message("Frequency must be a positif number");
- ok = false;
+ var ok = false;
} else if (or(abs(this.offset)>this.frequ)) {
message("The |Offset| must be less than the Frequency");
- ok = false;
+ var ok = false;
}
if (ok) {
- [m,den,off,count,m1,fir,this.frequ,this.offset,ok] = mfrequ_clk(this.frequ,this.offset);
+ 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]));
- mn = (2^size(m1,"*"))-1;
- [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1));
+ 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 ok = tmpvar1[2];
if (mn>3) {
graphics.sz = [40+(mn-3)*10,40];
} else {
diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle
index c059a6fd..1b907d36 100644
--- a/js/Events/M_freq.pickle
+++ b/js/Events/M_freq.pickle
@@ -23,96 +23,90 @@ S'object'
p2
sS'graphics.exprs'
p3
-NsS'[m,den,off,count,m1,fir,this.frequ,this.offset,ok]'
+NsS'istreated'
p4
-S'double'
+S'boolean'
p5
-sS'istreated'
+sS'x.model'
p6
-S'boolean'
+NsS'ind'
p7
-sS'x.model'
+S'double'
p8
-NsS'ind'
-p9
-g5
sS'graphics'
-p10
+p9
g2
sS'x.graphics'
-p11
+p10
g2
sS'model.evtin'
-p12
-g5
+p11
+g8
sS'model.firing'
-p13
+p12
S'vector'
-p14
+p13
sS'model.sim'
-p15
+p14
S'list'
-p16
+p15
sS'model.evtout'
-p17
+p16
S'matrix'
-p18
-sS'[this.model,graphics,ok]'
-p19
-g5
+p17
sS'model.rpar'
-p20
-g14
+p18
+g13
sS'graphics.sz'
-p21
-g14
+p19
+g13
sS'offset'
-p22
-g14
+p20
+g13
sS'typ'
-p23
-g14
+p21
+g13
sS'model.opar'
-p24
-g16
+p22
+g15
sS'ok'
-p25
-g7
+p23
+g5
sS'model.blocktype'
-p26
+p24
S'string'
-p27
+p25
sS'frequ'
-p28
-g14
+p26
+g13
sS'mn'
-p29
-g5
+p27
+g8
sS'm'
-p30
-g18
+p28
+g17
sS'model.dep_ut'
-p31
-g14
+p29
+g13
sS'exprs'
-p32
-g18
+p30
+g17
sS'gr_i'
-p33
-g14
+p31
+g13
sS'y'
-p34
-g14
+p32
+g13
sS'x'
-p35
-g5
+p33
+g8
sS'model'
-p36
+p34
g2
sS'ot'
-p37
-g18
+p35
+g17
sS'k'
-p38
-g18
+p36
+g17
s. \ No newline at end of file
diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js
index c8c77beb..a4b3baed 100644
--- a/js/Events/VirtualCLK0.js
+++ b/js/Events/VirtualCLK0.js
@@ -9,7 +9,7 @@ function VirtualCLK0() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = new ScilabDouble([-1]);
this.model.dep_ut = [false,false];
- exprs = [];
+ var exprs = [];
this.x = standard_define([2,2],this.model,exprs," ");
return new BasicBlock(this.x);
}
diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js
index b7e4817d..7c42fa2a 100644
--- a/js/Events/freq_div.js
+++ b/js/Events/freq_div.js
@@ -1,7 +1,7 @@
/* autogenerated from "macros/Events/freq_div.sci" */
function freq_div() {
freq_div.prototype.define = function freq_div() {
- scs_m_1 = scicos_diagram();
+ var scs_m_1 = scicos_diagram();
scs_m_1.objs[1-1] = Modulo_Count("define");
scs_m_1.objs[2-1] = CLKINV_f("define");
scs_m_1.objs[3-1] = CLKOUTV_f("define");
@@ -12,8 +12,8 @@ function freq_div() {
scs_m_1.objs[8-1] = scicos_link();
scs_m_1.objs[9-1] = scicos_link();
scs_m_1.objs[10-1] = scicos_link();
- blk = scs_m_1.objs[1-1];
- graphics = blk.graphics;
+ var blk = scs_m_1.objs[1-1];
+ var graphics = blk.graphics;
this.model = blk.model;
graphics.orig = [0,-100];
graphics.sz = [60,40];
@@ -25,8 +25,8 @@ function freq_div() {
blk.graphics = graphics;
blk.model = this.model;
scs_m_1.objs[1-1] = blk;
- blk = scs_m_1.objs[2-1];
- graphics = blk.graphics;
+ var blk = scs_m_1.objs[2-1];
+ var graphics = blk.graphics;
this.model = blk.model;
graphics.orig = [120,0];
graphics.sz = [20,20];
@@ -36,8 +36,8 @@ function freq_div() {
blk.graphics = graphics;
blk.model = this.model;
scs_m_1.objs[2-1] = blk;
- blk = scs_m_1.objs[3-1];
- graphics = blk.graphics;
+ var blk = scs_m_1.objs[3-1];
+ var graphics = blk.graphics;
this.model = blk.model;
graphics.orig = [130,-160];
graphics.sz = [20,20];
@@ -47,8 +47,8 @@ function freq_div() {
blk.graphics = graphics;
blk.model = this.model;
scs_m_1.objs[3-1] = blk;
- blk = scs_m_1.objs[4-1];
- graphics = blk.graphics;
+ var blk = scs_m_1.objs[4-1];
+ var graphics = blk.graphics;
this.model = blk.model;
graphics.orig = [100,-100];
graphics.sz = [60,40];
@@ -60,8 +60,8 @@ function freq_div() {
blk.graphics = graphics;
blk.model = this.model;
scs_m_1.objs[4-1] = blk;
- blk = scs_m_1.objs[5-1];
- graphics = blk.graphics;
+ var blk = scs_m_1.objs[5-1];
+ var graphics = blk.graphics;
this.model = blk.model;
graphics.orig = [127,-33];
graphics.sz = [7,7];
@@ -70,26 +70,26 @@ function freq_div() {
blk.graphics = graphics;
blk.model = this.model;
scs_m_1.objs[5-1] = blk;
- lnk = scs_m_1.objs[6-1];
+ var lnk = scs_m_1.objs[6-1];
lnk.ct = [5,-1];
lnk.from = [2,1,0];
lnk.to = [5,1,1];
scs_m_1.objs[6-1] = lnk;
- lnk = scs_m_1.objs[7-1];
+ var lnk = scs_m_1.objs[7-1];
lnk.from = [1,1,0];
lnk.to = [4,1,1];
scs_m_1.objs[7-1] = lnk;
- lnk = scs_m_1.objs[8-1];
+ var lnk = scs_m_1.objs[8-1];
lnk.ct = [5,-1];
lnk.from = [4,2,0];
lnk.to = [3,1,1];
scs_m_1.objs[8-1] = lnk;
- lnk = scs_m_1.objs[9-1];
+ var lnk = scs_m_1.objs[9-1];
lnk.ct = [5,-1];
lnk.from = [5,1,0];
lnk.to = [4,1,1];
scs_m_1.objs[9-1] = lnk;
- lnk = scs_m_1.objs[10-1];
+ var lnk = scs_m_1.objs[10-1];
lnk.xx = [0,30,1];
lnk.yy = [0,-30,1];
lnk.ct = [5,-1];
@@ -103,7 +103,7 @@ function freq_div() {
this.model.evtin = new ScilabDouble([1]);
this.model.evtout = new ScilabDouble([1]);
this.model.rpar = scs_m_1;
- gr_i = [];
+ var gr_i = [];
this.x = standard_define([3,2],this.model,[],gr_i);
return new BasicBlock(this.x);
}
@@ -121,23 +121,23 @@ function freq_div() {
%ph = parseFloat(arguments[0]["%ph"])
%df = parseFloat(arguments[0]["%df"])
for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
- o = arg1.model.rpar.objs[i-1];
+ var o = arg1.model.rpar.objs[i-1];
if (typeof(o)=="Block"&&o.gui=="Modulo_Count") {
- path = i;
+ var path = i;
break;
}
}
- newpar = list();
- y = 0;
- spath = list();
+ var newpar = list();
+ var y = 0;
+ var spath = list();
spath[$+1-1] = "model";
spath[$+1-1] = "rpar";
spath[$+1-1] = "objs";
spath[$+1-1] = path;
- xx = arg1[spath-1];
- xxn = xx;
- graphics = xx.graphics;
- exprs = graphics.exprs;
+ var xx = arg1[spath-1];
+ var xxn = xx;
+ var graphics = xx.graphics;
+ var exprs = 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);
@@ -162,47 +162,47 @@ function freq_div() {
}
if (diffobjs(xxn,xx)) {
this.model = xx.model;
- model_n = xxn.model;
+ var model_n = xxn.model;
if (!is_modelica_block(xx)) {
- modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label);
+ var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label);
if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) {
- needcompile = 1;
+ var needcompile = 1;
}
if (or(this.model.firing!=model_n.firing)) {
- needcompile = 2;
+ var needcompile = 2;
}
if (this.model.sim=="input"||this.model.sim=="output") {
if (this.model.ipar!=model_n.ipar) {
- needcompile = 4;
+ var needcompile = 4;
}
}
if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
- needcompile = 4;
+ var needcompile = 4;
}
if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
- needcompile = 4;
+ var needcompile = 4;
}
if (prod(size(model_n.sim))>1) {
if (model_n.sim[2-1]>1000) {
if (this.model.sim[1-1]!=model_n.sim[1-1]) {
- needcompile = 4;
+ var needcompile = 4;
}
}
}
} else {
- modified = or(model_n!=this.model);
- eq = this.model.equations;
- eqn = model_n.equations;
+ var modified = or(model_n!=this.model);
+ var eq = this.model.equations;
+ var eqn = model_n.equations;
if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
- needcompile = 4;
+ var needcompile = 4;
}
}
arg1[spath-1] = xxn;
newpar[size(newpar)+1-1] = 1;
- y = max(y,needcompile);
+ var y = max(y,needcompile);
}
this.x = arg1;
- typ = newpar;
+ var typ = newpar;
return new BasicBlock(this.x);
}
}
generated by cgit (git 2.34.1) at 2025-03-13 14:29:16 +0000