move the options in the loop

10 files changed, 36 insertions, 36 deletions

diff --git a/js/Events/END_c.js b/js/Events/END_c.js
index d1c5817a..f3817eb5 100644
--- a/js/Events/END_c.js
+++ b/js/Events/END_c.js
@@ -24,11 +24,11 @@ function END_c() {
         return options;
     }
     END_c.prototype.set = function END_c() {
-        this.tf = parseFloat(arguments[0]["tf"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.tf,this.exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),this.exprs);
+            var ok = true;
+            this.tf = parseFloat(arguments[0]["tf"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js
index 0abb9bca..4b223c5f 100644
--- a/js/Events/EVTDLY_c.js
+++ b/js/Events/EVTDLY_c.js
@@ -27,12 +27,12 @@ function EVTDLY_c() {
         return options;
     }
     EVTDLY_c.prototype.set = function EVTDLY_c() {
-        this.dt = parseFloat(arguments[0]["dt"])
-        this.ff = parseFloat(arguments[0]["ff"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay  is the delay between an input event "],["       and the generated output event"],["Block may initially generate an output event before "],["       any input event. \"Date of initial output event\""],["       gives the date of this event. Set a negative value"],["       to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs);
+            var ok = true;
+            this.dt = parseFloat(arguments[0]["dt"]);
+            this.ff = parseFloat(arguments[0]["ff"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js
index cd9c607b..66c3ab5d 100644
--- a/js/Events/EVTDLY_f.js
+++ b/js/Events/EVTDLY_f.js
@@ -27,12 +27,12 @@ function EVTDLY_f() {
         return options;
     }
     EVTDLY_f.prototype.set = function EVTDLY_f() {
-        this.dt = parseFloat(arguments[0]["dt"])
-        this.ff = parseFloat(arguments[0]["ff"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay  block parameters"],["Delay  is the delay between an input event "],["       and the generated output event"],["Block may initially generate an output event before "],["       any input event. \"Date of initial output event\""],["       gives the date of this event. Set a negative value"],["       if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs);
+            var ok = true;
+            this.dt = parseFloat(arguments[0]["dt"]);
+            this.ff = parseFloat(arguments[0]["ff"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js
index 5c835346..3d99d71c 100644
--- a/js/Events/EVTGEN_f.js
+++ b/js/Events/EVTGEN_f.js
@@ -23,11 +23,11 @@ function EVTGEN_f() {
         return options;
     }
     EVTGEN_f.prototype.set = function EVTGEN_f() {
-        this.tt = parseFloat(arguments[0]["tt"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.tt,this.exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),this.exprs);
+            var ok = true;
+            this.tt = parseFloat(arguments[0]["tt"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js
index 4732544f..61fbac44 100644
--- a/js/Events/EVTVARDLY.js
+++ b/js/Events/EVTVARDLY.js
@@ -24,11 +24,11 @@ function EVTVARDLY() {
         return options;
     }
     EVTVARDLY.prototype.set = function EVTVARDLY() {
-        this.fir = arguments[0]["fir"]
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.fir,this.exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),this.exprs);
+            var ok = true;
+            this.fir = arguments[0]["fir"];
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js
index e0ab69c9..a93fb2c0 100644
--- a/js/Events/HALT_f.js
+++ b/js/Events/HALT_f.js
@@ -24,11 +24,11 @@ function HALT_f() {
         return options;
     }
     HALT_f.prototype.set = function HALT_f() {
-        this.n = parseFloat(arguments[0]["n"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.n,this.exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),this.exprs);
+            var ok = true;
+            this.n = parseFloat(arguments[0]["n"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index 9a805282..ddfb8237 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -29,9 +29,6 @@ function IFTHEL_f() {
         return options;
     }
     IFTHEL_f.prototype.set = function IFTHEL_f() {
-        this.inh = inverse(arguments[0]["inh"])
-        this.nmod = parseFloat(arguments[0]["nmod"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         if (this.exprs==[]) {
             this.exprs = string(1);
@@ -40,7 +37,10 @@ function IFTHEL_f() {
             this.exprs[2-1] = string(1);
         }
         while (true) {
-            [ok,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set parameters",["Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1),this.exprs);
+            var ok = true;
+            this.inh = inverse(arguments[0]["inh"]);
+            this.nmod = parseFloat(arguments[0]["nmod"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js
index 72992ea3..1edf1edd 100644
--- a/js/Events/MFCLCK_f.js
+++ b/js/Events/MFCLCK_f.js
@@ -29,11 +29,11 @@ function MFCLCK_f() {
         return options;
     }
     MFCLCK_f.prototype.set = function MFCLCK_f() {
-        this.dt = parseFloat(arguments[0]["dt"])
-        this.nn = parseFloat(arguments[0]["nn"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
-        [ok,this.dt,this.nn,this.exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),this.exprs);
+        var ok = true;
+        this.dt = parseFloat(arguments[0]["dt"]);
+        this.nn = parseFloat(arguments[0]["nn"]);
+        this.exprs = arguments[0]["exprs"];
         if (ok) {
             this.model.ipar = new ScilabDouble([this.nn]);
             this.model.rpar = new ScilabDouble([this.dt]);
diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js
index 1b3ee90b..78e07f61 100644
--- a/js/Events/M_freq.js
+++ b/js/Events/M_freq.js
@@ -26,12 +26,12 @@ function M_freq() {
         return options;
     }
     M_freq.prototype.set = function M_freq() {
-        this.frequ = inverse(arguments[0]["frequ"])
-        this.offset = inverse(arguments[0]["offset"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),this.exprs);
+            var ok = true;
+            this.frequ = inverse(arguments[0]["frequ"]);
+            this.offset = inverse(arguments[0]["offset"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js
index faa29011..565a8e6b 100644
--- a/js/Events/freq_div.js
+++ b/js/Events/freq_div.js
@@ -118,9 +118,6 @@ function freq_div() {
         return options;
     }
     freq_div.prototype.set = function freq_div() {
-        %ph = parseFloat(arguments[0]["%ph"])
-        %df = parseFloat(arguments[0]["%df"])
-        this.exprs = inverse(arguments[0]["exprs"])
             if (typeof(o)=="Block"&&o.gui=="Modulo_Count") {
                 var path = i;
                 break;
@@ -138,7 +135,10 @@ function freq_div() {
         this.exprs = this.graphics.exprs;
         this.model = xx.model;
         while (true) {
-            [ok,%ph,%df,this.exprs] = scicos_getvalue("Set frequency division block parameters",["Phase (0 to division factor -1)","Division factor"],list("vec",1,"vec",1),this.exprs);
+            var ok = true;
+            %ph = parseFloat(arguments[0]["%ph"]);
+            %df = parseFloat(arguments[0]["%df"]);
+            this.exprs = inverse(arguments[0]["exprs"]);
             if (!ok) {
                 break;
             }