diff options
Diffstat (limited to 'js/Sources/Modulo_Count.js')
-rw-r--r-- | js/Sources/Modulo_Count.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index d2ada870..22d253bb 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -11,9 +11,9 @@ function Modulo_Count() { this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [[string(this.ini_c)],[string(this.base)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [[string(this.ini_c)],[string(this.base)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { @@ -29,12 +29,13 @@ function Modulo_Count() { Modulo_Count.prototype.set = function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) + 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.ini_c,this.base,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),exprs); + [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); this.ini_c = int(this.ini_c); this.base = int(this.base); if (!ok) { @@ -45,7 +46,7 @@ function Modulo_Count() { } else if (this.base<=0) { block_parameter_error(msprintf("Wrong values for \'Upper Limit\' parameter: %d.",this.base),"Strictly positive integer expected."); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.base]); this.model.dstate = new ScilabDouble([this.ini_c]); this.x.graphics = this.graphics; |