support ScilabBoolean, ScilabDouble, ScilabString

1 files changed, 32 insertions, 32 deletions

diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js
index 452ad747..655cd0a4 100644
--- a/js/Misc/EDGE_TRIGGER.js
+++ b/js/Misc/EDGE_TRIGGER.js
@@ -11,51 +11,51 @@ function EDGE_TRIGGER() {
         scs_m_1.objs[7-1] = scicos_link();
         blk = scs_m_1.objs[1-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [60,0];
         graphics.sz = [60,40];
         graphics.exprs = "0";
-        model.ipar = 0;
+        this.model.ipar = new ScilabDouble(0);
         graphics.pin = 5;
         graphics.pout = 6;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[1-1] = blk;
         blk = scs_m_1.objs[2-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [160,0];
         graphics.sz = [60,40];
         graphics.exprs = [["0"],["0"]];
-        model.evtin = [];
-        model.nzcross = 0;
-        model.nmode = 0;
+        this.model.evtin = [];
+        this.model.nzcross = new ScilabDouble(0);
+        this.model.nmode = new ScilabDouble(0);
         graphics.pin = 6;
         graphics.peout = [[7],[0]];
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[2-1] = blk;
         blk = scs_m_1.objs[3-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [0,10];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pout = 5;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[3-1] = blk;
         blk = scs_m_1.objs[4-1];
         graphics = blk.graphics;
-        model = blk.model;
+        this.model = blk.model;
         graphics.orig = [170,-60];
         graphics.sz = [20,20];
         graphics.exprs = ["1"];
-        model.ipar = 1;
+        this.model.ipar = new ScilabDouble(1);
         graphics.pein = 7;
         blk.graphics = graphics;
-        blk.model = model;
+        blk.model = this.model;
         scs_m_1.objs[4-1] = blk;
         lnk = scs_m_1.objs[5-1];
         lnk.from = [3,1,0];
@@ -72,13 +72,13 @@ function EDGE_TRIGGER() {
         scs_m_1.objs[7-1] = lnk;
         blk={};
         lnk={};
-        model = scicos_model();
-        model.sim = "csuper";
-        model.in1 = 1;
-        model.evtout = 1;
-        model.rpar = scs_m_1;
+        this.model = scicos_model();
+        this.model.sim = new ScilabString("csuper");
+        this.model.in1 = new ScilabDouble(1);
+        this.model.evtout = new ScilabDouble(1);
+        this.model.rpar = scs_m_1;
         gr_i = [];
-        this.x = standard_define([3,2],model,[],gr_i);
+        this.x = standard_define([3,2],this.model,[],gr_i);
         return new BasicBlock(this.x);
     }
     EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() {
@@ -111,40 +111,40 @@ function EDGE_TRIGGER() {
             xx = arg1[spath-1];
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (diffobjs(this.xxn,xx)) {
-                model = xx.model;
+                this.model = xx.model;
                 model_n = this.xxn.model;
                 if (!is_modelica_block(xx)) {
-                    modified = or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.label,model_n.label);
-                    if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)) {
+                    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;
                     }
-                    if (or(model.firing!=model_n.firing)) {
+                    if (or(this.model.firing!=model_n.firing)) {
                         needcompile = 2;
                     }
-                    if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))) {
+                    if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) {
                         needcompile = 4;
                     }
-                    if (model.sim=="input"||model.sim=="output") {
-                        if (model.ipar!=model_n.ipar) {
+                    if (this.model.sim=="input"||this.model.sim=="output") {
+                        if (this.model.ipar!=model_n.ipar) {
                             needcompile = 4;
                         }
                     }
-                    if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+                    if (or(this.model.blocktype!=model_n.blocktype)||or(this.model.dep_ut!=model_n.dep_ut)) {
                         needcompile = 4;
                     }
-                    if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+                    if ((this.model.nzcross!=model_n.nzcross)||(this.model.nmode!=model_n.nmode)) {
                         needcompile = 4;
                     }
                     if (prod(size(model_n.sim))>1) {
                         if (model_n.sim[2-1]>1000) {
-                            if (model.sim[1-1]!=model_n.sim[1-1]) {
+                            if (this.model.sim[1-1]!=model_n.sim[1-1]) {
                                 needcompile = 4;
                             }
                         }
                     }
                 } else {
-                    modified = or(model_n!=model);
-                    eq = model.equations;
+                    modified = or(model_n!=this.model);
+                    eq = this.model.equations;
                     eqn = model_n.equations;
                     if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
                         needcompile = 4;