summaryrefslogtreecommitdiff
path: root/js/Sources
diff options
context:
space:
mode:
authorSunil Shetye2018-06-18 17:30:31 +0530
committerSunil Shetye2018-06-18 20:30:18 +0530
commitcd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (patch)
tree56407047bba37f94b7b5f00890b4385cefa502fd /js/Sources
parent0fd33c776a03e3b9ad2267e4f3fbb2c7bcbbb92a (diff)
downloadsci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.tar.gz
sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.tar.bz2
sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.zip
use format string
Diffstat (limited to 'js/Sources')
-rw-r--r--js/Sources/CLKINV_f.js4
-rw-r--r--js/Sources/CLKIN_f.js4
-rw-r--r--js/Sources/CLOCK_c.js6
-rw-r--r--js/Sources/CLOCK_f.js6
-rw-r--r--js/Sources/CONST.js4
-rw-r--r--js/Sources/CONST_f.js4
-rw-r--r--js/Sources/CONST_m.js4
-rw-r--r--js/Sources/CURV_f.js4
-rw-r--r--js/Sources/Counter.js4
-rw-r--r--js/Sources/FROMWSB.js2
-rw-r--r--js/Sources/FROMWS_c.js4
-rw-r--r--js/Sources/GENSIN_f.js4
-rw-r--r--js/Sources/GENSQR_f.js4
-rw-r--r--js/Sources/INIMPL_f.js4
-rw-r--r--js/Sources/IN_f.js4
-rw-r--r--js/Sources/Modulo_Count.js4
-rw-r--r--js/Sources/RAMP.js4
-rw-r--r--js/Sources/RAND_f.js4
-rw-r--r--js/Sources/RAND_m.js4
-rw-r--r--js/Sources/READAU_f.js4
-rw-r--r--js/Sources/READC_f.js4
-rw-r--r--js/Sources/STEP.js4
-rw-r--r--js/Sources/SampleCLK.js4
23 files changed, 47 insertions, 47 deletions
diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index a6b50a9e..4df43fbc 100644
--- a/js/Sources/CLKINV_f.js
+++ b/js/Sources/CLKINV_f.js
@@ -27,7 +27,7 @@ while (true) {
[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLKINV_f")," ",gettext("Event input port")," "],"Port Number",list("vec",1),exprs);
prt=int(prt);
if (!ok) {
-break
+break;
}
if (prt<=0) {
block_parameter_error(msprintf(gettext("Wrong values for \'Port Number\' parameter: %d."),prt),gettext("Strictly positive integer expected."));
@@ -38,7 +38,7 @@ model.firing=-1;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js
index 2d898db4..90fe3204 100644
--- a/js/Sources/CLKIN_f.js
+++ b/js/Sources/CLKIN_f.js
@@ -26,7 +26,7 @@ while (true) {
[ok,prt,exprs]=scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),exprs);
prt=int(prt);
if (!ok) {
-break
+break;
}
if (prt<=0) {
message("Port number must be a positive integer");
@@ -37,7 +37,7 @@ model.firing=-1;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 66bd3151..965065ee 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -50,7 +50,7 @@ for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
o=arg1.model.rpar.objs(i);
if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") {
path=i;
-break
+break;
}
}
newpar=list();
@@ -63,7 +63,7 @@ model_n=model;
while (true) {
[ok,dt,t0,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CLOCK_c")," ",gettext("Event clock generator")," ",gettext("&nbsp; Do not start if \'Initialisation Time\' is negative")," "],[gettext("Period"),gettext("Initialisation Time")],list("vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (dt<=0) {
block_parameter_error(msprintf(gettext("Wrong values for \'%s\' parameter: %5.1e."),gettext("Period"),dt),gettext("Strictly positive number expected."));
@@ -75,7 +75,7 @@ model.rpar=[dt,t0];
model.firing=t0;
xx.model=model;
arg1.model.rpar.objs[path-1]=xx;
-break
+break;
}
}
if (!and([t0_old,dt_old]==[t0,dt])) {
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 6ee77870..1f93396e 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -50,7 +50,7 @@ for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
o=arg1.model.rpar.objs(i);
if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
path=i;
-break
+break;
}
}
newpar=list();
@@ -63,7 +63,7 @@ model_n=model;
while (true) {
[ok,dt,t0,exprs0]=scicos_getvalue("Set Clock block parameters",["Period","Init time"],list("vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (dt<=0) {
message("period must be positive");
@@ -75,7 +75,7 @@ model.rpar=dt;
model.firing=t0;
xx.model=model;
arg1.model.rpar.objs[path-1]=xx;
-break
+break;
}
}
if (!and([t0_old,dt_old]==[t0,dt])||!and(exprs0==exprs)) {
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 6bc8ec85..096e96f7 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -25,7 +25,7 @@ model=arg1.model;
while (true) {
[ok,C,exprs]=scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs);
if (!ok) {
-break
+break;
}
sz=size(C);
nout=size(C,"*");
@@ -39,7 +39,7 @@ model.out=nout;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index bba535ca..ade7e3f2 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -25,7 +25,7 @@ model=arg1.model;
while (true) {
[ok,C,exprs]=scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs);
if (!ok) {
-break
+break;
}
nout=size(C,"*");
if (nout==0) {
@@ -36,7 +36,7 @@ model.out=nout;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index 627d575b..a9b5f167 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -28,7 +28,7 @@ model=arg1.model;
while (true) {
[ok,C,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CONST_m")," ",gettext("Constant value generator")," "],gettext("Constant Value"),list("vec",-1),exprs);
if (!ok) {
-break
+break;
}
nout=size(C);
if (find(nout==0)!=[]) {
@@ -64,7 +64,7 @@ model.rpar=[];
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index cae00f0b..1928e6ff 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -40,7 +40,7 @@ if (!or(fun=="do_eval")) {
ok=true;
}
if (!ok) {
-break
+break;
}
n=size(xx,"*");
if (or(xx.slice(2-1,n)-xx.slice(1-1,n-1)<0)) {
@@ -56,7 +56,7 @@ axisdata=gc(2);
model.ipar=[size(xx,"*"),axisdata.slice()];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js
index 54e908e2..a99324b4 100644
--- a/js/Sources/Counter.js
+++ b/js/Sources/Counter.js
@@ -29,7 +29,7 @@ model=arg1.model;
while (true) {
[ok,minim,maxim,rule,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"Counter")," ",gettext("Integer counter generator")," "],[gettext("Minimum"),gettext("Maximum"),gettext("Rule (1:Increment, 2:Decrement)")],list("vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
maxim=int(maxim);
minim=int(minim);
@@ -43,7 +43,7 @@ model.dstate=0;
model.ipar=[rule,maxim,minim];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index a78ad867..44e7a21d 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -19,7 +19,7 @@ for (i=1;i<=length(arg1.model.rpar.objs);i+=1) {
o=arg1.model.rpar.objs(i);
if (typeof(o)=="Block"&&o.gui=="FROMWS_c") {
ppath=list(i);
-break
+break;
}
}
newpar=list();
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index ac393ada..1d4942d7 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -32,7 +32,7 @@ model=arg1.model;
while (true) {
[ok,varnam,Method,ZC,OutEnd,exprs]=scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (!(Method==0||Method==1||Method==2||Method==3)) {
message("Interpolation method should be chosen in [0,1,2,3]");
@@ -59,7 +59,7 @@ if (ok) {
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index 78209268..8a44696d 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -27,7 +27,7 @@ model=arg1.model;
while (true) {
[ok,M,F,P,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"GENSIN_f")," ",gettext("Sine wave generator")," "],[gettext("Magnitude"),gettext("Frequency (rad/s)"),gettext("Phase (rad)")],list("vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (F<0) {
block_parameter_error(msprintf(gettext("Wrong value for \'Frequency\' parameter: %e."),F),gettext("Strictly positive integer expected."));
@@ -41,7 +41,7 @@ model.outtyp=1;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js
index 1071e2b9..0584ccb7 100644
--- a/js/Sources/GENSQR_f.js
+++ b/js/Sources/GENSQR_f.js
@@ -30,7 +30,7 @@ exprs=exprs[2-1];
while (true) {
[ok,Amplitude,exprs]=scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),exprs);
if (!ok) {
-break
+break;
}
graphics.exprs=exprs;
model.dstate=Amplitude;
@@ -38,7 +38,7 @@ model.out2=1;
model.outtyp=1;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index 58d6da2f..ebc345f8 100644
--- a/js/Sources/INIMPL_f.js
+++ b/js/Sources/INIMPL_f.js
@@ -33,7 +33,7 @@ exprs=exprs[1-1];
while (true) {
[ok,prt,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"INIMPL_f")," ",gettext("Implicit input port")," "],"Port Number",list("vec",1),exprs);
if (!ok) {
-break
+break;
}
prt=int(prt);
if (prt<=0) {
@@ -47,7 +47,7 @@ model.ipar=prt;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index 83eddca8..15ce1952 100644
--- a/js/Sources/IN_f.js
+++ b/js/Sources/IN_f.js
@@ -32,7 +32,7 @@ exprs=[exprs[1-1],"[-1 -2]","-1"];
while (true) {
[ok,prt,otsz,ot,exprs]=getvalue(_("Set Input block parameters"),[_("Port number"),_("Outport size ([-1 -2] for inherit)"),_("Outport Type (-1 for inherit)")],list("vec",1,"vec",-1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
prt=int(prt);
if (prt<=0) {
@@ -54,7 +54,7 @@ model.outtyp=ot;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js
index 80d30c6f..d3868690 100644
--- a/js/Sources/Modulo_Count.js
+++ b/js/Sources/Modulo_Count.js
@@ -29,7 +29,7 @@ while (true) {
ini_c=int(ini_c);
base=int(base);
if (!ok) {
-break
+break;
}
if (ini_c<0) {
block_parameter_error(msprintf(gettext("Wrong value for \'Initial State\' parameter: %d."),ini_c),gettext("Null or positive integer expected."));
@@ -41,7 +41,7 @@ model.ipar=base;
model.dstate=ini_c;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index 0e5bc370..11110c6e 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -30,7 +30,7 @@ model=arg1.model;
while (true) {
[ok,slope,stt,iout,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"RAMP")," ",gettext("Ramp function")," "],[gettext("Slope"),gettext("Start Time"),gettext("Initial Value")],list("vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (stt<0) {
block_parameter_error(msprintf(gettext("Wrong value for \'Start Time\' parameter: %e."),stt),gettext("Null or positive integer expected."));
@@ -39,7 +39,7 @@ model.rpar=[slope,stt,iout];
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index ae6bf23b..246d9e01 100644
--- a/js/Sources/RAND_f.js
+++ b/js/Sources/RAND_f.js
@@ -37,7 +37,7 @@ exprs=[exprs,string(model.dstate(1))];
while (true) {
[ok,flag,a,b,seed_c,exprs]=scicos_getvalue(["Set Random generator block parameters","flag = 0 : Uniform distribution A is min and A+B max","flag = 1 : Normal distribution A is mean and B deviation"," ","A and B must be vector with equal sizes","seed is the seed of random number generator (integer<2**31)"],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs);
if (!ok) {
-break
+break;
}
if (flag!=0&&flag!=1) {
message("flag must be equal to 1 or 0");
@@ -50,7 +50,7 @@ model.rpar=[a.slice(),b.slice()];
model.dstate=[seed_c,0*a.slice()];
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index 039aedcf..f1559e7b 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -43,7 +43,7 @@ exprs[9-1]=[];
while (true) {
[ok,typ,flag,a,b,seed_c,exprs]=scicos_getvalue(["Set Random generator block parameters","flag = 0 : Uniform distribution A is min and A+B max","flag = 1 : Normal distribution A is mean and B deviation"," ","A and B must be matrix with equal sizes"],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs);
if (!ok) {
-break
+break;
}
if (flag!=0&&flag!=1) {
message("flag must be equal to 1 or 0");
@@ -71,7 +71,7 @@ graphics.exprs=exprs;
model.ipar=flag;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index a0171f15..8ad32b6a 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -48,7 +48,7 @@ frmt1="uc";
M=1;
offset=1;
if (!ok) {
-break
+break;
}
fname1=stripblanks(fname1);
frmt1=stripblanks(frmt1);
@@ -75,7 +75,7 @@ model.ipar=ipar;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index fb30dabc..7455a98e 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -48,7 +48,7 @@ frmt=exprs[4-1];
while (true) {
[ok,tmask1,outmask,fname1,frmt1,M,N,offset,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"READC_f")," ",gettext("Read from C binary file")],[gettext("Time Record Selection"),gettext("Outputs Record Selection"),gettext("Input File Name"),gettext("Input Format"),gettext("Record Size"),gettext("Buffer Size"),gettext("Initial Record Index"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
fname1=pathconvert(stripblanks(fname1),false,true);
frmt1=stripblanks(frmt1);
@@ -109,7 +109,7 @@ model.ipar=ipar;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index c3c6533d..1ad4aeff 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -29,7 +29,7 @@ model=arg1.model;
while (true) {
[ok,temps,in1,fi,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"STEP_FUNCTION")," ",gettext("Step Function")," "],[gettext("Step Time"),gettext("Initial Value"),gettext("Final Value")],list("vec",1,"vec",-1,"vec",-1),exprs);
if (!ok) {
-break
+break;
}
in1=in1.slice();
fi=fi.slice();
@@ -59,7 +59,7 @@ model.rpar=rpar;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
}
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index a11e1d34..8c4b04c9 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -23,7 +23,7 @@ exprs=graphics.exprs;
while (true) {
[ok,frequ,offset,exprs]=scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs);
if (!ok) {
-break
+break;
}
if (frequ<0) {
message("Frequency must be a positif number");
@@ -44,7 +44,7 @@ model.firing=-1;
graphics.exprs=exprs;
x.graphics=graphics;
x.model=model;
-break
+break;
}
}
needcompile=resume(needcompile)