summaryrefslogtreecommitdiff
path: root/js/MatrixOp
diff options
context:
space:
mode:
Diffstat (limited to 'js/MatrixOp')
-rw-r--r--js/MatrixOp/CUMSUM.js8
-rw-r--r--js/MatrixOp/EXTRACT.js8
-rw-r--r--js/MatrixOp/EXTTRI.js8
-rw-r--r--js/MatrixOp/MATBKSL.js8
-rw-r--r--js/MatrixOp/MATCATH.js8
-rw-r--r--js/MatrixOp/MATCATV.js8
-rw-r--r--js/MatrixOp/MATDET.js8
-rw-r--r--js/MatrixOp/MATDIAG.js8
-rw-r--r--js/MatrixOp/MATDIV.js8
-rw-r--r--js/MatrixOp/MATEIG.js8
-rw-r--r--js/MatrixOp/MATEXPM.js8
-rw-r--r--js/MatrixOp/MATINV.js8
-rw-r--r--js/MatrixOp/MATLU.js8
-rw-r--r--js/MatrixOp/MATMAGPHI.js8
-rw-r--r--js/MatrixOp/MATMUL.js16
-rw-r--r--js/MatrixOp/MATPINV.js8
-rw-r--r--js/MatrixOp/MATRESH.js8
-rw-r--r--js/MatrixOp/MATSING.js8
-rw-r--r--js/MatrixOp/MATSUM.js8
-rw-r--r--js/MatrixOp/MATTRAN.js8
-rw-r--r--js/MatrixOp/MATZCONJ.js3
-rw-r--r--js/MatrixOp/MATZREIM.js8
-rw-r--r--js/MatrixOp/RICC.js8
-rw-r--r--js/MatrixOp/ROOTCOEF.js8
-rw-r--r--js/MatrixOp/SQRT.js5
-rw-r--r--js/MatrixOp/SUBMAT.js8
26 files changed, 156 insertions, 52 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index d0cc813c..e4c3f6ea 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -29,6 +29,11 @@ function CUMSUM() {
return this.x;
}
CUMSUM.prototype.get = function CUMSUM() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set CUMSUM block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
decomptyp:["Sum along (0=the first non singleton dimension 1=Rows 2=Columns)",this.decomptyp],
@@ -103,7 +108,6 @@ function CUMSUM() {
return new BasicBlock(this.x);
}
CUMSUM.prototype.get_popup_title = function CUMSUM() {
- var set_param_popup_title = "Set CUMSUM block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index ee7f77bb..9af77da4 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -29,6 +29,11 @@ function EXTRACT() {
return this.x;
}
EXTRACT.prototype.get = function EXTRACT() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set EXTRACT Block";
var options = {
typ:["Datatype (1=real double 2=Complex)",this.typ],
a:["Lines to extract",this.a],
@@ -104,7 +109,6 @@ function EXTRACT() {
return new BasicBlock(this.x);
}
EXTRACT.prototype.get_popup_title = function EXTRACT() {
- var set_param_popup_title = "Set EXTRACT Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js
index d874fbff..726daa2c 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -29,6 +29,11 @@ function EXTTRI() {
return this.x;
}
EXTTRI.prototype.get = function EXTTRI() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set EXTTRI block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
decomptyp:["extraction type (1=lower 2=upper 3=diagonal)",this.decomptyp],
@@ -100,7 +105,6 @@ function EXTTRI() {
return new BasicBlock(this.x);
}
EXTTRI.prototype.get_popup_title = function EXTTRI() {
- var set_param_popup_title = "Set EXTTRI block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index f0a16862..3f8e402b 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -29,6 +29,11 @@ function MATBKSL() {
return this.x;
}
MATBKSL.prototype.get = function MATBKSL() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATBKSL Block";
var options = {
typ:["Datatype (1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATBKSL() {
return new BasicBlock(this.x);
}
MATBKSL.prototype.get_popup_title = function MATBKSL() {
- var set_param_popup_title = "Set MATBKSL Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js
index 4c21162d..b176cd8c 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -29,6 +29,11 @@ function MATCATH() {
return this.x;
}
MATCATH.prototype.get = function MATCATH() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")>1) {
+ var label = "size(evstr("+label[2-1]+"),\'*\')";
+ }
+ this.set_param_popup_title = "Set MATCATH block parameters";
var options = {
nin:["Number of input",this.nin],
}
@@ -65,7 +70,6 @@ function MATCATH() {
return new BasicBlock(this.x);
}
MATCATH.prototype.get_popup_title = function MATCATH() {
- var set_param_popup_title = "Set MATCATH block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js
index b8241695..80a2fee4 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -30,6 +30,11 @@ function MATCATV() {
return this.x;
}
MATCATV.prototype.get = function MATCATV() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")>1) {
+ var label = "size(evstr("+label[2-1]+"),\'*\')";
+ }
+ this.set_param_popup_title = "Set MATCATV block parameters";
var options = {
nin:["Number od inputs",this.nin],
}
@@ -66,7 +71,6 @@ function MATCATV() {
return new BasicBlock(this.x);
}
MATCATV.prototype.get_popup_title = function MATCATV() {
- var set_param_popup_title = "Set MATCATV block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js
index c2e37940..b03953df 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -29,6 +29,11 @@ function MATDET() {
return this.x;
}
MATDET.prototype.get = function MATDET() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATDET Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATDET() {
return new BasicBlock(this.x);
}
MATDET.prototype.get_popup_title = function MATDET() {
- var set_param_popup_title = "Set MATDET Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js
index b95d12c0..80baf684 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -29,6 +29,11 @@ function MATDIAG() {
return this.x;
}
MATDIAG.prototype.get = function MATDIAG() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATDIAG Block";
var options = {
typ:["Datatype (1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATDIAG() {
return new BasicBlock(this.x);
}
MATDIAG.prototype.get_popup_title = function MATDIAG() {
- var set_param_popup_title = "Set MATDIAG Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index e9441c86..b2fd6830 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -29,6 +29,11 @@ function MATDIV() {
return this.x;
}
MATDIV.prototype.get = function MATDIV() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATDIV Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATDIV() {
return new BasicBlock(this.x);
}
MATDIV.prototype.get_popup_title = function MATDIV() {
- var set_param_popup_title = "Set MATDIV Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js
index 26b334eb..f7f7e4f5 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -29,6 +29,11 @@ function MATEIG() {
return this.x;
}
MATEIG.prototype.get = function MATEIG() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATEIG block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
decomptyp:["decomposition type (1=eig values 2=eig values+eig vectors",this.decomptyp],
@@ -101,7 +106,6 @@ function MATEIG() {
return new BasicBlock(this.x);
}
MATEIG.prototype.get_popup_title = function MATEIG() {
- var set_param_popup_title = "Set MATEIG block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js
index 110f237d..f004fbfb 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -29,6 +29,11 @@ function MATEXPM() {
return this.x;
}
MATEXPM.prototype.get = function MATEXPM() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set EXPM Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATEXPM() {
return new BasicBlock(this.x);
}
MATEXPM.prototype.get_popup_title = function MATEXPM() {
- var set_param_popup_title = "Set EXPM Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js
index 7e906db7..48abfa74 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -29,6 +29,11 @@ function MATINV() {
return this.x;
}
MATINV.prototype.get = function MATINV() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATINV Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATINV() {
return new BasicBlock(this.x);
}
MATINV.prototype.get_popup_title = function MATINV() {
- var set_param_popup_title = "Set MATINV Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index 051276da..620509fb 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -29,6 +29,11 @@ function MATLU() {
return this.x;
}
MATLU.prototype.get = function MATLU() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATLU block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -77,7 +82,6 @@ function MATLU() {
return new BasicBlock(this.x);
}
MATLU.prototype.get_popup_title = function MATLU() {
- var set_param_popup_title = "Set MATLU block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index 6b4ef2f1..e79cec73 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -29,6 +29,11 @@ function MATMAGPHI() {
return this.x;
}
MATMAGPHI.prototype.get = function MATMAGPHI() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATMAGPHI block parameters";
var options = {
decomptyp:["decomposition type (1=Complex2MAG&PHI 2=MAG&PHI2Complex)",this.decomptyp],
}
@@ -80,7 +85,6 @@ function MATMAGPHI() {
return new BasicBlock(this.x);
}
MATMAGPHI.prototype.get_popup_title = function MATMAGPHI() {
- var set_param_popup_title = "Set MATMAGPHI block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index 8f433c57..93bfe650 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -18,6 +18,19 @@ function MATMUL() {
return this.x;
}
MATMUL.prototype.get = function MATMUL() {
+ this.graphics = this.x.graphics;
+ var label = this.graphics.exprs;
+ this.model = this.x.model;
+ if (this.model.ipar.length==0) {
+ this.model.ipar = new ScilabDouble([1]);
+ }
+ if (size(label,"*")==1) {
+ label[2-1] = sci2exp(1);
+ }
+ if (size(label,"*")==2) {
+ label[3-1] = sci2exp(1);
+ }
+ this.set_param_popup_title = "Set MATMUL parameter";
var options = {
dtype:["Datatype(1=real double 2=Complex 3=int32 ...)",this.dtype],
rule:["Multiplication rule",this.rule],
@@ -165,7 +178,6 @@ function MATMUL() {
return new BasicBlock(this.x);
}
MATMUL.prototype.get_popup_title = function MATMUL() {
- var set_param_popup_title = "Set MATMUL parameter";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index b95fca94..2107fcba 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -29,6 +29,11 @@ function MATPINV() {
return this.x;
}
MATPINV.prototype.get = function MATPINV() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATPINV Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -76,7 +81,6 @@ function MATPINV() {
return new BasicBlock(this.x);
}
MATPINV.prototype.get_popup_title = function MATPINV() {
- var set_param_popup_title = "Set MATPINV Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index a1ebed1c..d4ccd783 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -29,6 +29,11 @@ function MATRESH() {
return this.x;
}
MATRESH.prototype.get = function MATRESH() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATRESH block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
l1:["input size",this.l1],
@@ -110,7 +115,6 @@ function MATRESH() {
return new BasicBlock(this.x);
}
MATRESH.prototype.get_popup_title = function MATRESH() {
- var set_param_popup_title = "Set MATRESH block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js
index e66d59af..393c6714 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -29,6 +29,11 @@ function MATSING() {
return this.x;
}
MATSING.prototype.get = function MATSING() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATSVD block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
decomptyp:["decomposition type (1=singular values 2=sing values+matrix U & V)",this.decomptyp],
@@ -104,7 +109,6 @@ function MATSING() {
return new BasicBlock(this.x);
}
MATSING.prototype.get_popup_title = function MATSING() {
- var set_param_popup_title = "Set MATSVD block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js
index 389d93c7..0a86ae96 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -29,6 +29,11 @@ function MATSUM() {
return this.x;
}
MATSUM.prototype.get = function MATSUM() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATSUM block parameters";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
decomptyp:["Sum along (0=all 1=lines 2=Columns)",this.decomptyp],
@@ -105,7 +110,6 @@ function MATSUM() {
return new BasicBlock(this.x);
}
MATSUM.prototype.get_popup_title = function MATSUM() {
- var set_param_popup_title = "Set MATSUM block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js
index b6cff444..c8e18256 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -17,6 +17,11 @@ function MATTRAN() {
return this.x;
}
MATTRAN.prototype.get = function MATTRAN() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==1) {
+ label[2-1] = sci2exp(1);
+ }
+ this.set_param_popup_title = "Set MATTRAN Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
rule:["rule (1=.\' 2=\')",this.rule],
@@ -70,7 +75,6 @@ function MATTRAN() {
return new BasicBlock(this.x);
}
MATTRAN.prototype.get_popup_title = function MATTRAN() {
- var set_param_popup_title = "Set MATTRAN Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js
index 66124e3e..a1f59161 100644
--- a/js/MatrixOp/MATZCONJ.js
+++ b/js/MatrixOp/MATZCONJ.js
@@ -35,7 +35,6 @@ function MATZCONJ() {
return new BasicBlock(this.x);
}
MATZCONJ.prototype.get_popup_title = function MATZCONJ() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index 0ce616b7..68b66103 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -29,6 +29,11 @@ function MATZREIM() {
return this.x;
}
MATZREIM.prototype.get = function MATZREIM() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set MATZREIM block parameters";
var options = {
decomptyp:["decomposition type (1=Complex2Real&Imag 2=Real&Imag2Complex)",this.decomptyp],
}
@@ -80,7 +85,6 @@ function MATZREIM() {
return new BasicBlock(this.x);
}
MATZREIM.prototype.get_popup_title = function MATZREIM() {
- var set_param_popup_title = "Set MATZREIM block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index a57f1a41..9684b4a5 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -29,6 +29,11 @@ function RICC() {
return this.x;
}
RICC.prototype.get = function RICC() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set RICC Block";
var options = {
tpe:["Type (1=Cont 2=Disc)",this.tpe],
mod:["Model(1=Schr 2=sign(cont) inv(disc))",this.mod],
@@ -66,7 +71,6 @@ function RICC() {
return new BasicBlock(this.x);
}
RICC.prototype.get_popup_title = function RICC() {
- var set_param_popup_title = "Set RICC Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index 1368ccfc..f72a5260 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -29,6 +29,11 @@ function ROOTCOEF() {
return this.x;
}
ROOTCOEF.prototype.get = function ROOTCOEF() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==14) {
+ label[9-1] = [];
+ }
+ this.set_param_popup_title = "Set ROOTCOEF Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
inp:["input row size",this.inp],
@@ -78,7 +83,6 @@ function ROOTCOEF() {
return new BasicBlock(this.x);
}
ROOTCOEF.prototype.get_popup_title = function ROOTCOEF() {
- var set_param_popup_title = "Set ROOTCOEF Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js
index 59eed36f..da74dd84 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -19,6 +19,8 @@ function SQRT() {
return this.x;
}
SQRT.prototype.get = function SQRT() {
+ var label = this.graphics.exprs;
+ this.set_param_popup_title = "Set SQRT Block";
var options = {
typ:["Datatype(1=real double 2=Complex)",this.typ],
}
@@ -61,7 +63,6 @@ function SQRT() {
return new BasicBlock(this.x);
}
SQRT.prototype.get_popup_title = function SQRT() {
- var set_param_popup_title = "Set SQRT Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index 0dada6f4..d3ca5591 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -29,6 +29,11 @@ function SUBMAT() {
return this.x;
}
SUBMAT.prototype.get = function SUBMAT() {
+ var label = this.graphics.exprs;
+ if (size(label,"*")==5) {
+ label[6-1] = sci2exp([1,1]);
+ }
+ this.set_param_popup_title = "Set SUBMAT Block";
var options = {
typ:["Datatype (1=real double 2=Complex)",this.typ],
a:["Starting Row Index",this.a],
@@ -112,7 +117,6 @@ function SUBMAT() {
return new BasicBlock(this.x);
}
SUBMAT.prototype.get_popup_title = function SUBMAT() {
- var set_param_popup_title = "Set SUBMAT Block";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}