From 6ee02952c836bb31e9b51783e6a16724fba64637 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Fri, 13 Jul 2018 15:37:42 +0530 Subject: change in1 to in --- js/Misc/MPBLOCK.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'js/Misc/MPBLOCK.js') diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 7570905b..2ceff438 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -23,7 +23,7 @@ function MPBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([10004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); @@ -41,9 +41,6 @@ function MPBLOCK() { return options; } MPBLOCK.prototype.set = function MPBLOCK() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -54,7 +51,7 @@ function MPBLOCK() { } this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - var lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1); @@ -252,7 +249,7 @@ function MPBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = lab_1[1-1]; + this.exprs.in = lab_1[1-1]; this.exprs.intype = lab_1[2-1]; this.exprs.out = lab_1[3-1]; this.exprs.outtype = lab_1[4-1]; -- cgit