6 files changed, 28 insertions, 22 deletions
diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js
index e9f7f34c..1c4906ed 100644
--- a/js/NonLinear/TrigFun.js
+++ b/js/NonLinear/TrigFun.js
@@ -24,7 +24,7 @@ function TrigFun() {
     TrigFun.prototype.set = function TrigFun() {
         var exprs = this.graphics.exprs;
         var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]];
-        var PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]];
+        this.PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]];
         while (true) {
             var ok = true;
             this.fun = arguments[0]["fun"];
@@ -45,7 +45,7 @@ function TrigFun() {
         return new BasicBlock(this.x);
     }
     TrigFun.prototype.get_popup_title = function TrigFun() {
-        var set_param_popup_title = PREVAR_GG;
+        var set_param_popup_title = "Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ");
         return set_param_popup_title;
     }
 }
diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle
index 9170d382..c01059dc 100644
--- a/js/NonLinear/TrigFun.pickle
+++ b/js/NonLinear/TrigFun.pickle
@@ -8,10 +8,12 @@ aS'x'
 p3
 aS'model'
 p4
-aS'graphics'
+aS'PREVAR_GG'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.sim'
 p1
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index 975a9aab..6f06ae0f 100644
--- a/js/Sources/GEN_SQR.js
+++ b/js/Sources/GEN_SQR.js
@@ -66,7 +66,7 @@ function GEN_SQR() {
         var y = this.needcompile;
         var typ = list();
         var exprs = this.graphics.exprs;
-        var Btitre = "Set GEN_SQR parameters";
+        this.Btitre = "Set GEN_SQR parameters";
         var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]];
         this.Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]];
         var Ss = list("mat",[-1,-1],"mat",[-1,-1],"pol",-1,"pol",-1);
@@ -107,7 +107,7 @@ function GEN_SQR() {
         return new BasicBlock(this.x);
     }
     GEN_SQR.prototype.get_popup_title = function GEN_SQR() {
-        var set_param_popup_title = Btitre;
+        var set_param_popup_title = "Set GEN_SQR parameters";
         return set_param_popup_title;
     }
 }
diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle
index 63e01ea8..33ff1d06 100644
--- a/js/Sources/GEN_SQR.pickle
+++ b/js/Sources/GEN_SQR.pickle
@@ -12,16 +12,18 @@ aS'scicos_context.rule'
 p5
 aS'graphics'
 p6
-aS'x'
+aS'Btitre'
 p7
-aS'model'
+aS'x'
 p8
-aS'scicos_context.F'
+aS'model'
 p9
-aS'scicos_context.Amin'
+aS'scicos_context.F'
 p10
-atp11
-Rp12
+aS'scicos_context.Amin'
+p11
+atp12
+Rp13
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index 829a03c4..18cf7949 100644
--- a/js/Sources/PULSE_SC.js
+++ b/js/Sources/PULSE_SC.js
@@ -61,7 +61,7 @@ function PULSE_SC() {
         var y = this.needcompile;
         var typ = list();
         var exprs = this.graphics.exprs;
-        var Btitre = "Set Pulse Generator parameters";
+        this.Btitre = "Set Pulse Generator parameters";
         var Exprs0 = [["E"],["W"],["F"],["A"]];
         this.Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]];
         var Ss = list("pol",-1,"pol",-1,"pol",-1,"mat",[-1,-1]);
@@ -103,7 +103,7 @@ function PULSE_SC() {
         return new BasicBlock(this.x);
     }
     PULSE_SC.prototype.get_popup_title = function PULSE_SC() {
-        var set_param_popup_title = Btitre;
+        var set_param_popup_title = "Set Pulse Generator parameters";
         return set_param_popup_title;
     }
 }
diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle
index bb16e667..4071d08e 100644
--- a/js/Sources/PULSE_SC.pickle
+++ b/js/Sources/PULSE_SC.pickle
@@ -10,18 +10,20 @@ aS'scicos_context.W'
 p4
 aS'graphics'
 p5
-aS'x'
+aS'Btitre'
 p6
-aS'model'
+aS'x'
 p7
-aS'scicos_context.A'
+aS'model'
 p8
-aS'scicos_context.F'
+aS'scicos_context.A'
 p9
-aS'scicos_context.E'
+aS'scicos_context.F'
 p10
-atp11
-Rp12
+aS'scicos_context.E'
+p11
+atp12
+Rp13
 .(dp0
 S'model.odstate'
 p1