summaryrefslogtreecommitdiff
path: root/js/Misc/generic_block3.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Misc/generic_block3.js')
-rw-r--r--js/Misc/generic_block3.js10
1 files changed, 2 insertions, 8 deletions
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index 92f07aba..c0a7e2b4 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -5,14 +5,14 @@ function generic_block3() {
this.function_name = "sinblk";
this.funtyp = 4;
this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp]));
- this.model.in1 = new ScilabDouble([1]);
+ this.model.in = new ScilabDouble([1]);
this.model.in2 = new ScilabDouble([1]);
this.model.intyp = new ScilabDouble([1]);
this.model.out = new ScilabDouble([1]);
this.model.out2 = new ScilabDouble([1]);
this.model.outtyp = new ScilabDouble([1]);
this.model.dep_ut = new ScilabDouble([true,false]);
- var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]];
+ var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]);
this.x = standard_define([4,2],this.model,label,this.gr_i);
return new BasicBlock(this.x);
@@ -65,9 +65,6 @@ function generic_block3() {
this.depu = parseBoolean(arguments[0]["depu"])
this.dept = parseBoolean(arguments[0]["dept"])
this.lab = arguments[0]["lab"]
- this.x = arg1;
- this.model = arg1.model;
- this.graphics = arg1.graphics;
var label = this.graphics.exprs;
if (size(label,"*")==14) {
label[9-1] = [];
@@ -138,10 +135,7 @@ function generic_block3() {
this.model.nzcross = new ScilabDouble([this.nzcr]);
this.model.nmode = new ScilabDouble([this.nmode]);
this.model.dep_ut = new ScilabDouble(dep_ut);
- arg1.model = this.model;
this.graphics.exprs = new ScilabDouble([label]);
- arg1.graphics = this.graphics;
- this.x = arg1;
break;
}
}