change graphics to object

50 files changed, 320 insertions, 270 deletions

diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index 08dc68c9..84ce2655 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -41,8 +41,8 @@ function CUMSUM() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -89,16 +89,16 @@ function CUMSUM() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle
index 071f5cfc..338fcc0d 100644
--- a/js/MatrixOp/CUMSUM.pickle
+++ b/js/MatrixOp/CUMSUM.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'lab'
 p2
-aS'model'
+aS'graphics'
 p3
-aS'typ'
+aS'x'
 p4
-aS'lab'
+aS'model'
 p5
-aS'decomptyp'
+aS'typ'
 p6
-atp7
-Rp8
+aS'decomptyp'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 9839cb99..4085179b 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -41,8 +41,8 @@ function EXTRACT() {
         this.a = inverse(arguments[0]["a"])
         this.b = inverse(arguments[0]["b"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -90,13 +90,13 @@ function EXTRACT() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle
index 3ab6adf0..6c926aa4 100644
--- a/js/MatrixOp/EXTRACT.pickle
+++ b/js/MatrixOp/EXTRACT.pickle
@@ -4,16 +4,18 @@ p0
 ((lp1
 S'a'
 p2
-aS'x'
+aS'b'
 p3
-aS'model'
+aS'graphics'
 p4
-aS'b'
+aS'x'
 p5
-aS'typ'
+aS'model'
 p6
-atp7
-Rp8
+aS'typ'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js
index 28ad3677..73389965 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -41,8 +41,8 @@ function EXTTRI() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -86,16 +86,16 @@ function EXTTRI() {
             var out = [this.model.out,this.model.out2];
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle
index 2c5c8a8f..3ea8ad2d 100644
--- a/js/MatrixOp/EXTTRI.pickle
+++ b/js/MatrixOp/EXTTRI.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'lab'
 p2
-aS'model'
+aS'graphics'
 p3
-aS'typ'
+aS'x'
 p4
-aS'lab'
+aS'model'
 p5
-aS'decomptyp'
+aS'typ'
 p6
-atp7
-Rp8
+aS'decomptyp'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index 3e5efd96..a9c5926d 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -37,8 +37,8 @@ function MATBKSL() {
     MATBKSL.prototype.set = function MATBKSL() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATBKSL() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle
index d6584a86..9b1a505d 100644
--- a/js/MatrixOp/MATBKSL.pickle
+++ b/js/MatrixOp/MATBKSL.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js
index 7eb28d79..a7998608 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -39,8 +39,8 @@ function MATCATH() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")>1) {
             var label = "size(evstr("+label[2-1]+"),\'*\')";
         }
@@ -54,15 +54,15 @@ function MATCATH() {
             var out = [-1,0];
             var it = -1*(ones(this.nin,1));
             var ot = -1;
-            var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-            this.model = tmpvar0[0]
-            var graphics = tmpvar0[1]
+            var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+            this.model = tmpvar0[0];
+            this.graphics = tmpvar0[1];
             var ok = tmpvar0[2];
             if (ok) {
                 var funtyp = 4;
                 this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle
index 47afdfa1..e22f5432 100644
--- a/js/MatrixOp/MATCATH.pickle
+++ b/js/MatrixOp/MATCATH.pickle
@@ -10,8 +10,10 @@ aS'nin'
 p4
 aS'lab'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js
index dfe4cfcd..8b8e49b2 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -40,8 +40,8 @@ function MATCATV() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")>1) {
             var label = "size(evstr("+label[2-1]+"),\'*\')";
         }
@@ -55,15 +55,15 @@ function MATCATV() {
             var it = -ones(this.nin,1);
             var ot = -1;
             var out = [0,-1];
-            var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-            this.model = tmpvar0[0]
-            var graphics = tmpvar0[1]
+            var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+            this.model = tmpvar0[0];
+            this.graphics = tmpvar0[1];
             var ok = tmpvar0[2];
             if (ok) {
                 var funtyp = 4;
                 this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle
index ead836c3..797f7102 100644
--- a/js/MatrixOp/MATCATV.pickle
+++ b/js/MatrixOp/MATCATV.pickle
@@ -10,8 +10,10 @@ aS'nin'
 p4
 aS'lab'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js
index f3a4fa9d..1a429089 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -37,8 +37,8 @@ function MATDET() {
     MATDET.prototype.set = function MATDET() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATDET() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle
index 42a969d6..c3b2baef 100644
--- a/js/MatrixOp/MATDET.pickle
+++ b/js/MatrixOp/MATDET.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js
index a9775a91..4d4fc28f 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -37,8 +37,8 @@ function MATDIAG() {
     MATDIAG.prototype.set = function MATDIAG() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATDIAG() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle
index 42a969d6..c3b2baef 100644
--- a/js/MatrixOp/MATDIAG.pickle
+++ b/js/MatrixOp/MATDIAG.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index c43b1e89..d8452298 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -37,8 +37,8 @@ function MATDIV() {
     MATDIV.prototype.set = function MATDIV() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATDIV() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle
index d6584a86..9b1a505d 100644
--- a/js/MatrixOp/MATDIV.pickle
+++ b/js/MatrixOp/MATDIV.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js
index 1e605fd8..f41bc778 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -41,8 +41,8 @@ function MATEIG() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -87,16 +87,16 @@ function MATEIG() {
             var in1 = [-1,-1];
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle
index fa38deab..9432c5b4 100644
--- a/js/MatrixOp/MATEIG.pickle
+++ b/js/MatrixOp/MATEIG.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'lab'
 p2
-aS'model'
+aS'graphics'
 p3
-aS'typ'
+aS'x'
 p4
-aS'lab'
+aS'model'
 p5
-aS'decomptyp'
+aS'typ'
 p6
-atp7
-Rp8
+aS'decomptyp'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js
index a01ec75a..ad5d0d01 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -37,8 +37,8 @@ function MATEXPM() {
     MATEXPM.prototype.set = function MATEXPM() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATEXPM() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle
index 42a969d6..c3b2baef 100644
--- a/js/MatrixOp/MATEXPM.pickle
+++ b/js/MatrixOp/MATEXPM.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js
index 3986609c..a99b1d51 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -37,8 +37,8 @@ function MATINV() {
     MATINV.prototype.set = function MATINV() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATINV() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle
index 42a969d6..c3b2baef 100644
--- a/js/MatrixOp/MATINV.pickle
+++ b/js/MatrixOp/MATINV.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index 63965b50..db897eb0 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -39,8 +39,8 @@ function MATLU() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -62,16 +62,16 @@ function MATLU() {
                 var ok = false;
             }
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 var funtyp = 4;
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = this.lab;
-                this.x.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([this.lab]);
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle
index afb20bf7..56af5dd5 100644
--- a/js/MatrixOp/MATLU.pickle
+++ b/js/MatrixOp/MATLU.pickle
@@ -10,8 +10,10 @@ aS'typ'
 p4
 aS'lab'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index 93992460..af24ba07 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -39,8 +39,8 @@ function MATMAGPHI() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -68,16 +68,16 @@ function MATMAGPHI() {
             }
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle
index 689495ae..df67a466 100644
--- a/js/MatrixOp/MATMAGPHI.pickle
+++ b/js/MatrixOp/MATMAGPHI.pickle
@@ -10,8 +10,10 @@ aS'lab'
 p4
 aS'decomptyp'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index fac108ea..e30a6e2c 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -30,8 +30,8 @@ function MATMUL() {
         this.rule = parseFloat(arguments[0]["rule"])
         this.np = parseFloat(arguments[0]["np"])
         this.x = arg1;
-        var graphics = this.x.graphics;
-        var label = graphics.exprs;
+        this.graphics = this.x.graphics;
+        var label = this.graphics.exprs;
         this.model = this.x.model;
         if (this.model.ipar==[]) {
             this.model.ipar = new ScilabDouble([1]);
@@ -146,16 +146,16 @@ function MATMUL() {
                 var in1 = [[-1,-2],[1,1]];
                 var out = [-1,-2];
             }
-            var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-            this.model = tmpvar0[0]
-            var graphics = tmpvar0[1]
+            var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+            this.model = tmpvar0[0];
+            this.graphics = tmpvar0[1];
             var ok = tmpvar0[2];
             if (ok) {
                 var label = exprs;
                 this.model.ipar = new ScilabDouble([this.rule]);
                 this.model.rpar = new ScilabDouble([kmin],[kmax]);
-                graphics.exprs = label;
-                this.x.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 var arg1 = this.x;
                 break;
diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle
index 31523949..5c93b78c 100644
--- a/js/MatrixOp/MATMUL.pickle
+++ b/js/MatrixOp/MATMUL.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'np'
+S'dtype'
 p2
-aS'x'
+aS'rule'
 p3
-aS'model'
+aS'graphics'
 p4
-aS'rule'
+aS'np'
 p5
-aS'dtype'
+aS'x'
 p6
-atp7
-Rp8
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index 41dcdc64..d0a39209 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -37,8 +37,8 @@ function MATPINV() {
     MATPINV.prototype.set = function MATPINV() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -65,13 +65,13 @@ function MATPINV() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle
index 42a969d6..c3b2baef 100644
--- a/js/MatrixOp/MATPINV.pickle
+++ b/js/MatrixOp/MATPINV.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js
index a369ebfe..4fdeb46d 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -43,8 +43,8 @@ function MATRESH() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -91,16 +91,16 @@ function MATRESH() {
             }
             if (ok) {
                 var label = this.lab;
-                var tmpvar0 = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(this.l1,it),list(this.out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 var funtyp = 4;
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle
index f8f86478..7ad4ecdc 100644
--- a/js/MatrixOp/MATRESH.pickle
+++ b/js/MatrixOp/MATRESH.pickle
@@ -2,20 +2,22 @@ c__builtin__
 set
 p0
 ((lp1
-S'lab'
+S'graphics'
 p2
-aS'l1'
+aS'lab'
 p3
-aS'x'
+aS'l1'
 p4
-aS'model'
+aS'x'
 p5
-aS'typ'
+aS'model'
 p6
-aS'out'
+aS'typ'
 p7
-atp8
-Rp9
+aS'out'
+p8
+atp9
+Rp10
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js
index 217bfa44..8e14ea57 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -41,8 +41,8 @@ function MATSING() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -90,16 +90,16 @@ function MATSING() {
             }
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle
index fa38deab..9432c5b4 100644
--- a/js/MatrixOp/MATSING.pickle
+++ b/js/MatrixOp/MATSING.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'lab'
 p2
-aS'model'
+aS'graphics'
 p3
-aS'typ'
+aS'x'
 p4
-aS'lab'
+aS'model'
 p5
-aS'decomptyp'
+aS'typ'
 p6
-atp7
-Rp8
+aS'decomptyp'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js
index 41531c10..a95a6c39 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -41,8 +41,8 @@ function MATSUM() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -91,16 +91,16 @@ function MATSUM() {
             var in1 = [this.model.in1,this.model.in2];
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle
index 071f5cfc..338fcc0d 100644
--- a/js/MatrixOp/MATSUM.pickle
+++ b/js/MatrixOp/MATSUM.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'x'
+S'lab'
 p2
-aS'model'
+aS'graphics'
 p3
-aS'typ'
+aS'x'
 p4
-aS'lab'
+aS'model'
 p5
-aS'decomptyp'
+aS'typ'
 p6
-atp7
-Rp8
+aS'decomptyp'
+p7
+atp8
+Rp9
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js
index c731d6ba..6f907f60 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -27,8 +27,8 @@ function MATTRAN() {
         this.typ = inverse(arguments[0]["typ"])
         this.rule = arguments[0]["rule"]
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==1) {
             label[2-1] = sci2exp(1);
@@ -59,13 +59,13 @@ function MATTRAN() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle
index c78ddced..74052d9a 100644
--- a/js/MatrixOp/MATTRAN.pickle
+++ b/js/MatrixOp/MATTRAN.pickle
@@ -10,8 +10,10 @@ aS'typ'
 p4
 aS'rule'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index 9aa71803..f49bd4ef 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -39,8 +39,8 @@ function MATZREIM() {
         this.lab = arguments[0]["lab"]
         this.x = arg1;
         this.model = arg1.model;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         if (size(label,"*")==14) {
             label[9-1] = [];
         }
@@ -68,16 +68,16 @@ function MATZREIM() {
             }
             var funtyp = 4;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
                 arg1.model = this.model;
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 this.x = arg1;
                 break;
             }
diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle
index 9e408e2d..c93ae0ba 100644
--- a/js/MatrixOp/MATZREIM.pickle
+++ b/js/MatrixOp/MATZREIM.pickle
@@ -10,8 +10,10 @@ aS'lab'
 p4
 aS'decomptyp'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index 8ab320ba..6de43443 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -39,8 +39,8 @@ function RICC() {
         this.tpe = arguments[0]["tpe"]
         this.mod = arguments[0]["mod"]
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -55,14 +55,14 @@ function RICC() {
             var it = [1,1,1];
             var ot = 1;
             var label = exprs;
-            var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-            this.model = tmpvar0[0]
-            var graphics = tmpvar0[1]
+            var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+            this.model = tmpvar0[0];
+            this.graphics = tmpvar0[1];
             var ok = tmpvar0[2];
             if (ok) {
                 this.model.ipar = new ScilabDouble([this.tpe],[this.mod]);
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle
index 57262a2c..fe948957 100644
--- a/js/MatrixOp/RICC.pickle
+++ b/js/MatrixOp/RICC.pickle
@@ -6,12 +6,14 @@ S'x'
 p2
 aS'model'
 p3
-aS'tpe'
-p4
 aS'mod'
+p4
+aS'tpe'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index 661b496d..9a3dfdf0 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -39,8 +39,8 @@ function ROOTCOEF() {
         this.typ = inverse(arguments[0]["typ"])
         this.inp = arguments[0]["inp"]
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==14) {
             label[9-1] = [];
@@ -67,13 +67,13 @@ function ROOTCOEF() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle
index 22aed3f5..a97ea3e1 100644
--- a/js/MatrixOp/ROOTCOEF.pickle
+++ b/js/MatrixOp/ROOTCOEF.pickle
@@ -10,8 +10,10 @@ aS'typ'
 p4
 aS'inp'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'model.dstate'
 p1
diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js
index 3f6acb79..69eaf16c 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -27,8 +27,8 @@ function SQRT() {
     SQRT.prototype.set = function SQRT() {
         this.typ = inverse(arguments[0]["typ"])
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         while (true) {
             [ok,this.typ,exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double  2=Complex)"],list("vec",1),label);
@@ -50,13 +50,13 @@ function SQRT() {
             var funtyp = 4;
             if (ok) {
                 var label = exprs;
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle
index 9d3a8e10..3955b075 100644
--- a/js/MatrixOp/SQRT.pickle
+++ b/js/MatrixOp/SQRT.pickle
@@ -8,8 +8,10 @@ aS'model'
 p3
 aS'typ'
 p4
-atp5
-Rp6
+aS'graphics'
+p5
+atp6
+Rp7
 .(dp0
 S'arg1'
 p1
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index ce83e0f3..473b975f 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -47,8 +47,8 @@ function SUBMAT() {
         this.d = arguments[0]["d"]
         this.inp = arguments[0]["inp"]
         this.x = arg1;
-        var graphics = arg1.graphics;
-        var label = graphics.exprs;
+        this.graphics = arg1.graphics;
+        var label = this.graphics.exprs;
         this.model = arg1.model;
         if (size(label,"*")==5) {
             label[6-1] = sci2exp([1,1]);
@@ -96,13 +96,13 @@ function SUBMAT() {
             var funtyp = 4;
             var label = exprs;
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
                 this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
-                graphics.exprs = label;
-                arg1.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([label]);
+                arg1.graphics = this.graphics;
                 arg1.model = this.model;
                 this.x = arg1;
                 break;
diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle
index 2889adb4..1f58e269 100644
--- a/js/MatrixOp/SUBMAT.pickle
+++ b/js/MatrixOp/SUBMAT.pickle
@@ -12,14 +12,16 @@ aS'd'
 p5
 aS'inp'
 p6
-aS'x'
+aS'graphics'
 p7
-aS'model'
+aS'x'
 p8
-aS'typ'
+aS'model'
 p9
-atp10
-Rp11
+aS'typ'
+p10
+atp11
+Rp12
 .(dp0
 S'model.dstate'
 p1