diff options
Diffstat (limited to 'js/Sinks')
-rw-r--r-- | js/Sinks/AFFICH_m.js | 2 | ||||
-rw-r--r-- | js/Sinks/BARXY.js | 1 | ||||
-rw-r--r-- | js/Sinks/CANIMXY.js | 1 | ||||
-rw-r--r-- | js/Sinks/CANIMXY3D.js | 1 | ||||
-rw-r--r-- | js/Sinks/CEVENTSCOPE.js | 1 | ||||
-rw-r--r-- | js/Sinks/CFSCOPE.js | 1 | ||||
-rw-r--r-- | js/Sinks/CLKOUT_f.js | 1 | ||||
-rw-r--r-- | js/Sinks/CMAT3D.js | 1 | ||||
-rw-r--r-- | js/Sinks/CMATVIEW.js | 1 | ||||
-rw-r--r-- | js/Sinks/CMSCOPE.js | 1 | ||||
-rw-r--r-- | js/Sinks/CSCOPE.js | 1 | ||||
-rw-r--r-- | js/Sinks/CSCOPXY.js | 1 | ||||
-rw-r--r-- | js/Sinks/CSCOPXY3D.js | 1 | ||||
-rw-r--r-- | js/Sinks/TOWS_c.js | 2 |
14 files changed, 16 insertions, 0 deletions
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 5a202dce..a71d6f4b 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -71,6 +71,7 @@ function AFFICH_m() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (!or(this.herit==[0,1])) { var mess = [[mess],["Accept inherited values are 0 and 1"],[" "]]; @@ -78,6 +79,7 @@ function AFFICH_m() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 5b38001c..286427e9 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -61,6 +61,7 @@ function BARXY() { } if (!ok) { message(mess); + throw "user error"; } else { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.thickness]); diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index a1b3725c..751536ff 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -100,6 +100,7 @@ function CANIMXY() { } if (!ok) { message(mess); + throw "user error"; } else { var in1 = this.nbr_curves*ones(2,1); var in2 = ones(2,1); diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 5fece779..28eaf761 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -116,6 +116,7 @@ function CANIMXY3D() { } if (!ok) { message(mess); + throw "user error"; } else { var in1 = this.nbr_curves*ones(3,1); var in2 = ones(3,1); diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 754e01c7..44261885 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -81,6 +81,7 @@ function CEVENTSCOPE() { var ok = tmpvar0[2]; } else { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { if (this.wpos==[]) { diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 1fefd8a9..57294d55 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -85,6 +85,7 @@ function CFSCOPE() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { if (this.wpos==[]) { diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index b34740b1..96212275 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -31,6 +31,7 @@ function CLKOUT_f() { this.prt = int(this.prt); if (this.prt<=0) { message("Port number must be a positive integer"); + throw "user error"; } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 03a680fa..5656b99c 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -60,6 +60,7 @@ function CMAT3D() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { var size_x = size(this.vec_x,"*"); diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 0b59f5e7..d6abdde1 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -50,6 +50,7 @@ function CMATVIEW() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { var size_c = size(this.colormap.slice(),1); diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index b5028549..97e72111 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -113,6 +113,7 @@ function CMSCOPE() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { this.in1 = this.in1.slice(); diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index bcd9682f..2ffc3747 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -89,6 +89,7 @@ function CSCOPE() { } if (!ok) { message([["Some specified values are inconsistent:"],[" "],[mess]]); + throw "user error"; } if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]); diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index bf831be0..ae81af95 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -99,6 +99,7 @@ function CSCOPXY() { } if (!ok) { message(mess); + throw "user error"; } else { var in1 = this.nbr_curves*ones(2,1); var in2 = ones(2,1); diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 8bc5bbe2..a988d1aa 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -133,6 +133,7 @@ function CSCOPXY3D() { break; } else { message(mess); + throw "user error"; } } return new BasicBlock(this.x); diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 614228ad..0f285c96 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -46,12 +46,14 @@ function TOWS_c() { } if ((this.nz<=0)) { message("Size of buffer must be positive"); + throw "user error"; var ok = false; } var r = false; var ierr = execstr("r = validvar(varnam)","errcatch"); if (!r||ierr!=0||length(this.varnam)>19) { message([["Invalid variable name."],["Please choose another variable name."]]); + throw "user error"; var ok = false; } execstr("if type("+this.varnam+") <> 17 | or(fieldnames("+this.varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch"); |