add the common code to get method also

type is a function

get the popup title from the value set in the get method

27 files changed, 87 insertions, 54 deletions

diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index ac6c74c6..92a467fe 100644
--- a/js/Branching/CLKFROM.js
+++ b/js/Branching/CLKFROM.js
@@ -17,6 +17,8 @@ function CLKFROM() {
         return this.x;
     }
     CLKFROM.prototype.get = function CLKFROM() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set block parameters";
         var options = {
             tag:["Tag",this.tag],
         }
@@ -47,7 +49,6 @@ function CLKFROM() {
         return new BasicBlock(this.x);
     }
     CLKFROM.prototype.get_popup_title = function CLKFROM() {
-        var set_param_popup_title = "Set block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index 91c29310..ee9672a0 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -18,6 +18,8 @@ function CLKGOTO() {
         return this.x;
     }
     CLKGOTO.prototype.get = function CLKGOTO() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set block parameters";
         var options = {
             tag:["Tag",this.tag],
             tagvis:["Tag Visibility (1=Local 2=Scoped 3=Global)",this.tagvis],
@@ -59,7 +61,6 @@ function CLKGOTO() {
         return new BasicBlock(this.x);
     }
     CLKGOTO.prototype.get_popup_title = function CLKGOTO() {
-        var set_param_popup_title = "Set block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 35da9c0a..0db3370b 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -23,6 +23,8 @@ function CLKGotoTagVisibility() {
         return this.x;
     }
     CLKGotoTagVisibility.prototype.get = function CLKGotoTagVisibility() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["GotoTag",this.tag],
         }
@@ -53,7 +55,6 @@ function CLKGotoTagVisibility() {
         return new BasicBlock(this.x);
     }
     CLKGotoTagVisibility.prototype.get_popup_title = function CLKGotoTagVisibility() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js
index 92175d30..b58dbc36 100644
--- a/js/Branching/DEMUX.js
+++ b/js/Branching/DEMUX.js
@@ -19,6 +19,8 @@ function DEMUX() {
         return this.x;
     }
     DEMUX.prototype.get = function DEMUX() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set DEMUX block parameters";
         var options = {
             out:["number of output ports or vector of sizes",this.out],
         }
@@ -75,7 +77,6 @@ function DEMUX() {
         return new BasicBlock(this.x);
     }
     DEMUX.prototype.get_popup_title = function DEMUX() {
-        var set_param_popup_title = "Set DEMUX block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index 4a1f0ef8..7816a079 100644
--- a/js/Branching/DEMUX_f.js
+++ b/js/Branching/DEMUX_f.js
@@ -19,6 +19,8 @@ function DEMUX_f() {
         return this.x;
     }
     DEMUX_f.prototype.get = function DEMUX_f() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set DEMUX block parameters";
         var options = {
             out:["number of output ports or vector of sizes",this.out],
         }
@@ -75,7 +77,6 @@ function DEMUX_f() {
         return new BasicBlock(this.x);
     }
     DEMUX_f.prototype.get_popup_title = function DEMUX_f() {
-        var set_param_popup_title = "Set DEMUX block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index b8c636b0..47e27c34 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -23,6 +23,14 @@ function ESELECT_f() {
         return this.x;
     }
     ESELECT_f.prototype.get = function ESELECT_f() {
+        var exprs = this.graphics.exprs;
+        if (size(exprs,"*")==1) {
+            exprs[2-1] = string(1);
+        }
+        if (size(exprs,"*")==2) {
+            exprs[3-1] = string(0);
+        }
+        this.set_param_popup_title = "Set ESELECT block parameters";
         var options = {
             out:["number of output event ports",this.out],
             inh:["Inherit (1: no, 0: yes)",this.inh],
@@ -79,7 +87,6 @@ function ESELECT_f() {
         return new BasicBlock(this.x);
     }
     ESELECT_f.prototype.get_popup_title = function ESELECT_f() {
-        var set_param_popup_title = "Set ESELECT block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index 9f195782..b8f3d95d 100644
--- a/js/Branching/EXTRACTOR.js
+++ b/js/Branching/EXTRACTOR.js
@@ -18,6 +18,8 @@ function EXTRACTOR() {
         return this.x;
     }
     EXTRACTOR.prototype.get = function EXTRACTOR() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set block parameters";
         var options = {
             ind:["indices to extract",this.ind],
         }
@@ -49,7 +51,6 @@ function EXTRACTOR() {
         return new BasicBlock(this.x);
     }
     EXTRACTOR.prototype.get_popup_title = function EXTRACTOR() {
-        var set_param_popup_title = "Set block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index 62fef458..bc5fd14b 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -23,6 +23,8 @@ function FROM() {
         return this.x;
     }
     FROM.prototype.get = function FROM() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["Tag",this.tag],
         }
@@ -53,7 +55,6 @@ function FROM() {
         return new BasicBlock(this.x);
     }
     FROM.prototype.get_popup_title = function FROM() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js
index f30648f9..3007c53f 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -26,6 +26,8 @@ function FROMMO() {
         return this.x;
     }
     FROMMO.prototype.get = function FROMMO() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["Tag",this.tag],
         }
@@ -56,7 +58,6 @@ function FROMMO() {
         return new BasicBlock(this.x);
     }
     FROMMO.prototype.get_popup_title = function FROMMO() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index eed862a9..3ffb5a40 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -23,6 +23,8 @@ function GOTO() {
         return this.x;
     }
     GOTO.prototype.get = function GOTO() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["Tag",this.tag],
             tagvis:["Tag Visibility(1=Local 2=scoped 3= global)",this.tagvis],
@@ -62,7 +64,6 @@ function GOTO() {
         return new BasicBlock(this.x);
     }
     GOTO.prototype.get_popup_title = function GOTO() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index 643791d8..24ed6c75 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -26,6 +26,8 @@ function GOTOMO() {
         return this.x;
     }
     GOTOMO.prototype.get = function GOTOMO() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["Tag",this.tag],
             tagvis:["Tag Visibility(1=Local 2=scoped 3= global)",this.tagvis],
@@ -65,7 +67,6 @@ function GOTOMO() {
         return new BasicBlock(this.x);
     }
     GOTOMO.prototype.get_popup_title = function GOTOMO() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index 2549e695..7a792965 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -23,6 +23,8 @@ function GotoTagVisibility() {
         return this.x;
     }
     GotoTagVisibility.prototype.get = function GotoTagVisibility() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["GotoTag",this.tag],
         }
@@ -53,7 +55,6 @@ function GotoTagVisibility() {
         return new BasicBlock(this.x);
     }
     GotoTagVisibility.prototype.get_popup_title = function GotoTagVisibility() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js
index 610bb2cf..bc999818 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -23,6 +23,8 @@ function GotoTagVisibilityMO() {
         return this.x;
     }
     GotoTagVisibilityMO.prototype.get = function GotoTagVisibilityMO() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             tag:["GotoTag",this.tag],
         }
@@ -53,7 +55,6 @@ function GotoTagVisibilityMO() {
         return new BasicBlock(this.x);
     }
     GotoTagVisibilityMO.prototype.get_popup_title = function GotoTagVisibilityMO() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js
index 362776f3..91d0c2d5 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -21,6 +21,8 @@ function ISELECT_f() {
         return this.x;
     }
     ISELECT_f.prototype.get = function ISELECT_f() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             nout:["number of outputs",this.nout],
             z0:["initial connected output",this.z0],
@@ -57,7 +59,6 @@ function ISELECT_f() {
         return new BasicBlock(this.x);
     }
     ISELECT_f.prototype.get_popup_title = function ISELECT_f() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index f1591e76..8fafc3b4 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -29,6 +29,8 @@ function ISELECT_m() {
         return this.x;
     }
     ISELECT_m.prototype.get = function ISELECT_m() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             typ:["Datatype(1= real double  2=Complex 3=int32 ...)",this.typ],
             nout:["number of outputs",this.nout],
@@ -77,7 +79,6 @@ function ISELECT_m() {
         return new BasicBlock(this.x);
     }
     ISELECT_m.prototype.get_popup_title = function ISELECT_m() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 4c69be07..be1ddfe2 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -18,6 +18,8 @@ function MUX() {
         return this.x;
     }
     MUX.prototype.get = function MUX() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set MUX block parameters";
         var options = {
             in1:["number of input ports or vector of sizes",this.in1],
         }
@@ -74,7 +76,6 @@ function MUX() {
         return new BasicBlock(this.x);
     }
     MUX.prototype.get_popup_title = function MUX() {
-        var set_param_popup_title = "Set MUX block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index 5162aa99..d3ca9918 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -18,6 +18,8 @@ function MUX_f() {
         return this.x;
     }
     MUX_f.prototype.get = function MUX_f() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set MUX block parameters";
         var options = {
             in1:["number of input ports or vector of sizes",this.in1],
         }
@@ -74,7 +76,6 @@ function MUX_f() {
         return new BasicBlock(this.x);
     }
     MUX_f.prototype.get_popup_title = function MUX_f() {
-        var set_param_popup_title = "Set MUX block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index b63c6311..a79a22b8 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -20,6 +20,8 @@ function M_SWITCH() {
         return this.x;
     }
     M_SWITCH.prototype.get = function M_SWITCH() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             nin:["number of inputs",this.nin],
             base:["zero base indexing (0), otherwise 1",this.base],
@@ -77,7 +79,6 @@ function M_SWITCH() {
         return new BasicBlock(this.x);
     }
     M_SWITCH.prototype.get_popup_title = function M_SWITCH() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index 58a54b1f..9cd2d219 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -18,6 +18,8 @@ function NRMSOM_f() {
         return this.x;
     }
     NRMSOM_f.prototype.get = function NRMSOM_f() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             nin:["number of inputs",this.nin],
         }
@@ -46,7 +48,6 @@ function NRMSOM_f() {
         return new BasicBlock(this.x);
     }
     NRMSOM_f.prototype.get_popup_title = function NRMSOM_f() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 664e1e4c..2366b6f8 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -22,6 +22,9 @@ function RELAY_f() {
         return this.x;
     }
     RELAY_f.prototype.get = function RELAY_f() {
+        var exprs = this.graphics.exprs;
+        var ipar = this.model.ipar;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             nin:["number of inputs",this.nin],
             z0:["initial connected input",this.z0],
@@ -59,7 +62,6 @@ function RELAY_f() {
         return new BasicBlock(this.x);
     }
     RELAY_f.prototype.get_popup_title = function RELAY_f() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index 8564a431..bfcbe004 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -17,6 +17,8 @@ function SCALAR2VECTOR() {
         return this.x;
     }
     SCALAR2VECTOR.prototype.get = function SCALAR2VECTOR() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set block parameters";
         var options = {
             nout:["size of output (-1: if don\'t know)",this.nout],
         }
@@ -53,7 +55,6 @@ function SCALAR2VECTOR() {
         return new BasicBlock(this.x);
     }
     SCALAR2VECTOR.prototype.get_popup_title = function SCALAR2VECTOR() {
-        var set_param_popup_title = "Set block parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index f10ee297..68242bb4 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -21,6 +21,8 @@ function SELECT_f() {
         return this.x;
     }
     SELECT_f.prototype.get = function SELECT_f() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             nin:["number of inputs",this.nin],
             z0:["initial connected input",this.z0],
@@ -57,7 +59,6 @@ function SELECT_f() {
         return new BasicBlock(this.x);
     }
     SELECT_f.prototype.get_popup_title = function SELECT_f() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index eebc13cc..c565473b 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -29,6 +29,8 @@ function SELECT_m() {
         return this.x;
     }
     SELECT_m.prototype.get = function SELECT_m() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             typ:["Datatype(1= real double  2=Complex 3=int32 ..)",this.typ],
             nin:["number of inputs",this.nin],
@@ -77,7 +79,6 @@ function SELECT_m() {
         return new BasicBlock(this.x);
     }
     SELECT_m.prototype.get_popup_title = function SELECT_m() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js
index dd3697a0..1b56a13d 100644
--- a/js/Branching/SELF_SWITCH.js
+++ b/js/Branching/SELF_SWITCH.js
@@ -42,7 +42,6 @@ function SELF_SWITCH() {
         return new BasicBlock(this.x);
     }
     SELF_SWITCH.prototype.get_popup_title = function SELF_SWITCH() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return;
     }
 }
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index cf8ec443..a816db73 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -24,6 +24,8 @@ function SWITCH2() {
         return this.x;
     }
     SWITCH2.prototype.get = function SWITCH2() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             rule:["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)",this.rule],
             thra:["threshold a",this.thra],
@@ -66,7 +68,6 @@ function SWITCH2() {
         return new BasicBlock(this.x);
     }
     SWITCH2.prototype.get_popup_title = function SWITCH2() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index e6027997..efdaac6e 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -27,6 +27,8 @@ function SWITCH2_m() {
         return this.x;
     }
     SWITCH2_m.prototype.get = function SWITCH2_m() {
+        var exprs = this.graphics.exprs;
+        this.set_param_popup_title = "Set parameters";
         var options = {
             ot:["Datatype (1=real double  2=complex 3=int32 ...)",this.ot],
             rule:["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)",this.rule],
@@ -89,7 +91,6 @@ function SWITCH2_m() {
         return new BasicBlock(this.x);
     }
     SWITCH2_m.prototype.get_popup_title = function SWITCH2_m() {
-        var set_param_popup_title = "Set parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index 85d5a05f..32240dfd 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -21,6 +21,9 @@ function SWITCH_f() {
         return this.x;
     }
     SWITCH_f.prototype.get = function SWITCH_f() {
+        var exprs = this.graphics.exprs;
+        var ipar = this.model.ipar;
+        this.set_param_popup_title = "Set switch parameters";
         var options = {
             nin:["number of inputs",this.nin],
             z0:["connected input",this.z0],
@@ -58,7 +61,6 @@ function SWITCH_f() {
         return new BasicBlock(this.x);
     }
     SWITCH_f.prototype.get_popup_title = function SWITCH_f() {
-        var set_param_popup_title = "Set switch parameters";
-        return set_param_popup_title;
+        return this.set_param_popup_title;
     }
 }