summaryrefslogtreecommitdiff
path: root/js/Sinks/CMAT3D.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/Sinks/CMAT3D.js')
-rw-r--r--js/Sinks/CMAT3D.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index eb6e8e42..61bbdb86 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -19,9 +19,9 @@ function CMAT3D() {
this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabDouble([true,false]);
- var exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]];
- var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,exprs,gr_i);
+ this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]];
+ this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]);
+ this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
CMAT3D.prototype.details = function CMAT3D() {
@@ -43,12 +43,13 @@ function CMAT3D() {
this.colormap = parseFloat(arguments[0]["colormap"])
this.cmin = parseFloat(arguments[0]["cmin"])
this.cmax = parseFloat(arguments[0]["cmax"])
+ this.exprs = arguments[0]["exprs"]
this.x = arg1;
this.graphics = arg1.graphics;
- var exprs = this.graphics.exprs;
+ this.exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
- [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs);
+ [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs);
if (!ok) {
break;
}
@@ -71,7 +72,7 @@ function CMAT3D() {
var rpar = [[this.colormap.slice()],[this.vec_x.slice()],[this.vec_y.slice()]];
this.model.ipar = new ScilabDouble(ipar);
this.model.rpar = new ScilabDouble(rpar);
- this.graphics.exprs = new ScilabDouble([exprs]);
+ this.graphics.exprs = new ScilabDouble([this.exprs]);
this.x.graphics = this.graphics;
this.x.model = this.model;
break;