From 418020939ae049c5e3a9a04bb1b35e2226d87c33 Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Sat, 16 Jun 2018 01:15:39 +0530
Subject: replace in with in1
---
js/Sinks/AFFICH_m.js | 81 +++++++++++++++++++++++++++++++-
js/Sinks/BARXY.js | 2 +-
js/Sinks/CANIMXY.js | 2 +-
js/Sinks/CANIMXY3D.js | 2 +-
js/Sinks/CMAT3D.js | 2 +-
js/Sinks/CMATVIEW.js | 2 +-
js/Sinks/CMSCOPE.js | 127 +++++++++++++++++++++++++++++++++++++++++++++++++-
js/Sinks/CSCOPE.js | 2 +-
js/Sinks/CSCOPXY.js | 2 +-
js/Sinks/CSCOPXY3D.js | 2 +-
js/Sinks/OUTIMPL_f.js | 2 +-
js/Sinks/OUT_f.js | 2 +-
js/Sinks/TOWS_c.js | 2 +-
js/Sinks/TRASH_f.js | 2 +-
js/Sinks/WFILE_f.js | 2 +-
js/Sinks/WRITEAU_f.js | 4 +-
js/Sinks/WRITEC_f.js | 91 +++++++++++++++++++++++++++++++++++-
17 files changed, 308 insertions(+), 21 deletions(-)
(limited to 'js/Sinks')
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 3d8b1e11..acab657e 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -1,3 +1,80 @@
-Syntax error in input LexToken(IN,'in',1,1295)
/* autogenerated from "macros/Sinks/AFFICH_m.sci" */
-None
+function AFFICH_m() {
+AFFICH_m.prototype.get = function AFFICH_m() {
+}
+AFFICH_m.prototype.set = function AFFICH_m() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,in1,font,fontsize,colr,nt,nd,herit,exprs]=scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+mess=[];
+if (font<=0) {
+mess=[mess,"Font number must be positive"," "];
+ok=None;
+}
+if (fontsize<=0) {
+mess=[mess,"Font size must be positive"," "];
+ok=None;
+}
+if (nt<=3) {
+mess=[mess,"Total number of digits must be greater than 3"," "];
+ok=None;
+}
+if (nd<0) {
+mess=[mess,"Number of rational part digits must be ","greater or equal 0"," "];
+ok=None;
+}
+if (!ok) {
+message(["Some specified values are inconsistent:"," ",mess]);
+}
+if (!or(herit==[0,1])) {
+mess=[mess,"Accept inherited values are 0 and 1"," "];
+ok=None;
+}
+if (!ok) {
+message(["Some specified values are inconsistent:"," ",mess]);
+}
+if (ok) {
+[model,graphics,ok]=set_io(model,graphics,list(in1,1),list(),ones(1-herit,1),[]);
+}
+if (ok) {
+model.ipar=[font,fontsize,colr,nt,nd,in1(1,1)];
+model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
+model.evtin=ones(1-herit,1);
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+AFFICH_m.prototype.define = function AFFICH_m() {
+font=1;
+fontsize=1;
+colr=1;
+nt=5;
+nd=1;
+in1=[1,1];
+model=scicos_model();
+model.sim=list("affich2",4);
+model.in1=in1(1,1);
+model.in2=in1(1,2);
+model.evtin=1;
+model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)];
+model.ipar=[font,fontsize,colr,1000,nt,nd,in1(1,1)];
+model.blocktype="c";
+model.firing=[];
+model.dep_ut=[true,None];
+model.label="";
+exprs=[sci2exp([model.in1,model.in2]),string(font),string(fontsize),string(colr),string(nt),string(nd),string(0)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+AFFICH_m.prototype.details = function AFFICH_m() {
+}
+}
diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js
index c66f402c..6e8f6e5e 100644
--- a/js/Sinks/BARXY.js
+++ b/js/Sinks/BARXY.js
@@ -46,7 +46,7 @@ ymax=15;
model.sim=list("BARXY_sim",5);
model.blocktype="d";
model.dep_ut=[true,None];
-model.in=[-1,-1];
+model.in1=[-1,-1];
model.intyp=[1];
model.out=[];
model.evtin=[1];
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index a7c4918b..f74f7a51 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -82,7 +82,7 @@ ymax=+15;
nbr_curves=1;
model=scicos_model();
model.sim=list("canimxy",4);
-model.in=[1,1];
+model.in1=[1,1];
model.in2=[1,1];
model.intyp=[1,1];
model.evtin=1;
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index 76ecf4c4..870ee544 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -99,7 +99,7 @@ vec_z=[-15,15];
nbr_curves=1;
model=scicos_model();
model.sim=list("canimxy3d",4);
-model.in=[1,1,1];
+model.in1=[1,1,1];
model.evtin=1;
model.in2=[1,1,1];
model.intyp=[1,1,1];
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 8fd38b10..0d0d3501 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -49,7 +49,7 @@ size_x=1;
size_y=1;
model=scicos_model();
model.sim=list("cmat3d",4);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.evtin=1;
diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js
index a8940952..21a69763 100644
--- a/js/Sinks/CMATVIEW.js
+++ b/js/Sinks/CMATVIEW.js
@@ -45,7 +45,7 @@ alpha_c=0.24;
beta_c=1;
model=scicos_model();
model.sim=list("cmatview",4);
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=1;
model.evtin=1;
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index 77ce9ca4..55f1405d 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -1,3 +1,126 @@
-Syntax error in input LexToken(IN,'in',1,1125)
/* autogenerated from "macros/Sinks/CMSCOPE.sci" */
-None
+function CMSCOPE() {
+CMSCOPE.prototype.get = function CMSCOPE() {
+}
+CMSCOPE.prototype.set = function CMSCOPE() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,in1,clrs,win,wpos,wdim,ymin,ymax,per,N,heritance,nom,exprs]=scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),exprs);
+if (!ok) {
+break
+}
+mess=[];
+if (size(in1,"*")<=0) {
+mess=[mess,"Block must have at least one input port"," "];
+ok=None;
+}
+if (min(in1)<=0) {
+mess=[mess,"Port sizes must be positive"," "];
+ok=None;
+}
+if (size(clrs,"*")<sum(in1)) {
+mess=[mess,"Not enough colors defined (at least "+string(sum(in1))+")"," "];
+ok=None;
+}
+if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
+mess=[mess,"Window position must be [] or a 2 vector"," "];
+ok=None;
+}
+if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
+mess=[mess,"Window dim must be [] or a 2 vector"," "];
+ok=None;
+}
+if (win<-1) {
+mess=[mess,"Window number can\'t be < -1"," "];
+ok=None;
+}
+if (size(per,"*")!=size(ymin,"*")) {
+mess=[mess,"Size of Refresh Period must equal size of Ymin/Ymax vector"," "];
+ok=None;
+}
+for(i=1;i<=size(per,"*");i+=1) {
+if ((per(i)<=0)) {
+mess=[mess,"Refresh Period must be positive"," "];
+ok=None;
+}
+}
+if (N<2) {
+mess=[mess,"Buffer size must be at least 2"," "];
+ok=None;
+}
+if (or(ymin>=ymax)) {
+mess=[mess,"Ymax must be greater than Ymin"," "];
+ok=None;
+}
+if (!or(heritance==[0,1])) {
+mess=[mess,"Accept herited events must be 0 or 1"," "];
+ok=None;
+}
+if (!ok) {
+message(["Some specified values are inconsistent:"," ",mess]);
+}
+if (ok) {
+in1=in1.slice();
+a=size(in1,1);
+in2=ones(a,1);
+[model,graphics,ok]=set_io(model,graphics,list([in1,in2],ones(a,1)),list(),ones(1-heritance,1),[]);
+}
+if (ok) {
+if (wpos==[]) {
+wpos=[-1,-1];
+}
+if (wdim==[]) {
+wdim=[-1,-1];
+}
+if (ok) {
+period=transpose(per.slice());
+yy=[transpose(ymin.slice()),transpose(ymax.slice())];
+rpar=[0,period.slice(),yy.slice()];
+clrs=clrs.slice(1-1,sum(in1));
+ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(),heritance];
+model.evtin=ones(1-heritance,1);
+model.dstate=[];
+model.rpar=rpar;
+model.ipar=ipar;
+model.label=nom;
+graphics.id=nom;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+CMSCOPE.prototype.define = function CMSCOPE() {
+win=-1;
+in1=[1,1];
+wdim=[-1,-1];
+wpos=[-1,-1];
+clrs=[1,3,5,7,9,11,13,15];
+N=20;
+ymin=[-1,-5];
+ymax=[1,5];
+per=[30,30];
+yy=[transpose(ymin.slice()),transpose(ymax.slice())];
+period=transpose(per.slice());
+model=scicos_model();
+model.sim=list("cmscope",4);
+model.in1=in1;
+model.in2=[1,1];
+model.intyp=[1,1];
+model.evtin=1;
+model.rpar=[0,period.slice(),yy.slice()];
+model.ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(1-1,sum(in1))];
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[strcat(string(in1)," "),strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp([]),strcat(string(ymin)," "),strcat(string(ymax)," "),strcat(string(per)," "),string(N),string(0),emptystr()];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+CMSCOPE.prototype.details = function CMSCOPE() {
+}
+}
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 8c15def6..05f09246 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -79,7 +79,7 @@ ymax=+15;
per=30;
model=scicos_model();
model.sim=list("cscope",4);
-model.in=-1;
+model.in1=-1;
model.in2=1;
model.evtin=1;
model.rpar=[0,ymin,ymax,per];
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index bad9fe27..c252f25e 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -82,7 +82,7 @@ ymax=+15;
nbr_curves=1;
model=scicos_model();
model.sim=list("cscopxy",4);
-model.in=[1,1];
+model.in1=[1,1];
model.in2=[1,1];
model.intyp=[1,1];
model.evtin=1;
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 3f70274d..33c32b3b 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -95,7 +95,7 @@ vec_z=[-15,15];
nbr_curves=1;
model=scicos_model();
model.sim=list("cscopxy3d",4);
-model.in=[1,1,1];
+model.in1=[1,1,1];
model.in2=[1,1,1];
model.intyp=[1,1,1];
model.evtin=1;
diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js
index a0782193..3f2a583a 100644
--- a/js/Sinks/OUTIMPL_f.js
+++ b/js/Sinks/OUTIMPL_f.js
@@ -33,7 +33,7 @@ break
}
OUTIMPL_f.prototype.define = function OUTIMPL_f() {
model=scicos_model();
-model.in=[-1];
+model.in1=[-1];
model.in2=[1];
prt=1;
model.sim="outimpl";
diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js
index 06b5bc45..464dc045 100644
--- a/js/Sinks/OUT_f.js
+++ b/js/Sinks/OUT_f.js
@@ -32,7 +32,7 @@ n=-1;
prt=1;
model=scicos_model();
model.sim="output";
-model.in=-1;
+model.in1=-1;
model.in2=-2;
model.intyp=-1;
model.ipar=prt;
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 51e6a537..e6bd549a 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -45,7 +45,7 @@ varnam="A";
herit=0;
model=scicos_model();
model.sim=list("tows_c",4);
-model.in=[nu];
+model.in1=[nu];
model.in2=-2;
model.intyp=-1;
model.out=[];
diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js
index b148db59..3b950c21 100644
--- a/js/Sinks/TRASH_f.js
+++ b/js/Sinks/TRASH_f.js
@@ -9,7 +9,7 @@ TRASH_f.prototype.define = function TRASH_f() {
in1=-1;
model=scicos_model();
model.sim="trash";
-model.in=in1;
+model.in1=in1;
model.evtin=1;
model.blocktype="d";
model.dep_ut=[None,None];
diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js
index e18a8eb2..686e8e7e 100644
--- a/js/Sinks/WFILE_f.js
+++ b/js/Sinks/WFILE_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1569)
+Syntax error in input LexToken(CLOSEBRACKET,')',1,3595)
/* autogenerated from "macros/Sinks/WFILE_f.sci" */
None
diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js
index 175f7336..e3045356 100644
--- a/js/Sinks/WRITEAU_f.js
+++ b/js/Sinks/WRITEAU_f.js
@@ -34,7 +34,7 @@ ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)];
if (prod(size(dstate))!=(nin+1)*N+2) {
dstate=[-1,lunit,zeros((nin+1)*N,1)];
}
-model.in=1;
+model.in1=1;
model.dstate=dstate;
model.ipar=ipar;
graphics.exprs=exprs;
@@ -54,7 +54,7 @@ lunit=0;
N=2;
model=scicos_model();
model.sim=list("writeau",2);
-model.in=in1;
+model.in1=in1;
model.evtin=1;
model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js
index ae525585..5dcb16d6 100644
--- a/js/Sinks/WRITEC_f.js
+++ b/js/Sinks/WRITEC_f.js
@@ -1,3 +1,90 @@
-Syntax error in input LexToken(IN,'in',1,1280)
/* autogenerated from "macros/Sinks/WRITEC_f.sci" */
-None
+function WRITEC_f() {
+WRITEC_f.prototype.get = function WRITEC_f() {
+}
+WRITEC_f.prototype.set = function WRITEC_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+ipar=model.ipar;
+dstate=model.dstate;
+lunit=dstate(2);
+fname=exprs(2);
+frmt=exprs(3);
+while (true) {
+[ok,in1,fname1,frmt1,N,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"WRITEC_f")," ",gettext("Write to C binary file")],[gettext("Input Size"),gettext("Output File Name"),gettext("Output Format"),gettext("Buffer Size"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+in1=int(in1);
+nin=in1;
+fname1=pathconvert(stripblanks(fname1),None,true);
+frmt1=stripblanks(frmt1);
+fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"];
+if (and(frmt1!=fmts)) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("Valid formats are: "+strcat(fmts,", ")));
+ok=None;
+} else if (alreadyran&&fname1!=fname) {
+block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running"),gettext("Input Format")),gettext("End current simulation first."));
+ok=None;
+} else if (alreadyran&&N!=ipar(5)) {
+block_parameter_error(msprintf(gettext("You cannot modify \'Buffer Size\' when running."),gettext("Buffer Size")),gettext("End current simulation first"));
+ok=None;
+} else if (fname1=="") {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),gettext("You must provide a filename."));
+} else if (fileparts(fname1)!="") {
+[pa,fn,ex]=fileparts(fname1);
+if (!isdir(pa)) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa));
+ok=None;
+}
+} else if (N<1) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Strictly positive integer expected."));
+ok=None;
+} else if (in1<=0) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Size"),in1),gettext("Strictly positive integer expected."));
+ok=None;
+} else if (swap!=0&&swap!=1) {
+block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]"));
+ok=None;
+}
+frmt1=part(frmt1,1,3);
+if (ok) {
+ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)];
+if (prod(size(dstate))!=(nin+1)*N+2) {
+dstate=[-1,lunit,zeros((nin+1)*N,1)];
+}
+model.in1=nin;
+model.dstate=dstate;
+model.ipar=ipar;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+WRITEC_f.prototype.define = function WRITEC_f() {
+in1=1;
+nin=sum(in1);
+frmt="c ";
+fname="foo";
+swap=0;
+lunit=0;
+N=2;
+model=scicos_model();
+model.sim=list("writec",2);
+model.in1=in1;
+model.evtin=1;
+model.dstate=[-1,lunit,zeros((nin+1)*N,1)];
+model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)];
+model.blocktype="d";
+model.dep_ut=[true,None];
+exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)];
+gr_i=[];
+x=standard_define([4,2],model,exprs,gr_i);
+}
+WRITEC_f.prototype.details = function WRITEC_f() {
+}
+}
--
cgit