change graphics to object

12 files changed, 133 insertions, 121 deletions

diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js
index 68683e2e..b961911e 100644
--- a/js/Hydraulics/Bache.js
+++ b/js/Hydraulics/Bache.js
@@ -62,8 +62,8 @@ function Bache() {
         this.T0 = parseFloat(arguments[0]["T0"])
         this.p_rho = parseFloat(arguments[0]["p_rho"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var exprs = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,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),exprs);
@@ -71,9 +71,9 @@ function Bache() {
                 break;
             }
             this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]);
-            this.model.equations.parameters[2] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho]));
-            graphics.exprs = exprs;
-            this.x.graphics = graphics;
+            this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho]));
+            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.x.graphics = this.graphics;
             this.x.model = this.model;
             break;
         }
diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle
index e0877648..f8030454 100644
--- a/js/Hydraulics/Bache.pickle
+++ b/js/Hydraulics/Bache.pickle
@@ -18,14 +18,16 @@ aS'ze1'
 p8
 aS'p_rho'
 p9
-aS'x'
+aS'graphics'
 p10
-aS'model'
+aS'x'
 p11
-aS'Patm'
+aS'model'
 p12
-atp13
-Rp14
+aS'Patm'
+p13
+atp14
+Rp15
 .(dp0
 S'arg1'
 p1
@@ -86,44 +88,44 @@ g5
 sS'model.equations'
 p24
 g8
-sS'model.equations.parameters[2]'
-p25
-g20
 sS'mo.outputs'
-p26
+p25
 g16
 sS'x.graphics.out_implicit'
-p27
+p26
 g18
 sS'in1'
-p28
+p27
 g8
 sS'model.rpar'
-p29
+p28
 g18
 sS'ze2'
-p30
+p29
 g8
 sS'ze1'
-p31
+p30
 g8
 sS'T0'
-p32
+p31
 g8
 sS'graphics.exprs'
-p33
+p32
 NsS'typ'
-p34
+p33
 g16
 sS'model.blocktype'
-p35
+p34
 g5
 sS'mo'
-p36
+p35
 g2
 sS'model.dep_ut'
-p37
+p36
 g16
+sS'model.equations.parameters[2-1]'
+p37
+g20
 sS'exprs'
 p38
 g18
diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js
index e5efb188..170c1783 100644
--- a/js/Hydraulics/Flowmeter.js
+++ b/js/Hydraulics/Flowmeter.js
@@ -60,8 +60,8 @@ function Flowmeter() {
     Flowmeter.prototype.set = function Flowmeter() {
         this.Qini = arguments[0]["Qini"]
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var exprs = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var exprs = this.graphics.exprs;
         this.model = arg1.model;
         this.x = arg1;
         var exprs = this.x.graphics.exprs;
diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle
index 10b11b97..7abe7995 100644
--- a/js/Hydraulics/Flowmeter.pickle
+++ b/js/Hydraulics/Flowmeter.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'Qini'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'x.model.equations.parameters[2-1]'
 p1
diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js
index 4a57604e..06572f67 100644
--- a/js/Hydraulics/PerteDP.js
+++ b/js/Hydraulics/PerteDP.js
@@ -51,8 +51,8 @@ function PerteDP() {
         this.z2 = parseFloat(arguments[0]["z2"])
         this.p_rho = parseFloat(arguments[0]["p_rho"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var exprs = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,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),exprs);
@@ -60,9 +60,9 @@ function PerteDP() {
                 break;
             }
             this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]);
-            this.model.equations.parameters[2] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho]));
-            graphics.exprs = exprs;
-            this.x.graphics = graphics;
+            this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho]));
+            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.x.graphics = this.graphics;
             this.x.model = this.model;
             break;
         }
diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle
index 000a85a3..01934a26 100644
--- a/js/Hydraulics/PerteDP.pickle
+++ b/js/Hydraulics/PerteDP.pickle
@@ -8,18 +8,20 @@ aS'L'
 p3
 aS'p_rho'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
+aS'x'
 p6
-aS'z1'
+aS'model'
 p7
-aS'z2'
+aS'z1'
 p8
-aS'lambda'
+aS'z2'
 p9
-atp10
-Rp11
+aS'lambda'
+p10
+atp11
+Rp12
 .(dp0
 S'arg1'
 p1
@@ -64,45 +66,45 @@ g8
 sS'D'
 p18
 g8
-sS'model.equations.parameters[2]'
-p19
-g15
 sS'mo.outputs'
-p20
+p19
 g5
 sS'x.graphics.out_implicit'
-p21
+p20
 g13
 sS'L'
-p22
+p21
 g8
 sS'model.rpar'
-p23
+p22
 S'matrix'
-p24
+p23
 sS'graphics.exprs'
-p25
+p24
 NsS'typ'
-p26
+p25
 g13
 sS'z1'
-p27
+p26
 g8
 sS'z2'
-p28
+p27
 g8
 sS'model.blocktype'
-p29
+p28
 g5
 sS'mo'
-p30
+p29
 g2
 sS'model.dep_ut'
-p31
+p30
 g13
+sS'model.equations.parameters[2-1]'
+p31
+g15
 sS'exprs'
 p32
-g24
+g23
 sS'gr_i'
 p33
 g13
diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js
index ab5be777..6d995c71 100644
--- a/js/Hydraulics/PuitsP.js
+++ b/js/Hydraulics/PuitsP.js
@@ -40,8 +40,8 @@ function PuitsP() {
         this.H0 = parseFloat(arguments[0]["H0"])
         this.option_temperature = parseFloat(arguments[0]["option_temperature"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var exprs = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.P0,this.T0,this.H0,this.option_temperature,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),exprs);
@@ -49,9 +49,9 @@ function PuitsP() {
                 break;
             }
             this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]);
-            this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
-            graphics.exprs = exprs;
-            this.x.graphics = graphics;
+            this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
+            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.x.graphics = this.graphics;
             this.x.model = this.model;
             break;
         }
diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle
index 6a1af8f4..11b085ba 100644
--- a/js/Hydraulics/PuitsP.pickle
+++ b/js/Hydraulics/PuitsP.pickle
@@ -8,14 +8,16 @@ aS'H0'
 p3
 aS'T0'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
+aS'x'
 p6
-aS'option_temperature'
+aS'model'
 p7
-atp8
-Rp9
+aS'option_temperature'
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
@@ -60,33 +62,33 @@ g8
 sS'model.equations'
 p18
 g8
-sS'model.equations.parameters[2]'
-p19
-g15
 sS'model.rpar'
-p20
+p19
 S'matrix'
-p21
+p20
 sS'T0'
-p22
+p21
 g8
 sS'graphics.exprs'
-p23
+p22
 NsS'typ'
-p24
+p23
 g11
 sS'model.blocktype'
-p25
+p24
 g5
 sS'mo'
-p26
+p25
 g2
 sS'model.dep_ut'
-p27
+p26
 g11
+sS'model.equations.parameters[2-1]'
+p27
+g15
 sS'exprs'
 p28
-g21
+g20
 sS'gr_i'
 p29
 g11
diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js
index b622899e..66944673 100644
--- a/js/Hydraulics/SourceP.js
+++ b/js/Hydraulics/SourceP.js
@@ -42,8 +42,8 @@ function SourceP() {
         this.H0 = parseFloat(arguments[0]["H0"])
         this.option_temperature = parseFloat(arguments[0]["option_temperature"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var exprs = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.P0,this.T0,this.H0,this.option_temperature,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),exprs);
@@ -51,9 +51,9 @@ function SourceP() {
                 break;
             }
             this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]);
-            this.model.equations.parameters[2] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
-            graphics.exprs = exprs;
-            this.x.graphics = graphics;
+            this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature]));
+            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.x.graphics = this.graphics;
             this.x.model = this.model;
             break;
         }
diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle
index b4fa048c..083335be 100644
--- a/js/Hydraulics/SourceP.pickle
+++ b/js/Hydraulics/SourceP.pickle
@@ -8,14 +8,16 @@ aS'H0'
 p3
 aS'T0'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
+aS'x'
 p6
-aS'option_temperature'
+aS'model'
 p7
-atp8
-Rp9
+aS'option_temperature'
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
@@ -60,39 +62,39 @@ g8
 sS'model.equations'
 p18
 g8
-sS'model.equations.parameters[2]'
-p19
-g15
 sS'mo.outputs'
-p20
+p19
 g12
 sS'x.graphics.out_implicit'
-p21
+p20
 g12
 sS'model.rpar'
-p22
+p21
 S'matrix'
-p23
+p22
 sS'T0'
-p24
+p23
 g8
 sS'graphics.exprs'
-p25
+p24
 NsS'typ'
-p26
+p25
 g12
 sS'model.blocktype'
-p27
+p26
 g5
 sS'mo'
-p28
+p27
 g2
 sS'model.dep_ut'
-p29
+p28
 g12
+sS'model.equations.parameters[2-1]'
+p29
+g15
 sS'exprs'
 p30
-g23
+g22
 sS'gr_i'
 p31
 g12
diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js
index 1810e7f5..27e498a2 100644
--- a/js/Hydraulics/VanneReglante.js
+++ b/js/Hydraulics/VanneReglante.js
@@ -39,8 +39,8 @@ function VanneReglante() {
         this.Cvmax = parseFloat(arguments[0]["Cvmax"])
         this.p_rho = parseFloat(arguments[0]["p_rho"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var exprs = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var exprs = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.Cvmax,this.p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs);
@@ -48,9 +48,9 @@ function VanneReglante() {
                 break;
             }
             this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]);
-            this.model.equations.parameters[2] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho]));
-            graphics.exprs = exprs;
-            this.x.graphics = graphics;
+            this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho]));
+            this.graphics.exprs = new ScilabDouble([exprs]);
+            this.x.graphics = this.graphics;
             this.x.model = this.model;
             break;
         }
diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle
index 6e112bf2..ceb85ccf 100644
--- a/js/Hydraulics/VanneReglante.pickle
+++ b/js/Hydraulics/VanneReglante.pickle
@@ -10,8 +10,10 @@ aS'p_rho'
 p4
 aS'Cvmax'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
@@ -57,32 +59,32 @@ g5
 sS'model.equations'
 p19
 g7
-sS'model.equations.parameters[2]'
-p20
-g17
 sS'mo.outputs'
-p21
+p20
 g5
 sS'x.graphics.out_implicit'
-p22
+p21
 g13
 sS'model.rpar'
-p23
+p22
 g15
 sS'graphics.exprs'
-p24
+p23
 NsS'typ'
-p25
+p24
 g13
 sS'model.blocktype'
-p26
+p25
 g5
 sS'mo'
-p27
+p26
 g2
 sS'model.dep_ut'
-p28
+p27
 g13
+sS'model.equations.parameters[2-1]'
+p28
+g17
 sS'exprs'
 p29
 g15