summaryrefslogtreecommitdiff
path: root/js/Sources/Counter.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Sources/Counter.js')
-rw-r--r--js/Sources/Counter.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index de94c91f..26085612 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -13,9 +13,9 @@ function Counter() {
this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([false,false]);
- var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]);
- this.x = standard_define([3,2],this.model,exprs,gr_i);
+ this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]];
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]);
+ this.x = standard_define([3,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
Counter.prototype.details = function Counter() {
@@ -33,12 +33,13 @@ function Counter() {
this.minim = parseFloat(arguments[0]["minim"])
this.maxim = parseFloat(arguments[0]["maxim"])
this.rule = parseFloat(arguments[0]["rule"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.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);
+ [ok,this.minim,this.maxim,this.rule,this.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),this.exprs);
if (!ok) {
break;
}
@@ -49,7 +50,7 @@ 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 {
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.model.dstate = new ScilabDouble([0]);
this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]);
this.x.graphics = this.graphics;