1 files changed, 35 insertions, 34 deletions
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 44dcfcb4..a29a7e7a 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -5,7 +5,7 @@ function CMAT3D() {
         cmax = 100;
         colormap = this.jetcolormap[25-1];
         size_c = 25;
-        x = -1;
+        this.x = -1;
         y = -1;
         size_x = 1;
         size_y = 1;
@@ -16,51 +16,52 @@ function CMAT3D() {
         model.intyp = 1;
         model.evtin = 1;
         model.ipar = [[cmin],[cmax],[size_c],[size_x],[size_y]];
-        model.rpar = [[colormap.slice()],[x],[y]];
+        model.rpar = [[colormap.slice()],[this.x],[y]];
         model.blocktype = "c";
         model.dep_ut = [true,false];
-        exprs = [[strcat(string(x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]];
+        exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(cmin)],[string(cmax)]];
         gr_i = [];
-        x = standard_define([2,2],model,exprs,gr_i);
+        this.x = standard_define([2,2],model,exprs,gr_i);
     }
     CMAT3D.prototype.details = function CMAT3D() {
+        return this.x;
     }
     CMAT3D.prototype.get = function CMAT3D() {
     }
     CMAT3D.prototype.set = function CMAT3D() {
-        x = arg1;
+        this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
         model = arg1.model;
         while (true) {
-        [ok,vec_x,vec_y,colormap,cmin,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);
-        if (!ok) {
-break;
-}
-        mess = [];
-        if (size(vec_x,"*")!=size(vec_y,"*")) {
-        mess = [[mess],["Vector X and Vector Y must have the same size"],[" "]];
-        ok = false;
-}
-        if (cmax<=cmin) {
-        mess = [[mess],["Error with minimum and maximum value"],[" "]];
-        ok = false;
-}
-        if (!ok) {
-message([["Some specified values are inconsistent:"],[" "],[mess]]);
-}
-        if (ok) {
-        size_x = size(vec_x,"*");
-        size_c = size(colormap.slice(),1);
-        ipar = [[cmin],[cmax],[size_c],[size_x]];
-        rpar = [[colormap.slice()],[vec_x.slice()],[vec_y.slice()]];
-        model.ipar = ipar;
-        model.rpar = rpar;
-        graphics.exprs = exprs;
-        x.graphics = graphics;
-        x.model = model;
-break;
-}
-}
+            [ok,vec_x,vec_y,colormap,cmin,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);
+            if (!ok) {
+                break;
+            }
+            mess = [];
+            if (size(vec_x,"*")!=size(vec_y,"*")) {
+                mess = [[mess],["Vector X and Vector Y must have the same size"],[" "]];
+                ok = false;
+            }
+            if (cmax<=cmin) {
+                mess = [[mess],["Error with minimum and maximum value"],[" "]];
+                ok = false;
+            }
+            if (!ok) {
+                message([["Some specified values are inconsistent:"],[" "],[mess]]);
+            }
+            if (ok) {
+                size_x = size(vec_x,"*");
+                size_c = size(colormap.slice(),1);
+                ipar = [[cmin],[cmax],[size_c],[size_x]];
+                rpar = [[colormap.slice()],[vec_x.slice()],[vec_y.slice()]];
+                model.ipar = ipar;
+                model.rpar = rpar;
+                graphics.exprs = exprs;
+                this.x.graphics = graphics;
+                this.x.model = model;
+                break;
+            }
+        }
     }
 }