summaryrefslogtreecommitdiff
path: root/js/Sources
diff options
context:
space:
mode:
Diffstat (limited to 'js/Sources')
-rw-r--r--js/Sources/CURVE_c.js13
-rw-r--r--js/Sources/GENSQR_f.js3
-rw-r--r--js/Sources/GEN_SQR.js1
-rw-r--r--js/Sources/PULSE_SC.js3
-rw-r--r--js/Sources/RAND_m.js81
-rw-r--r--js/Sources/READC_f.js2
-rw-r--r--js/Sources/STEP_FUNCTION.js4
-rw-r--r--js/Sources/Sigbuilder.js1
8 files changed, 83 insertions, 25 deletions
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index b4cb289f..f48c2832 100644
--- a/js/Sources/CURVE_c.js
+++ b/js/Sources/CURVE_c.js
@@ -1,23 +1,10 @@
Syntax error in input LexToken(COMMA,',',1,3703)
Syntax error in input LexToken(VAR,'ixy',1,6611)
-Syntax error in input LexToken(VAR,'deff',1,6750)
-Syntax error in input LexToken(VAR,'xmx',1,9076)
-Syntax error in input LexToken(VAR,'f',1,9444)
-Syntax error in input LexToken(VAR,'menu_r',1,9467)
-Syntax error in input LexToken(VAR,'drawlater',1,10875)
-Syntax error in input LexToken(VAR,'lines',1,11427)
-Syntax error in input LexToken(CASE,'case',1,13702)
-Syntax error in input LexToken(IF,'if',1,23303)
-Syntax error in input LexToken(END,'end',1,24929)
Syntax error in input LexToken(VAR,'a',1,25132)
Syntax error in input LexToken(VAR,'a',1,26313)
Syntax error in input LexToken(VAR,'a',1,27400)
-Syntax error in input LexToken(VAR,'ymx1',1,27562)
-Syntax error in input LexToken(VAR,'XMX',1,27754)
Syntax error in input LexToken(CLOSEBRACKET,')',1,28162)
-Syntax error in input LexToken(VAR,'lx11',1,30443)
Syntax error in input LexToken(VAR,'xye',1,32329)
-Syntax error in input LexToken(FOR,'for',1,32529)
Syntax error in input LexToken(VAR,'a',1,33109)
Syntax error in input LexToken(VAR,'order',1,33486)
Syntax error in input LexToken(CLOSEBRACKET,')',1,33946)
diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js
index f8f70525..db97a300 100644
--- a/js/Sources/GENSQR_f.js
+++ b/js/Sources/GENSQR_f.js
@@ -11,7 +11,8 @@ if (size(exprs,"*")==2) {
exprs=exprs(2);
}
while (true) {
-[ok,Amplitude,exprs]=scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),exprs);
+[ok,Amplitude,exprs]=scicos_getvalue([
+ "Set Square generator block parameters"],["Amplitude"],list("vec",1),exprs);
if (!ok) {
break
}
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index e7bf74fc..eea33f2a 100644
--- a/js/Sources/GEN_SQR.js
+++ b/js/Sources/GEN_SQR.js
@@ -1,4 +1,3 @@
Syntax error in input LexToken(SCICOS_CONTEXT,'scicos_context',1,1457)
-Syntax error in input None
/* autogenerated from "macros/Sources/GEN_SQR.sci" */
None
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index b5168b9f..bc19ab77 100644
--- a/js/Sources/PULSE_SC.js
+++ b/js/Sources/PULSE_SC.js
@@ -1,4 +1,3 @@
-Syntax error in input LexToken(CLOSESQBRACKET,']',1,1395)
-Syntax error in input None
+Syntax error in input LexToken(SCICOS_CONTEXT,'scicos_context',1,1406)
/* autogenerated from "macros/Sources/PULSE_SC.sci" */
None
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index daa52675..4a6515bf 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -1,3 +1,80 @@
-Syntax error in input LexToken(CLOSESQBRACKET,']',1,1602)
/* autogenerated from "macros/Sources/RAND_m.sci" */
-None
+function RAND_m() {
+RAND_m.prototype.get = function RAND_m() {
+}
+RAND_m.prototype.set = function RAND_m() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+if (size(exprs,"*")==14) {
+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
+}
+if (flag!=0&&flag!=1) {
+message("flag must be equal to 1 or 0");
+} else {
+out=size(a);
+if (typ==1) {
+function_name="rndblk_m";
+model.rpar=[real(a.slice()),real(b.slice())];
+model.dstate=[seed_c(1),0*real(a.slice())];
+ot=1;
+} else if (typ==2) {
+function_name="rndblkz_m";
+ot=2;
+model.rpar=[real(a.slice()),imag(a.slice()),real(b.slice()),imag(b.slice())];
+model.dstate=[seed_c.slice(),0*[real(a.slice()),imag(a.slice())]];
+} else {
+message("Datatype is not supported");
+ok=None;
+}
+if (ok) {
+[model,graphics,ok]=set_io(model,graphics,list([],[]),list(out,ot),1,[]);
+if (ok) {
+model.sim=list(function_name,4);
+graphics.exprs=exprs;
+model.ipar=flag;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+}
+RAND_m.prototype.define = function RAND_m() {
+a=0;
+b=1;
+dt=0;
+flag=0;
+function_name="rndblk_m";
+funtyp=4;
+model=scicos_model();
+model.sim=list(function_name,funtyp);
+model.in=[];
+model.in2=[];
+model.intyp=[];
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.evtin=1;
+model.evtout=[];
+model.state=[];
+model.dstate=[int(rand()*(10^7-1)),0*a.slice()];
+model.rpar=[a.slice(),b.slice()];
+model.ipar=flag;
+model.blocktype="d";
+model.firing=[];
+model.dep_ut=[None,None];
+exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+RAND_m.prototype.details = function RAND_m() {
+}
+}
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index aeff85c7..eafac6be 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -16,7 +16,7 @@ lunit=dstate(3);
fname=exprs(3);
frmt=exprs(4);
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);
+[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
}
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index 9a06f407..2e0d3006 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -1,7 +1,3 @@
Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4227)
-Syntax error in input LexToken(VAR,'blk',1,4437)
-Syntax error in input LexToken(VAR,'blk',1,4784)
-Syntax error in input LexToken(VAR,'lnk',1,5142)
-Syntax error in input LexToken(VAR,'lnk',1,5285)
/* autogenerated from "macros/Sources/STEP_FUNCTION.sci" */
None
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 8b22d600..1f9d70dd 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -2,6 +2,5 @@ Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4459)
Syntax error in input LexToken(VAR,'N',1,10287)
Syntax error in input LexToken(VAR,'order',1,12980)
Syntax error in input LexToken(VAR,'x',1,13322)
-Syntax error in input None
/* autogenerated from "macros/Sources/Sigbuilder.sci" */
None