summaryrefslogtreecommitdiff
path: root/js/IntegerOp/LOGIC.js
diff options
context:
space:
mode:
authorSunil Shetye2018-07-11 17:51:05 +0530
committerSunil Shetye2018-07-12 23:01:50 +0530
commit44a3807a94783e831070f0e003340af58dc64d16 (patch)
treecce50388afa463583d7a7aead34d40f5b02281f7 /js/IntegerOp/LOGIC.js
parent0047c3bea1d86b12a08544f6f0833c63e77f6eac (diff)
downloadsci2js-44a3807a94783e831070f0e003340af58dc64d16.tar.gz
sci2js-44a3807a94783e831070f0e003340af58dc64d16.tar.bz2
sci2js-44a3807a94783e831070f0e003340af58dc64d16.zip
change graphics to object
Diffstat (limited to 'js/IntegerOp/LOGIC.js')
-rw-r--r--js/IntegerOp/LOGIC.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index 97898c8d..4c7ca2f2 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -34,8 +34,8 @@ function LOGIC() {
this.mat = inverse(arguments[0]["mat"])
this.herit = arguments[0]["herit"]
this.x = arg1;
- var graphics = arg1.graphics;
- var exprs = graphics.exprs;
+ this.graphics = arg1.graphics;
+ var exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
[ok,this.mat,this.herit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],["  Rows of the matrix are the output values"],["  Number of rows must be a power of two."],["  Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),exprs);
@@ -60,16 +60,16 @@ function LOGIC() {
var out = [ones(nout,1),ones(nout,1)];
var it = 5*ones(1,nin);
var ot = 5*ones(1,nout);
- var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[])
- this.model = tmpvar0[0]
- var graphics = tmpvar0[1]
+ var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]);
+ this.model = tmpvar0[0];
+ this.graphics = tmpvar0[1];
var ok = tmpvar0[2];
}
if (ok) {
- graphics.exprs = exprs;
+ this.graphics.exprs = new ScilabDouble([exprs]);
this.mat = int8(this.mat);
this.model.opar = list(new ScilabDouble([this.mat]));
- this.x.graphics = graphics;
+ this.x.graphics = this.graphics;
this.x.model = this.model;
break;
}