support string vector also

15 files changed, 215 insertions, 206 deletions

diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle
index 03123225..88e6f456 100644
--- a/js/Misc/DEBUG.pickle
+++ b/js/Misc/DEBUG.pickle
@@ -46,7 +46,7 @@ p12
 g9
 sS'tt'
 p13
-S'vector'
+S'vector_string'
 p14
 sS'graphics.exprs'
 p15
@@ -55,22 +55,23 @@ p16
 g3
 sS'gr_i'
 p17
-g14
-sS'graphics'
+S'vector'
 p18
+sS'graphics'
+p19
 g9
 sS'y'
-p19
-g14
-sS'x'
 p20
-NsS'model'
+g18
+sS'x'
 p21
+NsS'model'
+p22
 g9
 sS'typ'
-p22
-g14
-sS'warnMode'
 p23
+g18
+sS'warnMode'
+p24
 g11
 s.
\ No newline at end of file
diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle
index def535c9..305c6bff 100644
--- a/js/Misc/EDGETRIGGER.pickle
+++ b/js/Misc/EDGETRIGGER.pickle
@@ -54,30 +54,31 @@ p16
 g4
 sS'exprs'
 p17
-g15
-sS'x.model'
+S'vector_string'
 p18
-NsS'edge'
+sS'x.model'
 p19
+NsS'edge'
+p20
 g4
 sS'model.in'
-p20
+p21
 g4
 sS'graphics'
-p21
+p22
 g9
 sS'y'
-p22
+p23
 g15
 sS'x'
-p23
-NsS'model'
 p24
+NsS'model'
+p25
 g9
 sS'model.ipar'
-p25
+p26
 g4
 sS'typ'
-p26
+p27
 g15
 s.
\ No newline at end of file
diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js
index 8662ade4..4699c0b0 100644
--- a/js/Misc/EDGE_TRIGGER.js
+++ b/js/Misc/EDGE_TRIGGER.js
@@ -40,7 +40,7 @@ function EDGE_TRIGGER() {
         this.model = blk.model;
         this.graphics.orig = new ScilabDouble([0,10]);
         this.graphics.sz = new ScilabDouble([20,20]);
-        this.graphics.exprs = new ScilabDouble(["1"]);
+        this.graphics.exprs = new ScilabString(["1"]);
         this.model.ipar = new ScilabDouble([1]);
         this.graphics.pout = new ScilabDouble([5]);
         blk.graphics = this.graphics;
@@ -51,7 +51,7 @@ function EDGE_TRIGGER() {
         this.model = blk.model;
         this.graphics.orig = new ScilabDouble([170,-60]);
         this.graphics.sz = new ScilabDouble([20,20]);
-        this.graphics.exprs = new ScilabDouble(["1"]);
+        this.graphics.exprs = new ScilabString(["1"]);
         this.model.ipar = new ScilabDouble([1]);
         this.graphics.pein = new ScilabDouble([7]);
         blk.graphics = this.graphics;
diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle
index ad0be9c8..82928962 100644
--- a/js/Misc/EDGE_TRIGGER.pickle
+++ b/js/Misc/EDGE_TRIGGER.pickle
@@ -165,20 +165,21 @@ sS'blk.graphics'
 p54
 NsS'graphics.exprs'
 p55
-g2
-sS'y'
+S'vector_string'
 p56
+sS'y'
+p57
 g6
 sS'x'
-p57
+p58
 g10
 sS'model'
-p58
+p59
 g10
 sS'lnk.to'
-p59
+p60
 g2
 sS'arg1.model.rpar'
-p60
+p61
 g10
 s.
\ No newline at end of file
diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js
index 7747092a..164b496c 100644
--- a/js/Misc/Extract_Activation.js
+++ b/js/Misc/Extract_Activation.js
@@ -39,7 +39,7 @@ function Extract_Activation() {
         this.model = blk.model;
         this.graphics.orig = new ScilabDouble([0,10]);
         this.graphics.sz = new ScilabDouble([20,20]);
-        this.graphics.exprs = new ScilabDouble(["1"]);
+        this.graphics.exprs = new ScilabString(["1"]);
         this.model.ipar = new ScilabDouble([1]);
         this.graphics.pout = new ScilabDouble([7]);
         blk.graphics = this.graphics;
@@ -50,7 +50,7 @@ function Extract_Activation() {
         this.model = blk.model;
         this.graphics.orig = new ScilabDouble([110,-140]);
         this.graphics.sz = new ScilabDouble([20,20]);
-        this.graphics.exprs = new ScilabDouble(["1"]);
+        this.graphics.exprs = new ScilabString(["1"]);
         this.model.ipar = new ScilabDouble([1]);
         this.graphics.pein = new ScilabDouble([8]);
         blk.graphics = this.graphics;
diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle
index 5e5b2dec..32d491ea 100644
--- a/js/Misc/Extract_Activation.pickle
+++ b/js/Misc/Extract_Activation.pickle
@@ -91,39 +91,40 @@ p28
 g4
 sS'graphics.exprs'
 p29
-g2
-sS'scs_m_1.objs[7-1]'
+S'vector_string'
 p30
+sS'scs_m_1.objs[7-1]'
+p31
 g4
 sS'model.ipar'
-p31
+p32
 g4
 sS'model.nzcross'
-p32
+p33
 g4
 sS'graphics.pout'
-p33
+p34
 g4
 sS'scs_m_1.objs[1-1]'
-p34
+p35
 g8
 sS'scs_m_1.objs[5-1]'
-p35
+p36
 g4
 sS'gr_i'
-p36
+p37
 g2
 sS'scs_m_1.objs[4-1]'
-p37
+p38
 g8
 sS'x'
-p38
-NsS'model'
 p39
+NsS'model'
+p40
 g8
 sS'lnk.to'
-p40
+p41
 g2
 sS'blk.graphics'
-p41
+p42
 Ns.
\ No newline at end of file
diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle
index 6db902d4..a6502f37 100644
--- a/js/Misc/IMPSPLIT_f.pickle
+++ b/js/Misc/IMPSPLIT_f.pickle
@@ -25,7 +25,7 @@ S'double'
 p4
 sS'x.graphics.out_implicit'
 p5
-S'vector'
+S'vector_string'
 p6
 sS'mo'
 p7
@@ -48,17 +48,18 @@ p13
 g4
 sS'y'
 p14
-g6
-sS'x'
+S'vector'
 p15
-NsS'model'
+sS'x'
 p16
+NsS'model'
+p17
 g8
 sS'typ'
-p17
-g6
-sS'mo.outputs'
 p18
-S'matrix'
+g15
+sS'mo.outputs'
 p19
+S'matrix'
+p20
 s.
\ No newline at end of file
diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js
index ce52871a..cdb9ed51 100644
--- a/js/Misc/LOGICAL_OP.js
+++ b/js/Misc/LOGICAL_OP.js
@@ -118,7 +118,7 @@ function LOGICAL_OP() {
                         var label = "NOT";
                     }
                     this.graphics.exprs = new ScilabDouble(this.exprs);
-                    this.graphics.style = new ScilabDouble(["blockWithLabel;displayedLabel="+label]);
+                    this.graphics.style = new ScilabString(["blockWithLabel;displayedLabel="+label]);
                     this.x.graphics = this.graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle
index 98da2a59..23986b25 100644
--- a/js/Misc/LOGICAL_OP.pickle
+++ b/js/Misc/LOGICAL_OP.pickle
@@ -50,66 +50,67 @@ S'vector'
 p12
 sS'graphics.style'
 p13
-g12
-sS'x.graphics'
+S'vector_string'
 p14
+sS'x.graphics'
+p15
 g2
 sS'tp'
-p15
+p16
 g10
 sS'label'
-p16
+p17
 g5
 sS'model.sim'
-p17
-S'list'
 p18
-sS'nin'
+S'list'
 p19
+sS'nin'
+p20
 g10
 sS'in1'
-p20
-S'matrix'
 p21
-sS'model.in'
+S'matrix'
 p22
-g21
-sS'graphics.exprs'
+sS'model.in'
 p23
-g21
-sS'model.ipar'
+g22
+sS'graphics.exprs'
 p24
+g22
+sS'model.ipar'
+p25
 g12
 sS'typ'
-p25
+p26
 g12
 sS'ok'
-p26
-S'boolean'
 p27
-sS'model.blocktype'
+S'boolean'
 p28
+sS'model.blocktype'
+p29
 g5
 sS'rule'
-p29
+p30
 g10
 sS'exprs'
-p30
-g21
-sS'gr_i'
 p31
+g22
+sS'gr_i'
+p32
 g12
 sS'ipar'
-p32
+p33
 g12
 sS'y'
-p33
+p34
 g12
 sS'x'
-p34
-NsS'model'
 p35
+NsS'model'
+p36
 g2
 sS'ot'
-p36
+p37
 Ns.
\ No newline at end of file
diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js
index f245bcce..0ca1910a 100644
--- a/js/Misc/MBLOCK.js
+++ b/js/Misc/MBLOCK.js
@@ -287,7 +287,7 @@ function MBLOCK() {
                 this.exprs.funtxt = tt;
                 this.x.model = this.model;
                 this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]);
-                this.graphics.in_implicit = new ScilabDouble(this.intype);
+                this.graphics.in_implicit = new ScilabString(this.intype);
                 this.graphics.out_implicit = new ScilabDouble(this.outtype);
                 this.graphics.exprs = this.exprs;
                 this.x.graphics = this.graphics;
diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle
index 513e1e22..398535f8 100644
--- a/js/Misc/MBLOCK.pickle
+++ b/js/Misc/MBLOCK.pickle
@@ -121,127 +121,128 @@ p30
 g2
 sS'mo.inputs'
 p31
-g29
-sS'param'
+S'vector_string'
 p32
+sS'param'
+p33
 g21
 sS'gr_i'
-p33
+p34
 g29
 sS'paramv'
-p34
+p35
 g13
 sS'exprs.funtxt'
-p35
-g29
-sS'x.graphics.in_implicit'
 p36
 g29
-sS'mo.parameters'
+sS'x.graphics.in_implicit'
 p37
+g32
+sS'mo.parameters'
+p38
 g13
 sS'Tparam_sz'
-p38
+p39
 g8
 sS'pprop'
-p39
+p40
 g21
 sS'model.out'
-p40
+p41
 g8
 sS'model.sim'
-p41
+p42
 g13
 sS'model.equations'
-p42
+p43
 g4
 sS'mo.outputs'
-p43
+p44
 g21
 sS'intype'
-p44
-g29
-sS'x.graphics.out_implicit'
 p45
+g32
+sS'x.graphics.out_implicit'
+p46
 g21
 sS'in1'
-p46
-g29
-sS'model.rpar'
 p47
+g32
+sS'model.rpar'
+p48
 g21
 sS'lhs_txt'
-p48
+p49
 g2
 sS'outtype'
-p49
+p50
 g21
 sS'model.in'
-p50
+p51
 g8
 sS'graphics'
-p51
+p52
 g4
 sS'intypex'
-p52
+p53
 g8
 sS'lab_1'
-p53
+p54
 g13
 sS'lab_2'
-p54
-NsS'paramv[$+1-1]'
 p55
+NsS'paramv[$+1-1]'
+p56
 g2
 sS'ok'
-p56
-S'boolean'
 p57
-sS'model.blocktype'
+S'boolean'
 p58
+sS'model.blocktype'
+p59
 g2
 sS'exprs.param'
-p59
+p60
 g8
 sS'model.sim[1-1]'
-p60
-NsS'mo'
 p61
+NsS'mo'
+p62
 g4
 sS'x.graphics'
-p62
+p63
 g4
 sS'pprop[$+1-1]'
-p63
+p64
 g8
 sS'model.dep_ut'
-p64
-S'vector_boolean'
 p65
-sS'exprs.paramv'
+S'vector_boolean'
 p66
+sS'exprs.paramv'
+p67
 g13
 sS'exprs'
-p67
+p68
 g8
 sS'lab_2[$+1-1]'
-p68
+p69
 g2
 sS'r'
-p69
-g57
-sS'lab_txt'
 p70
+g58
+sS'lab_txt'
+p71
 g2
 sS'y'
-p71
+p72
 g29
 sS'x'
-p72
-NsS'model'
 p73
+NsS'model'
+p74
 g4
 sS'tt'
-p74
+p75
 g29
 s.
\ No newline at end of file
diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js
index ddaca010..8b246576 100644
--- a/js/Misc/MPBLOCK.js
+++ b/js/Misc/MPBLOCK.js
@@ -271,7 +271,7 @@ function MPBLOCK() {
                 this.exprs.funtxt = "";
                 this.x.model = this.model;
                 this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\' "+nameF+" \'];"]);
-                this.graphics.in_implicit = new ScilabDouble(this.intype);
+                this.graphics.in_implicit = new ScilabString(this.intype);
                 this.graphics.out_implicit = new ScilabDouble(this.outtype);
                 this.graphics.exprs = this.exprs;
                 this.x.graphics = this.graphics;
diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle
index 76b38fb4..6eb24584 100644
--- a/js/Misc/MPBLOCK.pickle
+++ b/js/Misc/MPBLOCK.pickle
@@ -108,124 +108,125 @@ p31
 g2
 sS'mo.inputs'
 p32
-g30
-sS'param'
+S'vector_string'
 p33
+sS'param'
+p34
 g30
 sS'paramv'
-p34
+p35
 g14
 sS'gr_i'
-p35
-g30
-sS'x.graphics.in_implicit'
 p36
 g30
-sS'mo.parameters'
+sS'x.graphics.in_implicit'
 p37
+g33
+sS'mo.parameters'
+p38
 g14
 sS'Tparam_sz'
-p38
+p39
 g4
 sS'pprop'
-p39
+p40
 g30
 sS'model.out'
-p40
+p41
 g4
 sS'model.sim'
-p41
+p42
 g14
 sS'model.equations'
-p42
+p43
 g6
 sS'mo.outputs'
-p43
+p44
 g22
 sS'intype'
-p44
-g30
-sS'x.graphics.out_implicit'
 p45
+g33
+sS'x.graphics.out_implicit'
+p46
 g22
 sS'in1'
-p46
-g30
-sS'model.rpar'
 p47
+g33
+sS'model.rpar'
+p48
 g22
 sS'lhs_txt'
-p48
+p49
 g2
 sS'outtype'
-p49
+p50
 g22
 sS'model.in'
-p50
+p51
 g4
 sS'graphics'
-p51
+p52
 g6
 sS'intypex'
-p52
+p53
 g4
 sS'lab_1'
-p53
+p54
 g14
 sS'lab_2'
-p54
-NsS'paramv[$+1-1]'
 p55
+NsS'paramv[$+1-1]'
+p56
 g2
 sS'ok'
-p56
-S'boolean'
 p57
-sS'model.blocktype'
+S'boolean'
 p58
+sS'model.blocktype'
+p59
 g2
 sS'exprs.param'
-p59
+p60
 g4
 sS'model.sim[1-1]'
-p60
-NsS'mo'
 p61
+NsS'mo'
+p62
 g6
 sS'x.graphics'
-p62
+p63
 g6
 sS'pprop[$+1-1]'
-p63
+p64
 g4
 sS'model.dep_ut'
-p64
-S'vector_boolean'
 p65
-sS'exprs.funtxt'
+S'vector_boolean'
 p66
+sS'exprs.funtxt'
+p67
 g2
 sS'exprs'
-p67
+p68
 g4
 sS'lab_2[$+1-1]'
-p68
+p69
 g2
 sS'r'
-p69
-g57
-sS'lab_txt'
 p70
+g58
+sS'lab_txt'
+p71
 g2
 sS'y'
-p71
+p72
 g30
 sS'x'
-p72
-NsS'model'
 p73
+NsS'model'
+p74
 g6
 sS'exprs.paramv'
-p74
+p75
 g14
 s.
\ No newline at end of file
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index ae05feb5..b4874f59 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -92,7 +92,7 @@ function RELATIONALOP() {
                     var label = "≥";
                 }
                 this.graphics.exprs = new ScilabDouble(this.exprs);
-                this.graphics.style = new ScilabDouble(["fontSize=13;fontStyle=1;displayedLabel="+label]);
+                this.graphics.style = new ScilabString(["fontSize=13;fontStyle=1;displayedLabel="+label]);
                 this.model.ipar = new ScilabDouble([this.rule]);
                 this.model.nzcross = new ScilabDouble([this.zcr]);
                 this.model.nmode = new ScilabDouble([this.zcr]);
diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle
index 502f8553..17357af5 100644
--- a/js/Misc/RELATIONALOP.pickle
+++ b/js/Misc/RELATIONALOP.pickle
@@ -51,69 +51,70 @@ S'vector'
 p13
 sS'graphics.style'
 p14
-g13
-sS'x.graphics'
+S'vector_string'
 p15
+sS'x.graphics'
+p16
 g2
 sS'typ'
-p16
+p17
 g13
 sS'label'
-p17
+p18
 g5
 sS'model.sim'
-p18
-S'list'
 p19
-sS'model.nmode'
+S'list'
 p20
+sS'model.nmode'
+p21
 g10
 sS'in1'
-p21
-S'matrix'
 p22
-sS'model.in'
+S'matrix'
 p23
-g22
-sS'graphics.exprs'
+sS'model.in'
 p24
-g22
-sS'x.graphics.style'
+g23
+sS'graphics.exprs'
 p25
-g13
-sS'model.ipar'
+g23
+sS'x.graphics.style'
 p26
+g15
+sS'model.ipar'
+p27
 g13
 sS'model.nzcross'
-p27
+p28
 g10
 sS'ok'
-p28
-S'boolean'
 p29
-sS'model.blocktype'
+S'boolean'
 p30
+sS'model.blocktype'
+p31
 g5
 sS'rule'
-p31
+p32
 g10
 sS'exprs'
-p32
-g22
-sS'gr_i'
 p33
+g23
+sS'gr_i'
+p34
 g13
 sS'ipar'
-p34
+p35
 g13
 sS'y'
-p35
+p36
 g13
 sS'x'
-p36
-NsS'model'
 p37
+NsS'model'
+p38
 g2
 sS'ot'
-p38
+p39
 Ns.
\ No newline at end of file