diff options
Diffstat (limited to 'js/MatrixOp')
-rw-r--r-- | js/MatrixOp/CUMSUM.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/EXTRACT.js | 10 | ||||
-rw-r--r-- | js/MatrixOp/EXTTRI.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATBKSL.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATCATH.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATCATV.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATDET.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATDIAG.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATDIV.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATEIG.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATEXPM.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATINV.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATLU.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATMAGPHI.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATMUL.js | 10 | ||||
-rw-r--r-- | js/MatrixOp/MATPINV.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATRESH.js | 10 | ||||
-rw-r--r-- | js/MatrixOp/MATSING.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATSUM.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATTRAN.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/MATZREIM.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/RICC.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/ROOTCOEF.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/SQRT.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/SUBMAT.js | 16 |
25 files changed, 94 insertions, 94 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 82680d40..5369128f 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -36,15 +36,15 @@ function CUMSUM() { return options; } CUMSUM.prototype.set = function CUMSUM() { - this.typ = inverse(arguments[0]["typ"]) - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.decomptyp,this.lab] = scicos_getvalue("Set CUMSUM block parameters",["Datatype(1=real double 2=Complex)","Sum along (0=the first non singleton dimension 1=Rows 2=Columns)"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 3bf7f5f9..4df55b66 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -37,16 +37,16 @@ function EXTRACT() { return options; } EXTRACT.prototype.set = function EXTRACT() { - this.typ = inverse(arguments[0]["typ"]) - this.a = inverse(arguments[0]["a"]) - this.b = inverse(arguments[0]["b"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.a,this.b,this.exprs] = scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.a = inverse(arguments[0]["a"]); + this.b = inverse(arguments[0]["b"]); + this.exprs = arguments[0]["exprs"]; this.a = this.a.slice(); this.b = this.b.slice(); if (!ok) { diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index aa605214..51c3ebe0 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -36,15 +36,15 @@ function EXTTRI() { return options; } EXTTRI.prototype.set = function EXTTRI() { - this.typ = inverse(arguments[0]["typ"]) - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.decomptyp,this.lab] = scicos_getvalue("Set EXTTRI block parameters",["Datatype(1=real double 2=Complex)","extraction type (1=lower 2=upper 3=diagonal)"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 1abaa75b..d7302c49 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -35,14 +35,14 @@ function MATBKSL() { return options; } MATBKSL.prototype.set = function MATBKSL() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set MATBKSL Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 36708895..55112b29 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -35,14 +35,14 @@ function MATCATH() { return options; } MATCATH.prototype.set = function MATCATH() { - this.nin = arguments[0]["nin"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; } while (true) { - [ok,this.nin,this.lab] = scicos_getvalue("Set MATCATH block parameters",["Number of input"],list("vec",1),label); + var ok = true; + this.nin = arguments[0]["nin"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 70b11951..05ce4e0e 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -36,14 +36,14 @@ function MATCATV() { return options; } MATCATV.prototype.set = function MATCATV() { - this.nin = arguments[0]["nin"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")>1) { var label = "size(evstr("+label[2-1]+"),\'*\')"; } while (true) { - [ok,this.nin,this.lab] = scicos_getvalue("Set MATCATV block parameters",["Number od inputs"],list("vec",1),label); + var ok = true; + this.nin = arguments[0]["nin"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 995c94a4..1cea77be 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -35,14 +35,14 @@ function MATDET() { return options; } MATDET.prototype.set = function MATDET() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDET Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index aa80bfe1..03c618e4 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -35,14 +35,14 @@ function MATDIAG() { return options; } MATDIAG.prototype.set = function MATDIAG() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDIAG Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 35b81a81..5122e3b0 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -35,14 +35,14 @@ function MATDIV() { return options; } MATDIV.prototype.set = function MATDIV() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDIV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 56a5dab1..8c5f72bc 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -36,15 +36,15 @@ function MATEIG() { return options; } MATEIG.prototype.set = function MATEIG() { - this.typ = inverse(arguments[0]["typ"]) - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.decomptyp,this.lab] = scicos_getvalue("Set MATEIG block parameters",["Datatype(1=real double 2=Complex)","decomposition type (1=eig values 2=eig values+eig vectors"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 7e96b899..1c074bc1 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -35,14 +35,14 @@ function MATEXPM() { return options; } MATEXPM.prototype.set = function MATEXPM() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set EXPM Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index aed1155e..e8531268 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -35,14 +35,14 @@ function MATINV() { return options; } MATINV.prototype.set = function MATINV() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set MATINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 5d119e87..535d5d9a 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -35,14 +35,14 @@ function MATLU() { return options; } MATLU.prototype.set = function MATLU() { - this.typ = inverse(arguments[0]["typ"]) - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.lab] = scicos_getvalue("Set MATLU block parameters",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 85b9dfa5..a99bd0f0 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -35,14 +35,14 @@ function MATMAGPHI() { return options; } MATMAGPHI.prototype.set = function MATMAGPHI() { - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.decomptyp,this.lab] = scicos_getvalue("Set MATMAGPHI block parameters",["decomposition type (1=Complex2MAG&PHI 2=MAG&PHI2Complex)"],list("vec",1),label); + var ok = true; + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index d19732dd..2cdd00a2 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -26,10 +26,6 @@ function MATMUL() { return options; } MATMUL.prototype.set = function MATMUL() { - this.dtype = arguments[0]["dtype"] - this.rule = parseFloat(arguments[0]["rule"]) - this.np = parseFloat(arguments[0]["np"]) - this.exprs = arguments[0]["exprs"] this.graphics = this.x.graphics; var label = this.graphics.exprs; this.model = this.x.model; @@ -43,7 +39,11 @@ function MATMUL() { label[3-1] = sci2exp(1); } while (true) { - [ok,this.dtype,this.rule,this.np,this.exprs] = scicos_getvalue([["Set MATMUL parameter"],["For the Multipication rule:"],[" 1= Matrix by Matrix"],[" 2= Matrix by Matrix element wise "],[" 3= Matrix by Scalar"],["In the third case the second input will be the scalar"]],["Datatype(1=real double 2=Complex 3=int32 ...)","Multiplication rule","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",1,"vec",1),label); + var ok = true; + this.dtype = arguments[0]["dtype"]; + this.rule = parseFloat(arguments[0]["rule"]); + this.np = parseFloat(arguments[0]["np"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 64fc901c..c214b727 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -35,14 +35,14 @@ function MATPINV() { return options; } MATPINV.prototype.set = function MATPINV() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set MATPINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 2dd99416..ed92363f 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -37,16 +37,16 @@ function MATRESH() { return options; } MATRESH.prototype.set = function MATRESH() { - this.typ = inverse(arguments[0]["typ"]) - this.l1 = arguments[0]["l1"] - this.out = arguments[0]["out"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.l1,this.out,this.lab] = scicos_getvalue("Set MATRESH block parameters",["Datatype(1=real double 2=Complex)","input size","output size desired"],list("vec",-1,"vec",-1,"vec",-1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.l1 = arguments[0]["l1"]; + this.out = arguments[0]["out"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 68f78b93..37cb4d71 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -36,15 +36,15 @@ function MATSING() { return options; } MATSING.prototype.set = function MATSING() { - this.typ = inverse(arguments[0]["typ"]) - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.decomptyp,this.lab] = scicos_getvalue("Set MATSVD block parameters",["Datatype(1=real double 2=Complex)","decomposition type (1=singular values 2=sing values+matrix U & V)"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index c2e55a3e..897d1a1d 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -36,15 +36,15 @@ function MATSUM() { return options; } MATSUM.prototype.set = function MATSUM() { - this.typ = inverse(arguments[0]["typ"]) - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.decomptyp,this.lab] = scicos_getvalue("Set MATSUM block parameters",["Datatype(1=real double 2=Complex)","Sum along (0=all 1=lines 2=Columns)"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 94b4c12c..c95b11f3 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -24,15 +24,15 @@ function MATTRAN() { return options; } MATTRAN.prototype.set = function MATTRAN() { - this.typ = inverse(arguments[0]["typ"]) - this.rule = arguments[0]["rule"] - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==1) { label[2-1] = sci2exp(1); } while (true) { - [ok,this.typ,this.rule,this.exprs] = scicos_getvalue("Set MATTRAN Block",["Datatype(1=real double 2=Complex)","rule (1=.\' 2=\')"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.rule = arguments[0]["rule"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index f58b1726..f6319315 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -35,14 +35,14 @@ function MATZREIM() { return options; } MATZREIM.prototype.set = function MATZREIM() { - this.decomptyp = arguments[0]["decomptyp"] - this.lab = arguments[0]["lab"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.decomptyp,this.lab] = scicos_getvalue("Set MATZREIM block parameters",["decomposition type (1=Complex2Real&Imag 2=Real&Imag2Complex)"],list("vec",1),label); + var ok = true; + this.decomptyp = arguments[0]["decomptyp"]; + this.lab = arguments[0]["lab"]; if (!ok) { break; } diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 5633712b..4573a534 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -36,15 +36,15 @@ function RICC() { return options; } RICC.prototype.set = function RICC() { - this.tpe = arguments[0]["tpe"] - this.mod = arguments[0]["mod"] - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.tpe,this.mod,this.exprs] = scicos_getvalue("Set RICC Block",["Type (1=Cont 2=Disc)","Model(1=Schr 2=sign(cont) inv(disc))"],list("vec",1,"vec",1),label); + var ok = true; + this.tpe = arguments[0]["tpe"]; + this.mod = arguments[0]["mod"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 479c317d..e4211b16 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -36,15 +36,15 @@ function ROOTCOEF() { return options; } ROOTCOEF.prototype.set = function ROOTCOEF() { - this.typ = inverse(arguments[0]["typ"]) - this.inp = arguments[0]["inp"] - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } while (true) { - [ok,this.typ,this.inp,this.exprs] = scicos_getvalue("Set ROOTCOEF Block",["Datatype(1=real double 2=Complex)","input row size"],list("vec",1,"vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.inp = arguments[0]["inp"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 517f55dd..c1268dbd 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -25,11 +25,11 @@ function SQRT() { return options; } SQRT.prototype.set = function SQRT() { - this.typ = inverse(arguments[0]["typ"]) - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; while (true) { - [ok,this.typ,this.exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index b02901ec..978c41c0 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -40,19 +40,19 @@ function SUBMAT() { return options; } SUBMAT.prototype.set = function SUBMAT() { - this.typ = inverse(arguments[0]["typ"]) - this.a = arguments[0]["a"] - this.b = arguments[0]["b"] - this.c = arguments[0]["c"] - this.d = arguments[0]["d"] - this.inp = arguments[0]["inp"] - this.exprs = arguments[0]["exprs"] var label = this.graphics.exprs; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); } while (true) { - [ok,this.typ,this.a,this.b,this.c,this.d,this.inp,this.exprs] = scicos_getvalue("Set SUBMAT Block",["Datatype (1=real double 2=Complex)","Starting Row Index","Ending Row Index","Starting Column Index","Ending Column Index","Input Dimensions"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.a = arguments[0]["a"]; + this.b = arguments[0]["b"]; + this.c = arguments[0]["c"]; + this.d = arguments[0]["d"]; + this.inp = arguments[0]["inp"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } |