diff options
author | ASP1234 | 2016-06-23 11:50:30 +0000 |
---|---|---|
committer | ASP1234 | 2016-06-23 11:50:30 +0000 |
commit | fa454f066ef830b14e4c22f03451a18f06ff25e1 (patch) | |
tree | 3c487b4e6ce202f7f799882c2ec0ed2b0e1ab4af | |
parent | 4b268e6599b40d1fa9de11ae6c847b763d5bf8c1 (diff) | |
download | xcos-on-web-fa454f066ef830b14e4c22f03451a18f06ff25e1.tar.gz xcos-on-web-fa454f066ef830b14e4c22f03451a18f06ff25e1.tar.bz2 xcos-on-web-fa454f066ef830b14e4c22f03451a18f06ff25e1.zip |
Implement CLINDUMMY_f Block
-rw-r--r-- | data_structures_correct/ANDBLK.js | 4 | ||||
-rw-r--r-- | data_structures_correct/CLINDUMMY_f.js | 20 | ||||
-rw-r--r-- | index.html | 16 |
3 files changed, 30 insertions, 10 deletions
diff --git a/data_structures_correct/ANDBLK.js b/data_structures_correct/ANDBLK.js index 4f632ff..11ea9a0 100644 --- a/data_structures_correct/ANDBLK.js +++ b/data_structures_correct/ANDBLK.js @@ -112,10 +112,10 @@ function ANDBLK() { this.x.gui = new ScilabString(["ANDBLK"]); this.x.graphics.sz = new ScilabDouble([2, 2]); this.x.graphics.gr_i = new ScilabDouble(); - this.x.graphics.pein = new ScilabDouble([0, 0]); + this.x.graphics.pein = new ScilabDouble([0], [0]); this.x.graphics.peout = new ScilabDouble([0]); this.x.model.sim = new ScilabString(["csuper"]); - this.x.model.evtin = new ScilabDouble([1, 1]); + this.x.model.evtin = new ScilabDouble([1], [1]); this.x.model.evtout = new ScilabDouble([1]); this.x.model.blocktype = new ScilabString(["h"]); this.x.model.firing = new ScilabBoolean([false]); diff --git a/data_structures_correct/CLINDUMMY_f.js b/data_structures_correct/CLINDUMMY_f.js new file mode 100644 index 0000000..7167f84 --- /dev/null +++ b/data_structures_correct/CLINDUMMY_f.js @@ -0,0 +1,20 @@ +function CLINDUMMY_f() { + + CLINDUMMY_f.prototype.define = function CLINDUMMY_f() { + this.x0 = 0; + + var model = scicos_model(); + model.sim = list(new ScilabString(["cdummy"]), new ScilabDouble([4])); + model.state = new ScilabDouble([this.x0]); + model.blocktype = new ScilabString(["c"]); + model.firing = new ScilabDouble(); + model.dep_ut = new ScilabBoolean([false, true]); + + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3, 2]), model, new ScilabDouble(), gr_i); + return new BasicBlock(this.x); + } + CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { + return this.x; + } +} @@ -378,17 +378,17 @@ else { outputPort = cellvar.model.out.height; } - if (cellvar.model.evtin.width == null) { + if (cellvar.model.evtin.height == null) { controlPort = 0; } else { - controlPort = cellvar.model.evtin.width; + controlPort = cellvar.model.evtin.height; } - if (cellvar.model.evtout.width == null) { + if (cellvar.model.evtout.height == null) { commandPort = 0; } else { - commandPort = cellvar.model.evtout.width; + commandPort = cellvar.model.evtout.height; } var geometry = cell.getGeometry(); text = 'Block Name : ' + cell.value.getAttribute('blockElementName') + "\n" + @@ -1665,13 +1665,13 @@ } } } - if (blockModel.evtin.width != null) { - for (i = 0; i < blockModel.evtin.width; i++) { + if (blockModel.evtin.height != null) { + for (i = 0; i < blockModel.evtin.height; i++) { controlPorts.push("CONTROL"); } } - if (blockModel.evtout.width != null) { - for (i = 0; i < blockModel.evtout.width; i++) { + if (blockModel.evtout.height != null) { + for (i = 0; i < blockModel.evtout.height; i++) { commandPorts.push("COMMAND"); } } |