summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Shetye2018-07-06 12:20:13 +0530
committerSunil Shetye2018-07-09 12:16:25 +0530
commit5c011853630a1b466ef4789d5b600dd530d0a3ec (patch)
treefe2935154d2c500f1d883a4b319235bb67628477
parent5a28e41a3105338f747b8a30f67000920490c67d (diff)
downloadsci2js-5c011853630a1b466ef4789d5b600dd530d0a3ec.tar.gz
sci2js-5c011853630a1b466ef4789d5b600dd530d0a3ec.tar.bz2
sci2js-5c011853630a1b466ef4789d5b600dd530d0a3ec.zip
use different syntax for matrix options
-rw-r--r--combined.js110
-rw-r--r--js/IntegerOp/LOGIC.js2
-rw-r--r--js/Linear/DIFF_c.js2
-rw-r--r--js/Linear/SUMMATION.js2
-rw-r--r--js/Misc/BOUNCE.js6
-rw-r--r--js/Misc/BOUNCEXY.js4
-rw-r--r--js/Misc/DIFF_f.js2
-rw-r--r--js/NonLinear/DLRADAPT_f.js8
-rw-r--r--js/NonLinear/INTRP2BLK_f.js6
-rw-r--r--js/NonLinear/INTRPLBLK_f.js4
-rw-r--r--js/NonLinear/LOOKUP2D.js2
-rw-r--r--js/Sinks/CANIMXY.js4
-rw-r--r--js/Sinks/CANIMXY3D.js16
-rw-r--r--js/Sinks/CEVENTSCOPE.js6
-rw-r--r--js/Sinks/CFSCOPE.js6
-rw-r--r--js/Sinks/CMSCOPE.js14
-rw-r--r--js/Sinks/CSCOPE.js6
-rw-r--r--js/Sinks/CSCOPXY.js4
-rw-r--r--js/Sinks/CSCOPXY3D.js16
-rwxr-xr-xsci2jsyacc.py6
20 files changed, 115 insertions, 111 deletions
diff --git a/combined.js b/combined.js
index 2ccb2471..501ade1a 100644
--- a/combined.js
+++ b/combined.js
@@ -5753,7 +5753,7 @@ function LOGIC() {
}
LOGIC.prototype.get = function LOGIC() {
var options = {
- mat:["Truth Table (matrix of outputs)",this.mat],
+ mat:["Truth Table (matrix of outputs)",this.mat.toString().replace(/,/g," ")],
herit:["Accepts Inherited Events (0:No, 1:Yes)",this.herit],
}
return options;
@@ -6718,7 +6718,7 @@ function DIFF_c() {
}
DIFF_c.prototype.get = function DIFF_c() {
var options = {
- x0:["Initial state",this.x0],
+ x0:["Initial state",this.x0.toString().replace(/,/g," ")],
xd0:["Initial Derivative",this.xd0],
}
return options;
@@ -8390,7 +8390,7 @@ function SUMMATION() {
SUMMATION.prototype.get = function SUMMATION() {
var options = {
Datatype:["Datatype (1=real double 2=complex 3=int32 ...)",this.Datatype],
- sgn:["Number of inputs or sign vector (of +1, -1)",this.sgn],
+ sgn:["Number of inputs or sign vector (of +1, -1)",this.sgn.toString().replace(/,/g," ")],
satur:["Do on Overflow(0=Nothing 1=Saturate 2=Error)",this.satur],
}
return options;
@@ -11402,11 +11402,11 @@ function BOUNCE() {
var options = {
rpar1:["Mass",this.rpar1],
rpar2:["Radius",this.rpar2],
- walls:["[xmin,xmax,ymin,ymax]",this.walls],
+ walls:["[xmin,xmax,ymin,ymax]",this.walls.toString().replace(/,/g," ")],
xt:["xpos",this.xt],
- xd:["xdpos",this.xd],
+ xd:["xdpos",this.xd.toString().replace(/,/g," ")],
y:["ypos",this.y],
- yd:["ydpos",this.yd],
+ yd:["ydpos",this.yd.toString().replace(/,/g," ")],
g:["g (gravity)",this.g],
C:["C (aerodynamic coeff",this.C],
}
@@ -11528,8 +11528,8 @@ function BOUNCEXY() {
}
BOUNCEXY.prototype.get = function BOUNCEXY() {
var options = {
- clrs:["colors",this.clrs],
- siz:["radii",this.siz],
+ clrs:["colors",this.clrs.toString().replace(/,/g," ")],
+ siz:["radii",this.siz.toString().replace(/,/g," ")],
win:["window number (-1 for automatic)",this.win],
imode:["animation mode (0,1)",this.imode],
xmin:["Xmin",this.xmin],
@@ -12303,7 +12303,7 @@ function DIFF_f() {
}
DIFF_f.prototype.get = function DIFF_f() {
var options = {
- x0:["Initial state",this.x0],
+ x0:["Initial state",this.x0.toString().replace(/,/g," ")],
xd0:["Initial Derivative",this.xd0],
}
return options;
@@ -15052,12 +15052,12 @@ function DLRADAPT_f() {
}
DLRADAPT_f.prototype.get = function DLRADAPT_f() {
var options = {
- p:["Vector of p mesh points",this.p],
+ p:["Vector of p mesh points",this.p.toString().replace(/,/g," ")],
rn:["Numerator roots (one line for each mesh)",this.rn],
- rd:["Denominator roots (one line for each mesh)",this.rd],
- g:["Vector of gain at mesh points",this.g],
+ rd:["Denominator roots (one line for each mesh)",this.rd.toString().replace(/,/g," ")],
+ g:["Vector of gain at mesh points",this.g.toString().replace(/,/g," ")],
last_u:["past inputs (Num degree values)",this.last_u],
- last_y:["past outputs (Den degree values)",this.last_y],
+ last_y:["past outputs (Den degree values)",this.last_y.toString().replace(/,/g," ")],
}
return options;
}
@@ -15258,9 +15258,9 @@ function INTRP2BLK_f() {
}
INTRP2BLK_f.prototype.get = function INTRP2BLK_f() {
var options = {
- a:["X coord.",this.a],
- b:["Y coord.",this.b],
- c:["Z values",this.c],
+ a:["X coord.",this.a.toString().replace(/,/g," ")],
+ b:["Y coord.",this.b.toString().replace(/,/g," ")],
+ c:["Z values",this.c.toString().replace(/,/g," ")],
}
return options;
}
@@ -15317,8 +15317,8 @@ function INTRPLBLK_f() {
}
INTRPLBLK_f.prototype.get = function INTRPLBLK_f() {
var options = {
- a:["X coord.",this.a],
- b:["Y coord.",this.b],
+ a:["X coord.",this.a.toString().replace(/,/g," ")],
+ b:["Y coord.",this.b.toString().replace(/,/g," ")],
}
return options;
}
@@ -15491,7 +15491,7 @@ function LOOKUP2D() {
var options = {
xx:["Row index input values",this.xx],
yy:["Column index input values",this.yy],
- zz:["Table data",this.zz],
+ zz:["Table data",this.zz.toString().replace(/,/g," ")],
Method:["Lookup method(1..5)",this.Method],
graf:["Launch graphic window(y/n)?",this.graf],
}
@@ -16628,8 +16628,8 @@ function CANIMXY() {
clrs:["color (>0) or mark (<0)",this.clrs],
siz:["line or mark size",this.siz],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
xmin:["Xmin",this.xmin],
xmax:["Xmax",this.xmax],
ymin:["Ymin",this.ymin],
@@ -16753,15 +16753,15 @@ function CANIMXY3D() {
CANIMXY3D.prototype.get = function CANIMXY3D() {
var options = {
nbr_curves:["Number of curves",this.nbr_curves],
- clrs:["color (>0) or mark (<0)",this.clrs],
- siz:["line or mark size",this.siz],
+ clrs:["color (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
+ siz:["line or mark size",this.siz.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
- vec_x:["Xmin and Xmax",this.vec_x],
- vec_y:["Ymin and Ymax",this.vec_y],
- vec_z:["Zmin and Zmax",this.vec_z],
- param3ds:["Alpha and Theta",this.param3ds],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
+ vec_x:["Xmin and Xmax",this.vec_x.toString().replace(/,/g," ")],
+ vec_y:["Ymin and Ymax",this.vec_y.toString().replace(/,/g," ")],
+ vec_z:["Zmin and Zmax",this.vec_z.toString().replace(/,/g," ")],
+ param3ds:["Alpha and Theta",this.param3ds.toString().replace(/,/g," ")],
N:["Buffer size",this.N],
}
return options;
@@ -16889,10 +16889,10 @@ function CEVENTSCOPE() {
CEVENTSCOPE.prototype.get = function CEVENTSCOPE() {
var options = {
nclock:["Number of event inputs",this.nclock],
- clrs:["colors c (>0) or mark (<0)",this.clrs],
+ clrs:["colors c (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
per:["Refresh period",this.per],
}
return options;
@@ -16994,10 +16994,10 @@ function CFSCOPE() {
}
CFSCOPE.prototype.get = function CFSCOPE() {
var options = {
- clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs],
+ clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
ymin:["Ymin",this.ymin],
ymax:["Ymax",this.ymax],
per:["Refresh period",this.per],
@@ -17435,14 +17435,14 @@ function CMSCOPE() {
}
CMSCOPE.prototype.get = function CMSCOPE() {
var options = {
- in1:["Input ports sizes",this.in1],
- clrs:["Drawing colors (>0) or mark (<0)",this.clrs],
+ in1:["Input ports sizes",this.in1.toString().replace(/,/g," ")],
+ clrs:["Drawing colors (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
- ymin:["Ymin vector",this.ymin],
- ymax:["Ymax vector",this.ymax],
- per:["Refresh period",this.per],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
+ ymin:["Ymin vector",this.ymin.toString().replace(/,/g," ")],
+ ymax:["Ymax vector",this.ymax.toString().replace(/,/g," ")],
+ per:["Refresh period",this.per.toString().replace(/,/g," ")],
N:["Buffer size",this.N],
heritance:["Accept herited events 0/1",this.heritance],
nom:["Name of Scope (label&Id)",this.nom],
@@ -17585,10 +17585,10 @@ function CSCOPE() {
}
CSCOPE.prototype.get = function CSCOPE() {
var options = {
- clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs],
+ clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
ymin:["Ymin",this.ymin],
ymax:["Ymax",this.ymax],
per:["Refresh period",this.per],
@@ -17714,8 +17714,8 @@ function CSCOPXY() {
clrs:["color (>0) or mark (<0)",this.clrs],
siz:["line or mark size",this.siz],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
xmin:["Xmin",this.xmin],
xmax:["Xmax",this.xmax],
ymin:["Ymin",this.ymin],
@@ -17838,15 +17838,15 @@ function CSCOPXY3D() {
CSCOPXY3D.prototype.get = function CSCOPXY3D() {
var options = {
nbr_curves:["Number of curves",this.nbr_curves],
- clrs:["color (>0) or mark (<0)",this.clrs],
- siz:["Line or Mark Size",this.siz],
+ clrs:["color (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
+ siz:["Line or Mark Size",this.siz.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
- vec_x:["Xmin and Xmax",this.vec_x],
- vec_y:["Ymin and Ymax",this.vec_y],
- vec_z:["Zmin and Zmax",this.vec_z],
- param3ds:["Alpha and Theta",this.param3ds],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
+ vec_x:["Xmin and Xmax",this.vec_x.toString().replace(/,/g," ")],
+ vec_y:["Ymin and Ymax",this.vec_y.toString().replace(/,/g," ")],
+ vec_z:["Zmin and Zmax",this.vec_z.toString().replace(/,/g," ")],
+ param3ds:["Alpha and Theta",this.param3ds.toString().replace(/,/g," ")],
N:["Buffer size",this.N],
}
return options;
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index beac49e0..9316c3bf 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -25,7 +25,7 @@ function LOGIC() {
}
LOGIC.prototype.get = function LOGIC() {
var options = {
- mat:["Truth Table (matrix of outputs)",this.mat],
+ mat:["Truth Table (matrix of outputs)",this.mat.toString().replace(/,/g," ")],
herit:["Accepts Inherited Events (0:No, 1:Yes)",this.herit],
}
return options;
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index dd3f6722..11b4281f 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -19,7 +19,7 @@ function DIFF_c() {
}
DIFF_c.prototype.get = function DIFF_c() {
var options = {
- x0:["Initial state",this.x0],
+ x0:["Initial state",this.x0.toString().replace(/,/g," ")],
xd0:["Initial Derivative",this.xd0],
}
return options;
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js
index 2c8e8eb8..0aabff5e 100644
--- a/js/Linear/SUMMATION.js
+++ b/js/Linear/SUMMATION.js
@@ -22,7 +22,7 @@ function SUMMATION() {
SUMMATION.prototype.get = function SUMMATION() {
var options = {
Datatype:["Datatype (1=real double 2=complex 3=int32 ...)",this.Datatype],
- sgn:["Number of inputs or sign vector (of +1, -1)",this.sgn],
+ sgn:["Number of inputs or sign vector (of +1, -1)",this.sgn.toString().replace(/,/g," ")],
satur:["Do on Overflow(0=Nothing 1=Saturate 2=Error)",this.satur],
}
return options;
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index 75550541..b55e03cc 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -45,11 +45,11 @@ function BOUNCE() {
var options = {
rpar1:["Mass",this.rpar1],
rpar2:["Radius",this.rpar2],
- walls:["[xmin,xmax,ymin,ymax]",this.walls],
+ walls:["[xmin,xmax,ymin,ymax]",this.walls.toString().replace(/,/g," ")],
xt:["xpos",this.xt],
- xd:["xdpos",this.xd],
+ xd:["xdpos",this.xd.toString().replace(/,/g," ")],
y:["ypos",this.y],
- yd:["ydpos",this.yd],
+ yd:["ydpos",this.yd.toString().replace(/,/g," ")],
g:["g (gravity)",this.g],
C:["C (aerodynamic coeff",this.C],
}
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index 2cbcae14..a720b4ed 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -40,8 +40,8 @@ function BOUNCEXY() {
}
BOUNCEXY.prototype.get = function BOUNCEXY() {
var options = {
- clrs:["colors",this.clrs],
- siz:["radii",this.siz],
+ clrs:["colors",this.clrs.toString().replace(/,/g," ")],
+ siz:["radii",this.siz.toString().replace(/,/g," ")],
win:["window number (-1 for automatic)",this.win],
imode:["animation mode (0,1)",this.imode],
xmin:["Xmin",this.xmin],
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index 0642e719..f9aba023 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -19,7 +19,7 @@ function DIFF_f() {
}
DIFF_f.prototype.get = function DIFF_f() {
var options = {
- x0:["Initial state",this.x0],
+ x0:["Initial state",this.x0.toString().replace(/,/g," ")],
xd0:["Initial Derivative",this.xd0],
}
return options;
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index caadf701..c04d1814 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -28,12 +28,12 @@ function DLRADAPT_f() {
}
DLRADAPT_f.prototype.get = function DLRADAPT_f() {
var options = {
- p:["Vector of p mesh points",this.p],
+ p:["Vector of p mesh points",this.p.toString().replace(/,/g," ")],
rn:["Numerator roots (one line for each mesh)",this.rn],
- rd:["Denominator roots (one line for each mesh)",this.rd],
- g:["Vector of gain at mesh points",this.g],
+ rd:["Denominator roots (one line for each mesh)",this.rd.toString().replace(/,/g," ")],
+ g:["Vector of gain at mesh points",this.g.toString().replace(/,/g," ")],
last_u:["past inputs (Num degree values)",this.last_u],
- last_y:["past outputs (Den degree values)",this.last_y],
+ last_y:["past outputs (Den degree values)",this.last_y.toString().replace(/,/g," ")],
}
return options;
}
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index dfae286e..16d28b77 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -22,9 +22,9 @@ function INTRP2BLK_f() {
}
INTRP2BLK_f.prototype.get = function INTRP2BLK_f() {
var options = {
- a:["X coord.",this.a],
- b:["Y coord.",this.b],
- c:["Z values",this.c],
+ a:["X coord.",this.a.toString().replace(/,/g," ")],
+ b:["Y coord.",this.b.toString().replace(/,/g," ")],
+ c:["Z values",this.c.toString().replace(/,/g," ")],
}
return options;
}
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 1ee8b5ce..60b67324 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -20,8 +20,8 @@ function INTRPLBLK_f() {
}
INTRPLBLK_f.prototype.get = function INTRPLBLK_f() {
var options = {
- a:["X coord.",this.a],
- b:["Y coord.",this.b],
+ a:["X coord.",this.a.toString().replace(/,/g," ")],
+ b:["Y coord.",this.b.toString().replace(/,/g," ")],
}
return options;
}
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index 0a774ebf..06d5819a 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -28,7 +28,7 @@ function LOOKUP2D() {
var options = {
xx:["Row index input values",this.xx],
yy:["Column index input values",this.yy],
- zz:["Table data",this.zz],
+ zz:["Table data",this.zz.toString().replace(/,/g," ")],
Method:["Lookup method(1..5)",this.Method],
graf:["Launch graphic window(y/n)?",this.graf],
}
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index 3502c2e9..79d741a3 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -37,8 +37,8 @@ function CANIMXY() {
clrs:["color (>0) or mark (<0)",this.clrs],
siz:["line or mark size",this.siz],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
xmin:["Xmin",this.xmin],
xmax:["Xmax",this.xmax],
ymin:["Ymin",this.ymin],
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index a68ddeb6..ba90c709 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -34,15 +34,15 @@ function CANIMXY3D() {
CANIMXY3D.prototype.get = function CANIMXY3D() {
var options = {
nbr_curves:["Number of curves",this.nbr_curves],
- clrs:["color (>0) or mark (<0)",this.clrs],
- siz:["line or mark size",this.siz],
+ clrs:["color (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
+ siz:["line or mark size",this.siz.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
- vec_x:["Xmin and Xmax",this.vec_x],
- vec_y:["Ymin and Ymax",this.vec_y],
- vec_z:["Zmin and Zmax",this.vec_z],
- param3ds:["Alpha and Theta",this.param3ds],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
+ vec_x:["Xmin and Xmax",this.vec_x.toString().replace(/,/g," ")],
+ vec_y:["Ymin and Ymax",this.vec_y.toString().replace(/,/g," ")],
+ vec_z:["Zmin and Zmax",this.vec_z.toString().replace(/,/g," ")],
+ param3ds:["Alpha and Theta",this.param3ds.toString().replace(/,/g," ")],
N:["Buffer size",this.N],
}
return options;
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index c69e296c..9dcd508f 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -25,10 +25,10 @@ function CEVENTSCOPE() {
CEVENTSCOPE.prototype.get = function CEVENTSCOPE() {
var options = {
nclock:["Number of event inputs",this.nclock],
- clrs:["colors c (>0) or mark (<0)",this.clrs],
+ clrs:["colors c (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
per:["Refresh period",this.per],
}
return options;
diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js
index b20b44d9..d30e6601 100644
--- a/js/Sinks/CFSCOPE.js
+++ b/js/Sinks/CFSCOPE.js
@@ -26,10 +26,10 @@ function CFSCOPE() {
}
CFSCOPE.prototype.get = function CFSCOPE() {
var options = {
- clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs],
+ clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
ymin:["Ymin",this.ymin],
ymax:["Ymax",this.ymax],
per:["Refresh period",this.per],
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index d005be05..f3115496 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -32,14 +32,14 @@ function CMSCOPE() {
}
CMSCOPE.prototype.get = function CMSCOPE() {
var options = {
- in1:["Input ports sizes",this.in1],
- clrs:["Drawing colors (>0) or mark (<0)",this.clrs],
+ in1:["Input ports sizes",this.in1.toString().replace(/,/g," ")],
+ clrs:["Drawing colors (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
- ymin:["Ymin vector",this.ymin],
- ymax:["Ymax vector",this.ymax],
- per:["Refresh period",this.per],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
+ ymin:["Ymin vector",this.ymin.toString().replace(/,/g," ")],
+ ymax:["Ymax vector",this.ymax.toString().replace(/,/g," ")],
+ per:["Refresh period",this.per.toString().replace(/,/g," ")],
N:["Buffer size",this.N],
heritance:["Accept herited events 0/1",this.heritance],
nom:["Name of Scope (label&Id)",this.nom],
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 82bd20c3..43549e3b 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -28,10 +28,10 @@ function CSCOPE() {
}
CSCOPE.prototype.get = function CSCOPE() {
var options = {
- clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs],
+ clrs:["Color (>0) or mark (<0) vector (8 entries)",this.clrs.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
ymin:["Ymin",this.ymin],
ymax:["Ymax",this.ymax],
per:["Refresh period",this.per],
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index e07d4078..2c7d2606 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -36,8 +36,8 @@ function CSCOPXY() {
clrs:["color (>0) or mark (<0)",this.clrs],
siz:["line or mark size",this.siz],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
xmin:["Xmin",this.xmin],
xmax:["Xmax",this.xmax],
ymin:["Ymin",this.ymin],
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index f24d67cb..7f8075d7 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -33,15 +33,15 @@ function CSCOPXY3D() {
CSCOPXY3D.prototype.get = function CSCOPXY3D() {
var options = {
nbr_curves:["Number of curves",this.nbr_curves],
- clrs:["color (>0) or mark (<0)",this.clrs],
- siz:["Line or Mark Size",this.siz],
+ clrs:["color (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")],
+ siz:["Line or Mark Size",this.siz.toString().replace(/,/g," ")],
win:["Output window number (-1 for automatic)",this.win],
- wpos:["Output window position",this.wpos],
- wdim:["Output window sizes",this.wdim],
- vec_x:["Xmin and Xmax",this.vec_x],
- vec_y:["Ymin and Ymax",this.vec_y],
- vec_z:["Zmin and Zmax",this.vec_z],
- param3ds:["Alpha and Theta",this.param3ds],
+ wpos:["Output window position",this.wpos.toString().replace(/,/g," ")],
+ wdim:["Output window sizes",this.wdim.toString().replace(/,/g," ")],
+ vec_x:["Xmin and Xmax",this.vec_x.toString().replace(/,/g," ")],
+ vec_y:["Ymin and Ymax",this.vec_y.toString().replace(/,/g," ")],
+ vec_z:["Zmin and Zmax",this.vec_z.toString().replace(/,/g," ")],
+ param3ds:["Alpha and Theta",this.param3ds.toString().replace(/,/g," ")],
N:["Buffer size",this.N],
}
return options;
diff --git a/sci2jsyacc.py b/sci2jsyacc.py
index 9ae05e1f..4bf1d9a2 100755
--- a/sci2jsyacc.py
+++ b/sci2jsyacc.py
@@ -506,7 +506,11 @@ def p_getvalueassignment_getvalue_arguments(p):
parsecall = 'arguments[%d][\"%s\"]' % (0, basevar)
SET_BLOCK += "%*s%s = %s\n" % (2 * INDENT_SIZE, ' ', var, parsecall)
if idx < len(LABELS):
- OPTIONS_BLOCK += '%*s%s:[%s,%s],\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', basevar, LABELS[idx], var)
+ if vartype == MATRIX_TYPE:
+ showvar = var + '.toString().replace(/,/g," ")'
+ else:
+ showvar = var
+ OPTIONS_BLOCK += '%*s%s:[%s,%s],\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', basevar, LABELS[idx], showvar)
idx += 1
def p_getvaluearguments_arg1_arg2_arg3_arg4(p):