support ScilabBoolean, ScilabDouble, ScilabString

1 files changed, 14 insertions, 14 deletions

diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index 5ef219d4..4053bfb2 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -4,18 +4,18 @@ function Counter() {
         this.minim = 0;
         this.maxim = 2;
         this.rule = 1;
-        model = scicos_model();
-        model.sim = list("counter",4);
-        model.evtin = 1;
-        model.out = 1;
-        model.out2 = 1;
-        model.dstate = 0;
-        model.ipar = [[this.rule],[this.maxim],[this.minim]];
-        model.blocktype = "c";
-        model.dep_ut = [false,false];
+        this.model = scicos_model();
+        this.model.sim = list("counter",4);
+        this.model.evtin = new ScilabDouble(1);
+        this.model.out = new ScilabDouble(1);
+        this.model.out2 = new ScilabDouble(1);
+        this.model.dstate = new ScilabDouble(0);
+        this.model.ipar = [[this.rule],[this.maxim],[this.minim]];
+        this.model.blocktype = new ScilabString("c");
+        this.model.dep_ut = [false,false];
         exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]];
         gr_i = [];
-        this.x = standard_define([3,2],model,exprs,gr_i);
+        this.x = standard_define([3,2],this.model,exprs,gr_i);
         return new BasicBlock(this.x);
     }
     Counter.prototype.details = function Counter() {
@@ -36,7 +36,7 @@ function Counter() {
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
-        model = arg1.model;
+        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);
             if (!ok) {
@@ -50,10 +50,10 @@ function Counter() {
                 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;
-                model.dstate = 0;
-                model.ipar = [[this.rule],[this.maxim],[this.minim]];
+                this.model.dstate = new ScilabDouble(0);
+                this.model.ipar = [[this.rule],[this.maxim],[this.minim]];
                 this.x.graphics = graphics;
-                this.x.model = model;
+                this.x.model = this.model;
                 break;
             }
         }