summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/ABSBLK_f.js3
-rw-r--r--js/NonLinear/ABS_VALUE.js5
-rw-r--r--js/NonLinear/COSBLK_f.js3
-rw-r--r--js/NonLinear/DLRADAPT_f.js5
-rw-r--r--js/NonLinear/EXPBLK_f.js8
-rw-r--r--js/NonLinear/EXPBLK_m.js8
-rw-r--r--js/NonLinear/FSV_f.js3
-rw-r--r--js/NonLinear/INTRP2BLK_f.js5
-rw-r--r--js/NonLinear/INTRPLBLK_f.js5
-rw-r--r--js/NonLinear/INVBLK.js3
-rw-r--r--js/NonLinear/INVBLK_f.js3
-rw-r--r--js/NonLinear/LOGBLK_f.js8
-rw-r--r--js/NonLinear/LOOKUP2D.js7
-rw-r--r--js/NonLinear/LOOKUP_c.js7
-rw-r--r--js/NonLinear/LOOKUP_f.js3
-rw-r--r--js/NonLinear/MAXMIN.js5
-rw-r--r--js/NonLinear/MAX_f.js3
-rw-r--r--js/NonLinear/MIN_f.js3
-rw-r--r--js/NonLinear/POWBLK_f.js8
-rw-r--r--js/NonLinear/PRODUCT.js5
-rw-r--r--js/NonLinear/PROD_f.js3
-rw-r--r--js/NonLinear/QUANT_f.js5
-rw-r--r--js/NonLinear/SATURATION.js5
-rw-r--r--js/NonLinear/SAT_f.js5
-rw-r--r--js/NonLinear/SIGNUM.js5
-rw-r--r--js/NonLinear/SINBLK_f.js3
-rw-r--r--js/NonLinear/TANBLK_f.js3
-rw-r--r--js/NonLinear/TrigFun.js7
28 files changed, 80 insertions, 56 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index 81b273ab..d4826a04 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -21,7 +21,6 @@ function ABSBLK_f() {
return new BasicBlock(this.x);
}
ABSBLK_f.prototype.get_popup_title = function ABSBLK_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 3100113e..239b2bb7 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -19,6 +19,8 @@ function ABS_VALUE() {
return this.x;
}
ABS_VALUE.prototype.get = function ABS_VALUE() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set block parameters";
var options = {
zcr:["use zero_crossing (1: yes) (0:no)",this.zcr],
}
@@ -50,7 +52,6 @@ function ABS_VALUE() {
return new BasicBlock(this.x);
}
ABS_VALUE.prototype.get_popup_title = function ABS_VALUE() {
- var set_param_popup_title = "Set block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index 4b0fecf4..eb561be7 100644
--- a/js/NonLinear/COSBLK_f.js
+++ b/js/NonLinear/COSBLK_f.js
@@ -22,7 +22,6 @@ function COSBLK_f() {
return new BasicBlock(this.x);
}
COSBLK_f.prototype.get_popup_title = function COSBLK_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 832961c6..86ae1ef9 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -27,6 +27,8 @@ function DLRADAPT_f() {
return this.x;
}
DLRADAPT_f.prototype.get = function DLRADAPT_f() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set block parameters";
var options = {
p:["Vector of p mesh points",this.p.toString().replace(/,/g," ")],
rn:["Numerator roots (one line for each mesh)",this.rn],
@@ -76,7 +78,6 @@ function DLRADAPT_f() {
return new BasicBlock(this.x);
}
DLRADAPT_f.prototype.get_popup_title = function DLRADAPT_f() {
- var set_param_popup_title = "Set block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index 6634b9ad..cd43305a 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -19,6 +19,11 @@ function EXPBLK_f() {
return this.x;
}
EXPBLK_f.prototype.get = function EXPBLK_f() {
+ var exprs = this.graphics.exprs;
+ if (size(exprs,"*")==2) {
+ var exprs = exprs[2-1];
+ }
+ this.set_param_popup_title = "Set a^u block parameters";
var options = {
a:["a (>0)",this.a],
}
@@ -50,7 +55,6 @@ function EXPBLK_f() {
return new BasicBlock(this.x);
}
EXPBLK_f.prototype.get_popup_title = function EXPBLK_f() {
- var set_param_popup_title = "Set a^u block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index 782af381..94eda0e2 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -23,6 +23,11 @@ function EXPBLK_m() {
return this.x;
}
EXPBLK_m.prototype.get = function EXPBLK_m() {
+ var exprs = this.graphics.exprs;
+ if (size(exprs,"*")==2) {
+ var exprs = exprs[2-1];
+ }
+ this.set_param_popup_title = "Set a^u block parameters";
var options = {
a:["a (>0)",this.a],
}
@@ -54,7 +59,6 @@ function EXPBLK_m() {
return new BasicBlock(this.x);
}
EXPBLK_m.prototype.get_popup_title = function EXPBLK_m() {
- var set_param_popup_title = "Set a^u block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index 0dd11c6b..9bdec4f5 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -23,7 +23,6 @@ function FSV_f() {
return new BasicBlock(this.x);
}
FSV_f.prototype.get_popup_title = function FSV_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index c80a161d..d461f63f 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -21,6 +21,8 @@ function INTRP2BLK_f() {
return this.x;
}
INTRP2BLK_f.prototype.get = function INTRP2BLK_f() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set Interpolation block parameters";
var options = {
a:["X coord.",this.a.toString().replace(/,/g," ")],
b:["Y coord.",this.b.toString().replace(/,/g," ")],
@@ -59,7 +61,6 @@ function INTRP2BLK_f() {
return new BasicBlock(this.x);
}
INTRP2BLK_f.prototype.get_popup_title = function INTRP2BLK_f() {
- var set_param_popup_title = "Set Interpolation block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 84a48380..77157855 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -19,6 +19,8 @@ function INTRPLBLK_f() {
return this.x;
}
INTRPLBLK_f.prototype.get = function INTRPLBLK_f() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set Interpolation block parameters";
var options = {
a:["X coord.",this.a.toString().replace(/,/g," ")],
b:["Y coord.",this.b.toString().replace(/,/g," ")],
@@ -54,7 +56,6 @@ function INTRPLBLK_f() {
return new BasicBlock(this.x);
}
INTRPLBLK_f.prototype.get_popup_title = function INTRPLBLK_f() {
- var set_param_popup_title = "Set Interpolation block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index 36da040f..109812cf 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -23,7 +23,6 @@ function INVBLK() {
return new BasicBlock(this.x);
}
INVBLK.prototype.get_popup_title = function INVBLK() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index 35831b78..fbf512df 100644
--- a/js/NonLinear/INVBLK_f.js
+++ b/js/NonLinear/INVBLK_f.js
@@ -23,7 +23,6 @@ function INVBLK_f() {
return new BasicBlock(this.x);
}
INVBLK_f.prototype.get_popup_title = function INVBLK_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index 0e4e26c1..7b608c1f 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -19,6 +19,11 @@ function LOGBLK_f() {
return this.x;
}
LOGBLK_f.prototype.get = function LOGBLK_f() {
+ var exprs = this.graphics.exprs;
+ if (size(exprs,"*")==2) {
+ var exprs = exprs[2-1];
+ }
+ this.set_param_popup_title = "Set log block parameters";
var options = {
a:["Basis (>1)",this.a],
}
@@ -52,7 +57,6 @@ function LOGBLK_f() {
return new BasicBlock(this.x);
}
LOGBLK_f.prototype.get_popup_title = function LOGBLK_f() {
- var set_param_popup_title = "Set log block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index 0eaed864..6202c0f7 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -25,6 +25,10 @@ function LOOKUP2D() {
return this.x;
}
LOOKUP2D.prototype.get = function LOOKUP2D() {
+ var exprs = this.graphics.exprs;
+ var ok = false;
+ var SaveExit = false;
+ this.set_param_popup_title = "2D Lookup table parameters";
var options = {
xx:["Row index input values",this.xx],
yy:["Column index input values",this.yy],
@@ -118,7 +122,6 @@ function LOOKUP2D() {
return new BasicBlock(this.x);
}
LOOKUP2D.prototype.get_popup_title = function LOOKUP2D() {
- var set_param_popup_title = "2D Lookup table parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js
index d0160008..180c8d1d 100644
--- a/js/NonLinear/LOOKUP_c.js
+++ b/js/NonLinear/LOOKUP_c.js
@@ -30,6 +30,10 @@ function LOOKUP_c() {
return this.x;
}
LOOKUP_c.prototype.get = function LOOKUP_c() {
+ var exprs = this.graphics.exprs;
+ var ok = false;
+ var SaveExit = false;
+ this.set_param_popup_title = "Lookup table parameters";
var options = {
Method:["Spline Interpolation method (0..9)",this.Method],
xx:["x",this.xx.toString().replace(/,/g," ")],
@@ -177,7 +181,6 @@ function LOOKUP_c() {
return new BasicBlock(this.x);
}
LOOKUP_c.prototype.get_popup_title = function LOOKUP_c() {
- var set_param_popup_title = "Lookup table parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 68b67302..25b5a44a 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -54,7 +54,6 @@ function LOOKUP_f() {
return new BasicBlock(this.x);
}
LOOKUP_f.prototype.get_popup_title = function LOOKUP_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index 02288102..357236d7 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -18,6 +18,8 @@ function MAXMIN() {
return this.x;
}
MAXMIN.prototype.get = function MAXMIN() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set Max/Min block parameters";
var options = {
mm:["Min (1) or Max (2) ",this.mm],
nin:["Number of input vectors (1 or 2)",this.nin],
@@ -83,7 +85,6 @@ function MAXMIN() {
return new BasicBlock(this.x);
}
MAXMIN.prototype.get_popup_title = function MAXMIN() {
- var set_param_popup_title = "Set Max/Min block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index e6a91569..df7b6eaf 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -24,7 +24,6 @@ function MAX_f() {
return new BasicBlock(this.x);
}
MAX_f.prototype.get_popup_title = function MAX_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index 38a61db7..67662233 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -24,7 +24,6 @@ function MIN_f() {
return new BasicBlock(this.x);
}
MIN_f.prototype.get_popup_title = function MIN_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index 54898c15..ce80dac3 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -19,6 +19,11 @@ function POWBLK_f() {
return this.x;
}
POWBLK_f.prototype.get = function POWBLK_f() {
+ var exprs = this.graphics.exprs;
+ if (size(exprs,"*")==2) {
+ var exprs = exprs[2-1];
+ }
+ this.set_param_popup_title = "Set u^a block parameters";
var options = {
a:["to the power of",this.a],
}
@@ -52,7 +57,6 @@ function POWBLK_f() {
return new BasicBlock(this.x);
}
POWBLK_f.prototype.get_popup_title = function POWBLK_f() {
- var set_param_popup_title = "Set u^a block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 420491b0..98260819 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -18,6 +18,8 @@ function PRODUCT() {
return this.x;
}
PRODUCT.prototype.get = function PRODUCT() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = " Set multiplication block parameters";
var options = {
sgn:["Number of inputs or sign vector",this.sgn.toString().replace(/,/g," ")],
}
@@ -74,7 +76,6 @@ function PRODUCT() {
return new Product(this.x);
}
PRODUCT.prototype.get_popup_title = function PRODUCT() {
- var set_param_popup_title = " Set multiplication block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index 3f92ab62..a5f007d0 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -20,7 +20,6 @@ function PROD_f() {
return new RoundBlock(this.x);
}
PROD_f.prototype.get_popup_title = function PROD_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index 7a452913..91536ad0 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -20,6 +20,8 @@ function QUANT_f() {
return this.x;
}
QUANT_f.prototype.get = function QUANT_f() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set parameters";
var options = {
pas:["Step",this.pas],
meth:["Quantization Type (1-4)",this.meth],
@@ -62,7 +64,6 @@ function QUANT_f() {
return new BasicBlock(this.x);
}
QUANT_f.prototype.get_popup_title = function QUANT_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index 8c9745f5..ae0bd428 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -22,6 +22,8 @@ function SATURATION() {
return this.x;
}
SATURATION.prototype.get = function SATURATION() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set Saturation parameters";
var options = {
maxp:["Upper limit",this.maxp],
minp:["Lower limit",this.minp],
@@ -62,7 +64,6 @@ function SATURATION() {
return new BasicBlock(this.x);
}
SATURATION.prototype.get_popup_title = function SATURATION() {
- var set_param_popup_title = "Set Saturation parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index 8644917c..7fb2fc57 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -22,6 +22,8 @@ function SAT_f() {
return this.x;
}
SAT_f.prototype.get = function SAT_f() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set Saturation parameters";
var options = {
minp:["Min",this.minp],
maxp:["Max",this.maxp],
@@ -59,7 +61,6 @@ function SAT_f() {
return new BasicBlock(this.x);
}
SAT_f.prototype.get_popup_title = function SAT_f() {
- var set_param_popup_title = "Set Saturation parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index c882e024..d76a318f 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -19,6 +19,8 @@ function SIGNUM() {
return this.x;
}
SIGNUM.prototype.get = function SIGNUM() {
+ var exprs = this.graphics.exprs;
+ this.set_param_popup_title = "Set block parameters";
var options = {
zcr:["use zero_crossing (1: yes) (0:no)",this.zcr],
}
@@ -50,7 +52,6 @@ function SIGNUM() {
return new BasicBlock(this.x);
}
SIGNUM.prototype.get_popup_title = function SIGNUM() {
- var set_param_popup_title = "Set block parameters";
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index da966e22..554e4938 100644
--- a/js/NonLinear/SINBLK_f.js
+++ b/js/NonLinear/SINBLK_f.js
@@ -22,7 +22,6 @@ function SINBLK_f() {
return new BasicBlock(this.x);
}
SINBLK_f.prototype.get_popup_title = function SINBLK_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index 94214b30..6a997f03 100644
--- a/js/NonLinear/TANBLK_f.js
+++ b/js/NonLinear/TANBLK_f.js
@@ -24,7 +24,6 @@ function TANBLK_f() {
return new BasicBlock(this.x);
}
TANBLK_f.prototype.get_popup_title = function TANBLK_f() {
- var set_param_popup_title = "Set parameters";
- return set_param_popup_title;
+ return;
}
}
diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js
index c85ddf34..57ef3821 100644
--- a/js/NonLinear/TrigFun.js
+++ b/js/NonLinear/TrigFun.js
@@ -16,6 +16,10 @@ function TrigFun() {
return this.x;
}
TrigFun.prototype.get = function TrigFun() {
+ var exprs = this.graphics.exprs;
+ var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]];
+ this.PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]];
+ this.set_param_popup_title = this.PREVAR_GG;
var options = {
fun:["Function",this.fun],
}
@@ -46,7 +50,6 @@ function TrigFun() {
return new BasicBlock(this.x);
}
TrigFun.prototype.get_popup_title = function TrigFun() {
- var set_param_popup_title = "Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ");
- return set_param_popup_title;
+ return this.set_param_popup_title;
}
}
generated by cgit (git 2.34.1) at 2025-03-12 19:21:43 +0000