From 8ce53461fe09f5102deeaedbb87bfc0d4f996ed2 Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Mon, 16 Jul 2018 18:13:55 +0530
Subject: move the options in the loop

---
 js/Hydraulics/Bache.js         | 22 +++++++++++-----------
 js/Hydraulics/Flowmeter.js     |  6 +++---
 js/Hydraulics/PerteDP.js       | 16 ++++++++--------
 js/Hydraulics/PuitsP.js        | 12 ++++++------
 js/Hydraulics/SourceP.js       | 12 ++++++------
 js/Hydraulics/VanneReglante.js |  8 ++++----
 6 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'js/Hydraulics')

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index ffef23e2..e81cb615 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -52,19 +52,19 @@ function Bache() {
         return options;
     }
     Bache.prototype.set = function Bache() {
-        this.Patm = parseFloat(arguments[0]["Patm"])
-        this.A = parseFloat(arguments[0]["A"])
-        this.ze1 = parseFloat(arguments[0]["ze1"])
-        this.ze2 = parseFloat(arguments[0]["ze2"])
-        this.zs1 = parseFloat(arguments[0]["zs1"])
-        this.zs2 = parseFloat(arguments[0]["zs2"])
-        this.z0 = parseFloat(arguments[0]["z0"])
-        this.T0 = parseFloat(arguments[0]["T0"])
-        this.p_rho = parseFloat(arguments[0]["p_rho"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
+            var ok = true;
+            this.Patm = parseFloat(arguments[0]["Patm"]);
+            this.A = parseFloat(arguments[0]["A"]);
+            this.ze1 = parseFloat(arguments[0]["ze1"]);
+            this.ze2 = parseFloat(arguments[0]["ze2"]);
+            this.zs1 = parseFloat(arguments[0]["zs1"]);
+            this.zs2 = parseFloat(arguments[0]["zs2"]);
+            this.z0 = parseFloat(arguments[0]["z0"]);
+            this.T0 = parseFloat(arguments[0]["T0"]);
+            this.p_rho = parseFloat(arguments[0]["p_rho"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index b4af13cd..9120e1af 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -58,12 +58,12 @@ function Flowmeter() {
         return options;
     }
     Flowmeter.prototype.set = function Flowmeter() {
-        this.Qini = arguments[0]["Qini"]
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         this.exprs = this.x.graphics.exprs;
         while (false) {
-            [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs);
+            var ok = true;
+            this.Qini = arguments[0]["Qini"];
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 7bb2c434..0146d1a4 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -44,16 +44,16 @@ function PerteDP() {
         return options;
     }
     PerteDP.prototype.set = function PerteDP() {
-        this.L = parseFloat(arguments[0]["L"])
-        this.D = parseFloat(arguments[0]["D"])
-        this.lambda = parseFloat(arguments[0]["lambda"])
-        this.z1 = parseFloat(arguments[0]["z1"])
-        this.z2 = parseFloat(arguments[0]["z2"])
-        this.p_rho = parseFloat(arguments[0]["p_rho"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
+            var ok = true;
+            this.L = parseFloat(arguments[0]["L"]);
+            this.D = parseFloat(arguments[0]["D"]);
+            this.lambda = parseFloat(arguments[0]["lambda"]);
+            this.z1 = parseFloat(arguments[0]["z1"]);
+            this.z2 = parseFloat(arguments[0]["z2"]);
+            this.p_rho = parseFloat(arguments[0]["p_rho"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index e9043c22..eeb6dd69 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -35,14 +35,14 @@ function PuitsP() {
         return options;
     }
     PuitsP.prototype.set = function PuitsP() {
-        this.P0 = parseFloat(arguments[0]["P0"])
-        this.T0 = parseFloat(arguments[0]["T0"])
-        this.H0 = parseFloat(arguments[0]["H0"])
-        this.option_temperature = parseFloat(arguments[0]["option_temperature"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
+            var ok = true;
+            this.P0 = parseFloat(arguments[0]["P0"]);
+            this.T0 = parseFloat(arguments[0]["T0"]);
+            this.H0 = parseFloat(arguments[0]["H0"]);
+            this.option_temperature = parseFloat(arguments[0]["option_temperature"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index 7d36cfba..570f1cdb 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -37,14 +37,14 @@ function SourceP() {
         return options;
     }
     SourceP.prototype.set = function SourceP() {
-        this.P0 = parseFloat(arguments[0]["P0"])
-        this.T0 = parseFloat(arguments[0]["T0"])
-        this.H0 = parseFloat(arguments[0]["H0"])
-        this.option_temperature = parseFloat(arguments[0]["option_temperature"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs);
+            var ok = true;
+            this.P0 = parseFloat(arguments[0]["P0"]);
+            this.T0 = parseFloat(arguments[0]["T0"]);
+            this.H0 = parseFloat(arguments[0]["H0"]);
+            this.option_temperature = parseFloat(arguments[0]["option_temperature"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 7d5dd695..002be365 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -36,12 +36,12 @@ function VanneReglante() {
         return options;
     }
     VanneReglante.prototype.set = function VanneReglante() {
-        this.Cvmax = parseFloat(arguments[0]["Cvmax"])
-        this.p_rho = parseFloat(arguments[0]["p_rho"])
-        this.exprs = arguments[0]["exprs"]
         this.exprs = this.graphics.exprs;
         while (true) {
-            [ok,this.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs);
+            var ok = true;
+            this.Cvmax = parseFloat(arguments[0]["Cvmax"]);
+            this.p_rho = parseFloat(arguments[0]["p_rho"]);
+            this.exprs = arguments[0]["exprs"];
             if (!ok) {
                 break;
             }
-- 
cgit