change graphics to object

18 files changed, 254 insertions, 240 deletions

diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index 864bfaf7..63406fca 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -31,8 +31,8 @@ function BITCLEAR() {
         this.Datatype = arguments[0]["Datatype"]
         this.bit = parseFloat(arguments[0]["bit"])
         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.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs);
@@ -81,15 +81,15 @@ function BITCLEAR() {
                 var it = this.Datatype;
                 var ot = this.Datatype;
                 var out = [1,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) {
-                graphics.exprs = exprs;
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.model.opar = list(new ScilabDouble([n]));
-                this.x.graphics = graphics;
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle
index fc60b980..24c58589 100644
--- a/js/IntegerOp/BITCLEAR.pickle
+++ b/js/IntegerOp/BITCLEAR.pickle
@@ -10,8 +10,10 @@ aS'model'
 p4
 aS'bit'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index fd52e1bb..fa66ce48 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -31,8 +31,8 @@ function BITSET() {
         this.Datatype = arguments[0]["Datatype"]
         this.bit = parseFloat(arguments[0]["bit"])
         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.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs);
@@ -79,15 +79,15 @@ function BITSET() {
                 var it = this.Datatype;
                 var ot = this.Datatype;
                 var out = [1,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) {
-                graphics.exprs = exprs;
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.model.opar = list(new ScilabDouble([n]));
-                this.x.graphics = graphics;
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle
index fc60b980..24c58589 100644
--- a/js/IntegerOp/BITSET.pickle
+++ b/js/IntegerOp/BITSET.pickle
@@ -10,8 +10,10 @@ aS'model'
 p4
 aS'bit'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index 94be655f..76f957bb 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -35,9 +35,9 @@ function CONVERT() {
         this.ot = parseFloat(arguments[0]["ot"])
         this.np = arguments[0]["np"]
         this.x = arg1;
-        var graphics = arg1.graphics;
+        this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             [ok,this.it,this.ot,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -368,14 +368,14 @@ function CONVERT() {
             var in1 = [this.model.in1,this.model.in2];
             var out = [this.model.out,this.model.out2];
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(out,this.ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
-                graphics.exprs = exprs;
-                this.x.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle
index b4be3cad..7e1aaf37 100644
--- a/js/IntegerOp/CONVERT.pickle
+++ b/js/IntegerOp/CONVERT.pickle
@@ -2,18 +2,20 @@ c__builtin__
 set
 p0
 ((lp1
-S'np'
+S'it'
 p2
-aS'x'
+aS'graphics'
 p3
-aS'model'
+aS'np'
 p4
-aS'ot'
+aS'x'
 p5
-aS'it'
+aS'model'
 p6
-atp7
-Rp8
+aS'ot'
+p7
+atp8
+Rp9
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index 4b6510ec..30036458 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -36,8 +36,8 @@ function EXTRACTBITS() {
         this.bit = parseFloat(arguments[0]["bit"])
         this.scal = arguments[0]["scal"]
         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.Datatype,this.rule,this.bit,this.scal,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],["    1 Upper Half"],["    2 Lower Half"],["    3 Range from MSB"],["    4 Range to LSB"],["    5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],["    If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),exprs);
@@ -228,15 +228,15 @@ function EXTRACTBITS() {
                 var it = this.Datatype;
                 var ot = this.Datatype;
                 var out = [1,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) {
-                graphics.exprs = exprs;
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]);
-                this.x.graphics = graphics;
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle
index 08b5b345..c47eb37f 100644
--- a/js/IntegerOp/EXTRACTBITS.pickle
+++ b/js/IntegerOp/EXTRACTBITS.pickle
@@ -8,14 +8,16 @@ aS'Datatype'
 p3
 aS'rule'
 p4
-aS'x'
+aS'graphics'
 p5
-aS'model'
+aS'x'
 p6
-aS'bit'
+aS'model'
 p7
-atp8
-Rp9
+aS'bit'
+p8
+atp9
+Rp10
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index e15748d6..1b704f2e 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -33,9 +33,9 @@ function INTMUL() {
         this.Datatype = arguments[0]["Datatype"]
         this.np = arguments[0]["np"]
         this.x = arg1;
-        var graphics = arg1.graphics;
+        this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             [ok,this.Datatype,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),exprs);
             if (!ok) {
@@ -101,15 +101,15 @@ function INTMUL() {
             var in1 = [this.model.in1,this.model.in2];
             var out = [this.model.out,this.model.out2];
             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.ipar = new ScilabDouble([this.np]);
-                graphics.exprs = exprs;
-                this.x.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle
index 2a3298b8..187761c9 100644
--- a/js/IntegerOp/INTMUL.pickle
+++ b/js/IntegerOp/INTMUL.pickle
@@ -10,8 +10,10 @@ aS'model'
 p4
 aS'np'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index 752d1d85..d8cb71c0 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -83,7 +83,7 @@ function JKFLIPFLOP() {
             }
             if (ok) {
                 xx.graphics.exprs[1-1] = this.exprs0;
-                this.model.odstate[1] = new ScilabDouble([this.init]);
+                this.model.odstate[1-1] = new ScilabDouble([this.init]);
                 xx.model = this.model;
                 arg1.model.rpar.objs[path-1] = xx;
                 break;
diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle
index 25ffe935..29deca35 100644
--- a/js/IntegerOp/JKFLIPFLOP.pickle
+++ b/js/IntegerOp/JKFLIPFLOP.pickle
@@ -13,201 +13,201 @@ p5
 atp6
 Rp7
 .(dp0
-S'model.odstate[1]'
+S'xx.model'
 p1
-S'double'
+S'object'
 p2
-sS'xx.model'
+sS'model.sim'
 p3
-S'object'
+S'string'
 p4
-sS'model.sim'
+sS'arg1'
 p5
-S'string'
+g2
+sS'scs_m_1.objs[6-1]'
 p6
-sS'arg1'
+S'double'
 p7
-g4
-sS'scs_m_1.objs[6-1]'
-p8
-g2
 sS'scs_m_1.objs[3-1]'
+p8
+g7
+sS'xx.graphics'
 p9
 g2
-sS'xx.graphics'
-p10
-g4
 sS'model.out'
-p11
+p10
 S'matrix'
-p12
+p11
 sS'xx'
-p13
-g4
+p12
+g2
 sS'o'
-p14
-g4
-sS'scs_m_1.objs[7-1]'
-p15
+p13
 g2
+sS'scs_m_1.objs[7-1]'
+p14
+g7
 sS'xx.graphics.exprs[1-1]'
-p16
+p15
 NsS'scs_m.objs[20-1]'
-p17
-g2
+p16
+g7
 sS'scs_m.objs[2-1]'
-p18
-g2
+p17
+g7
 sS'scs_m.objs[5-1]'
-p19
-g2
+p18
+g7
 sS'scs_m.objs[10-1]'
-p20
-g2
+p19
+g7
 sS'scs_m'
-p21
-g2
+p20
+g7
 sS'model.in1'
-p22
-g12
+p21
+g11
 sS'scs_m.objs[19-1]'
-p23
-g2
+p22
+g7
 sS'scs_m.objs[1-1]'
-p24
-g2
+p23
+g7
 sS'scs_m.objs[18-1]'
-p25
-g2
+p24
+g7
 sS'model.dep_ut'
-p26
+p25
 S'vector'
-p27
+p26
 sS'newpar[size(newpar)+1-1]'
-p28
-g2
+p27
+g7
 sS'init'
-p29
-g2
+p28
+g7
 sS'scs_m_1'
-p30
-g2
+p29
+g7
 sS'scs_m.objs[22-1]'
-p31
-g2
+p30
+g7
 sS'scs_m_1.objs[2-1]'
-p32
-g2
+p31
+g7
 sS'init_old'
-p33
-g2
+p32
+g7
 sS'scs_m.objs[13-1]'
-p34
-g2
+p33
+g7
 sS'model.firing'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'newpar'
-p37
+p36
 S'list'
-p38
+p37
 sS'model.in2'
-p39
-g12
+p38
+g11
 sS'scs_m.objs[6-1]'
-p40
-g2
+p39
+g7
 sS'scs_m.objs[9-1]'
+p40
+g7
+sS'model.odstate[1-1]'
 p41
-g2
+g7
 sS'model.out2'
 p42
-g12
+g11
 sS'model.intyp'
 p43
-g27
+g26
 sS'model.rpar'
 p44
-g2
+g7
 sS'scs_m.objs[3-1]'
 p45
-g2
+g7
 sS'scs_m_1.objs[4-1]'
 p46
-g2
+g7
 sS'scs_m.objs[16-1]'
 p47
-g2
+g7
 sS'scs_m.objs[11-1]'
 p48
-g2
+g7
 sS'scs_m.objs[14-1]'
 p49
-g2
+g7
 sS'scs_m.objs[17-1]'
 p50
-g2
+g7
 sS'scs_m_1.objs[5-1]'
 p51
-g2
+g7
 sS'path'
 p52
 NsS'scs_m.objs[4-1]'
 p53
-g2
+g7
 sS'scs_m.objs[7-1]'
 p54
-g2
+g7
 sS'typ'
 p55
-g38
+g37
 sS'model.outtyp'
 p56
-g27
+g26
 sS'needcompile'
 p57
-g2
+g7
 sS'arg1.model'
 p58
-g4
+g2
 sS'model.blocktype'
 p59
-g6
+g4
 sS'scs_m.objs[8-1]'
 p60
-g2
+g7
 sS'scs_m.objs[15-1]'
 p61
-g2
+g7
 sS'scs_m.objs[21-1]'
 p62
-g2
+g7
 sS'scs_m_1.objs[1-1]'
 p63
-g2
+g7
 sS'arg1.model.rpar.objs[path-1]'
 p64
-g4
+g2
 sS'exprs'
 p65
-g2
+g7
 sS'gr_i'
 p66
-g27
+g26
 sS'scs_m.objs[12-1]'
 p67
-g2
+g7
 sS'y'
 p68
-g2
+g7
 sS'x'
 p69
-g2
+g7
 sS'model'
 p70
-g4
+g2
 sS'arg1.model.rpar'
 p71
-g4
+g2
 s.
\ No newline at end of file
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index 97898c8d..4c7ca2f2 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -34,8 +34,8 @@ function LOGIC() {
         this.mat = inverse(arguments[0]["mat"])
         this.herit = arguments[0]["herit"]
         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.mat,this.herit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],["  Rows of the matrix are the output values"],["  Number of rows must be a power of two."],["  Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),exprs);
@@ -60,16 +60,16 @@ function LOGIC() {
                 var out = [ones(nout,1),ones(nout,1)];
                 var it = 5*ones(1,nin);
                 var ot = 5*ones(1,nout);
-                var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
-                graphics.exprs = exprs;
+                this.graphics.exprs = new ScilabDouble([exprs]);
                 this.mat = int8(this.mat);
                 this.model.opar = list(new ScilabDouble([this.mat]));
-                this.x.graphics = graphics;
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle
index 383d01ee..c2e52def 100644
--- a/js/IntegerOp/LOGIC.pickle
+++ b/js/IntegerOp/LOGIC.pickle
@@ -10,8 +10,10 @@ aS'herit'
 p4
 aS'mat'
 p5
-atp6
-Rp7
+aS'graphics'
+p6
+atp7
+Rp8
 .(dp0
 S'arg1'
 p1
diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js
index 5b6a4188..0096da1b 100644
--- a/js/IntegerOp/SHIFT.js
+++ b/js/IntegerOp/SHIFT.js
@@ -36,9 +36,9 @@ function SHIFT() {
         this.nb = arguments[0]["nb"]
         this.np = arguments[0]["np"]
         this.x = arg1;
-        var graphics = arg1.graphics;
+        this.graphics = arg1.graphics;
         this.model = arg1.model;
-        var exprs = graphics.exprs;
+        var exprs = this.graphics.exprs;
         while (true) {
             [ok,this.Datatype,this.nb,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),exprs);
             if (!ok) {
@@ -118,15 +118,15 @@ function SHIFT() {
                 var ok = false;
             }
             if (ok) {
-                var tmpvar0 = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[])
-                this.model = tmpvar0[0]
-                var graphics = tmpvar0[1]
+                var tmpvar0 = set_io(this.model,this.graphics,list([-1,-2],it),list([-1,-2],ot),[],[]);
+                this.model = tmpvar0[0];
+                this.graphics = tmpvar0[1];
                 var ok = tmpvar0[2];
             }
             if (ok) {
                 this.model.ipar = new ScilabDouble([this.nb]);
-                graphics.exprs = exprs;
-                this.x.graphics = graphics;
+                this.graphics.exprs = new ScilabDouble([exprs]);
+                this.x.graphics = this.graphics;
                 this.x.model = this.model;
                 break;
             }
diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle
index 0f8af58b..c5cb2ddf 100644
--- a/js/IntegerOp/SHIFT.pickle
+++ b/js/IntegerOp/SHIFT.pickle
@@ -4,16 +4,18 @@ p0
 ((lp1
 S'Datatype'
 p2
-aS'x'
+aS'nb'
 p3
-aS'model'
+aS'graphics'
 p4
 aS'np'
 p5
-aS'nb'
+aS'x'
 p6
-atp7
-Rp8
+aS'model'
+p7
+atp8
+Rp9
 .(dp0
 S'OPER'
 p1
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index db4dc223..6f9ade74 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -67,7 +67,7 @@ function SRFLIPFLOP() {
             }
             if (ok) {
                 xx.graphics.exprs[1-1] = this.exprs0;
-                this.model.odstate[1] = new ScilabDouble([this.init]);
+                this.model.odstate[1-1] = new ScilabDouble([this.init]);
                 xx.model = this.model;
                 arg1.model.rpar.objs[path-1] = xx;
                 break;
diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle
index ceaa93a4..4bf38a8b 100644
--- a/js/IntegerOp/SRFLIPFLOP.pickle
+++ b/js/IntegerOp/SRFLIPFLOP.pickle
@@ -13,152 +13,152 @@ p5
 atp6
 Rp7
 .(dp0
-S'model.odstate[1]'
+S'xx.model'
 p1
-S'double'
+S'object'
 p2
-sS'xx.model'
+sS'model.sim'
 p3
-S'object'
+S'string'
 p4
-sS'model.sim'
+sS'arg1'
 p5
-S'string'
+g2
+sS'xx.graphics'
 p6
-sS'arg1'
+g2
+sS'model.out'
 p7
-g4
-sS'xx.graphics'
+S'matrix'
 p8
-g4
-sS'model.out'
+sS'xx'
 p9
-S'matrix'
+g2
+sS'o'
 p10
-sS'xx'
+g2
+sS'xx.graphics.exprs[1-1]'
 p11
-g4
-sS'o'
+NsS'scs_m.objs[2-1]'
 p12
-g4
-sS'xx.graphics.exprs[1-1]'
+S'double'
 p13
-NsS'scs_m.objs[2-1]'
-p14
-g2
 sS'scs_m.objs[5-1]'
-p15
-g2
+p14
+g13
 sS'scs_m.objs[10-1]'
-p16
-g2
+p15
+g13
 sS'scs_m'
-p17
-g2
+p16
+g13
 sS'model.in1'
-p18
-g10
+p17
+g8
 sS'scs_m.objs[1-1]'
-p19
-g2
+p18
+g13
 sS'model.dep_ut'
-p20
+p19
 S'vector'
-p21
+p20
 sS'newpar[size(newpar)+1-1]'
-p22
+p21
 NsS'init'
-p23
-g2
+p22
+g13
 sS'scs_m.objs[12-1]'
-p24
-g2
+p23
+g13
 sS'init_old'
-p25
-g2
+p24
+g13
 sS'scs_m.objs[13-1]'
-p26
-g2
+p25
+g13
 sS'newpar'
-p27
+p26
 S'list'
-p28
+p27
 sS'model.in2'
-p29
-g10
+p28
+g8
 sS'scs_m.objs[6-1]'
-p30
-g2
+p29
+g13
 sS'scs_m.objs[9-1]'
+p30
+g13
+sS'model.odstate[1-1]'
 p31
-g2
+g13
 sS'model.out2'
 p32
-g10
+g8
 sS'model.intyp'
 p33
-g21
+g20
 sS'model.rpar'
 p34
-g2
+g13
 sS'scs_m.objs[3-1]'
 p35
-g2
+g13
 sS'model.outtyp'
 p36
-g21
+g20
 sS'scs_m.objs[11-1]'
 p37
-g2
+g13
 sS'scs_m.objs[14-1]'
 p38
-g2
+g13
 sS'path'
 p39
 NsS'scs_m.objs[4-1]'
 p40
-g2
+g13
 sS'scs_m.objs[7-1]'
 p41
-g2
+g13
 sS'typ'
 p42
-g28
+g27
 sS'needcompile'
 p43
-g2
+g13
 sS'arg1.model'
 p44
-g4
+g2
 sS'model.blocktype'
 p45
-g6
+g4
 sS'scs_m.objs[8-1]'
 p46
-g2
+g13
 sS'arg1.model.rpar.objs[path-1]'
 p47
-g4
+g2
 sS'exprs'
 p48
-g2
+g13
 sS'gr_i'
 p49
-g21
+g20
 sS'model.firing'
 p50
 S'boolean'
 p51
 sS'y'
 p52
-g2
+g13
 sS'x'
 p53
-g2
+g13
 sS'model'
 p54
-g4
+g2
 sS'arg1.model.rpar'
 p55
-g4
+g2
 s.
\ No newline at end of file