add spacing to end of block also

1 files changed, 56 insertions, 55 deletions

diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index 3f896eaf..a797b764 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -22,71 +22,72 @@ function SUBMAT() {
         model.dep_ut = [true,false];
         label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]];
         gr_i = [];
-        x = standard_define([2.5,2],model,label,gr_i);
+        this.x = standard_define([2.5,2],model,label,gr_i);
     }
     SUBMAT.prototype.details = function SUBMAT() {
+        return this.x;
     }
     SUBMAT.prototype.get = function SUBMAT() {
     }
     SUBMAT.prototype.set = function SUBMAT() {
-        x = arg1;
+        this.x = arg1;
         graphics = arg1.graphics;
         label = graphics.exprs;
         model = arg1.model;
         if (size(label,"*")==5) {
-        label[6-1] = sci2exp([1,1]);
-}
+            label[6-1] = sci2exp([1,1]);
+        }
         while (true) {
-        [ok,typ,a,b,c,d,inp,exprs] = scicos_getvalue("Set SUBMAT Block",[["Datatype (1=real double  2=Complex)"],["Starting Row Index"],["Ending Row Index"],["Starting Column Index"],["Ending Column Index"],["Input Dimensions"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label);
-        if (!ok) {
-break;
-}
-        if ((typ==1)) {
-        function_name = "submat";
-        ot = 1;
-        it = 1;
-        } else if ((typ==2)) {
-        function_name = "submatz";
-        ot = 2;
-        it = 2;
-        } else {
-message("Datatype is not supported");
-        ok = false;
-}
-        if ((a<=0)||(b<=0)||(c<=0)||(d<=0)) {
-message("invalid index");
-        ok = false;
-}
-        if (b<a) {
-message("ending row must be greater than starting row");
-        ok = false;
-}
-        if (d<c) {
-message("ending column must be greater than starting column");
-        ok = false;
-}
-        if (b>inp[1-1]) {
-message("index of ending row is out of range");
-        ok = false;
-}
-        if (d>inp[2-1]) {
-message("index of ending column is out of range");
-        ok = false;
-}
-        model.ipar = [[a],[b],[c],[d]];
-        in1 = [inp[1-1],inp[2-1]];
-        out = [(b-a)+1,(d-c)+1];
-        funtyp = 4;
-        label = exprs;
-        if (ok) {
-        [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
-        model.sim = list(function_name,funtyp);
-        graphics.exprs = label;
-        arg1.graphics = graphics;
-        arg1.model = model;
-        x = arg1;
-break;
-}
-}
+            [ok,typ,a,b,c,d,inp,exprs] = scicos_getvalue("Set SUBMAT Block",[["Datatype (1=real double  2=Complex)"],["Starting Row Index"],["Ending Row Index"],["Starting Column Index"],["Ending Column Index"],["Input Dimensions"]],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label);
+            if (!ok) {
+                break;
+            }
+            if ((typ==1)) {
+                function_name = "submat";
+                ot = 1;
+                it = 1;
+            } else if ((typ==2)) {
+                function_name = "submatz";
+                ot = 2;
+                it = 2;
+            } else {
+                message("Datatype is not supported");
+                ok = false;
+            }
+            if ((a<=0)||(b<=0)||(c<=0)||(d<=0)) {
+                message("invalid index");
+                ok = false;
+            }
+            if (b<a) {
+                message("ending row must be greater than starting row");
+                ok = false;
+            }
+            if (d<c) {
+                message("ending column must be greater than starting column");
+                ok = false;
+            }
+            if (b>inp[1-1]) {
+                message("index of ending row is out of range");
+                ok = false;
+            }
+            if (d>inp[2-1]) {
+                message("index of ending column is out of range");
+                ok = false;
+            }
+            model.ipar = [[a],[b],[c],[d]];
+            in1 = [inp[1-1],inp[2-1]];
+            out = [(b-a)+1,(d-c)+1];
+            funtyp = 4;
+            label = exprs;
+            if (ok) {
+                [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+                model.sim = list(function_name,funtyp);
+                graphics.exprs = label;
+                arg1.graphics = graphics;
+                arg1.model = model;
+                this.x = arg1;
+                break;
+            }
+        }
     }
 }