summaryrefslogtreecommitdiff
path: root/js/Events
diff options
context:
space:
mode:
Diffstat (limited to 'js/Events')
-rw-r--r--js/Events/END_c.js2
-rw-r--r--js/Events/EVTDLY_c.js2
-rw-r--r--js/Events/EVTVARDLY.js2
-rw-r--r--js/Events/IFTHEL_f.js4
-rw-r--r--js/Events/IFTHEL_f.pickle10
-rw-r--r--js/Events/M_freq.js6
6 files changed, 13 insertions, 13 deletions
diff --git a/js/Events/END_c.js b/js/Events/END_c.js
index ec7627e1..ec27739d 100644
--- a/js/Events/END_c.js
+++ b/js/Events/END_c.js
@@ -3,7 +3,7 @@ function END_c() {
END_c.prototype.define = function END_c() {
this.tf = 100000000;
this.model = scicos_model();
- this.model.sim = list("scicosexit",4);
+ this.model.sim = list(new ScilabString("scicosexit"),new ScilabDouble(4));
this.model.evtin = new ScilabDouble(1);
this.model.evtout = new ScilabDouble(1);
this.model.firing = new ScilabDouble(this.tf);
diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js
index 8d659cdc..54fca32e 100644
--- a/js/Events/EVTDLY_c.js
+++ b/js/Events/EVTDLY_c.js
@@ -4,7 +4,7 @@ function EVTDLY_c() {
this.dt = 0.1;
this.ff = 0.0;
this.model = scicos_model();
- this.model.sim = list("evtdly4",4);
+ this.model.sim = list(new ScilabString("evtdly4"),new ScilabDouble(4));
this.model.evtin = new ScilabDouble(1);
this.model.evtout = new ScilabDouble(1);
this.model.rpar = [[this.dt],[this.ff]];
diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js
index 5d66c02e..941f0a28 100644
--- a/js/Events/EVTVARDLY.js
+++ b/js/Events/EVTVARDLY.js
@@ -2,7 +2,7 @@
function EVTVARDLY() {
EVTVARDLY.prototype.define = function EVTVARDLY() {
this.model = scicos_model();
- this.model.sim = list("evtvardly",4);
+ this.model.sim = list(new ScilabString("evtvardly"),new ScilabDouble(4));
this.model.in1 = new ScilabDouble(1);
this.model.evtin = new ScilabDouble(1);
this.model.evtout = new ScilabDouble(1);
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index ad55f013..73cba2af 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -2,7 +2,7 @@
function IFTHEL_f() {
IFTHEL_f.prototype.define = function IFTHEL_f() {
this.model = scicos_model();
- this.model.sim = list("ifthel",-1);
+ this.model.sim = list(new ScilabString("ifthel"),new ScilabDouble(-1));
this.model.in1 = new ScilabDouble(1);
this.model.in2 = new ScilabDouble(1);
this.model.intyp = new ScilabDouble(-1);
@@ -57,7 +57,7 @@ function IFTHEL_f() {
if (ok) {
graphics.exprs = exprs;
this.model.evtin = this.inh;
- this.model.sim[('2', 'double')] = new ScilabDouble(-1);
+ this.model.sim[2] = new ScilabDouble(-1);
this.model.nmode = new ScilabDouble(this.nmod);
this.model.nzcross = new ScilabDouble(this.nmod);
this.x.graphics = graphics;
diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle
index 8588196e..b2df8700 100644
--- a/js/Events/IFTHEL_f.pickle
+++ b/js/Events/IFTHEL_f.pickle
@@ -63,16 +63,16 @@ sS'model.evtout'
p20
S'matrix'
p21
-sS"model.sim[('2', 'double')]"
-p22
-g6
sS'model.nmode'
-p23
+p22
g6
sS'graphics.exprs'
-p24
+p23
g16
sS'model.nzcross'
+p24
+g6
+sS'model.sim[2]'
p25
g6
sS'[model,graphics,ok]'
diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js
index 56413dab..afbb7a55 100644
--- a/js/Events/M_freq.js
+++ b/js/Events/M_freq.js
@@ -2,11 +2,11 @@
function M_freq() {
M_freq.prototype.define = function M_freq() {
this.model = scicos_model();
- this.model.sim = list("m_frequ",4);
+ this.model.sim = list(new ScilabString("m_frequ"),new ScilabDouble(4));
this.model.evtout = [[1],[1],[1]];
this.model.evtin = new ScilabDouble(1);
this.model.rpar = [];
- this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]],1,0,0);
+ this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]],new ScilabDouble(1),new ScilabDouble(0),new ScilabDouble(0));
this.model.blocktype = new ScilabString("d");
this.model.firing = [0,-1,-1];
this.model.dep_ut = [false,false];
@@ -53,7 +53,7 @@ function M_freq() {
[m,den,off,count,m1,fir,this.frequ,this.offset,ok] = mfrequ_clk(this.frequ,this.offset);
}
if (ok) {
- this.model.opar = list(m,double(den),off,count);
+ this.model.opar = list(m,new ScilabDouble(double(den)),new ScilabDouble(off),new ScilabDouble(count));
mn = (2^size(m1,"*"))-1;
[model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1));
if (mn>3) {