support scicos_model call

2 files changed, 86 insertions, 4 deletions

diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 5175a07b..e6db9281 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -1,3 +1,86 @@
-Syntax error in input LexToken(VAR,'sim',1,5338)
 /* autogenerated from "macros/Sources/FROMWSB.sci" */
-None
+function FROMWSB() {
+FROMWSB.prototype.get = function FROMWSB() {
+}
+FROMWSB.prototype.set = function FROMWSB() {
+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
+}
+}
+newpar=list();
+y=0;
+for(path in ppath) {
+np=size(path,"*");
+spath=list();
+for(k=1;k<=np;k+=1) {
+spath[$+1-1]="model";
+spath[$+1-1]="rpar";
+spath[$+1-1]="objs";
+spath[$+1-1]=path(k);
+}
+xx=arg1(spath);
+execstr("xxn="+xx.gui+"(\'set\',xx)");
+if (!isequalbitwise(xxn,xx)) {
+model=xx.model;
+model_n=xxn.model;
+if (!is_modelica_block(xx)) {
+modified=or(model.sim!=model_n.sim)||!isequal(model.state,model_n.state)||!isequal(model.dstate,model_n.dstate)||!isequal(model.odstate,model_n.odstate)||!isequal(model.rpar,model_n.rpar)||!isequal(model.ipar,model_n.ipar)||!isequal(model.opar,model_n.opar)||!isequal(model.label,model_n.label);
+if (or(model.in1!=model_n.in1)||or(model.out!=model_n.out)||or(model.in2!=model_n.in2)||or(model.out2!=model_n.out2)||or(model.outtyp!=model_n.outtyp)||or(model.intyp!=model_n.intyp)) {
+needcompile=1;
+}
+if (or(model.firing!=model_n.firing)) {
+needcompile=2;
+}
+if ((size(model.in1,"*")!=size(model_n.in1,"*"))||(size(model.out,"*")!=size(model_n.out,"*"))) {
+needcompile=4;
+}
+if (model.sim=="input"||model.sim=="output") {
+if (model.ipar!=model_n.ipar) {
+needcompile=4;
+}
+}
+if (or(model.blocktype!=model_n.blocktype)||or(model.dep_ut!=model_n.dep_ut)) {
+needcompile=4;
+}
+if ((model.nzcross!=model_n.nzcross)||(model.nmode!=model_n.nmode)) {
+needcompile=4;
+}
+if (prod(size(model_n.sim))>1) {
+if (model_n.sim(2)>1000) {
+if (model.sim(1)!=model_n.sim(1)) {
+needcompile=4;
+}
+}
+}
+} else {
+modified=or(model_n!=model);
+eq=model.equations;
+eqn=model_n.equations;
+if (or(eq.model!=eqn.model)||or(eq.inputs!=eqn.inputs)||or(eq.outputs!=eqn.outputs)) {
+needcompile=4;
+}
+}
+arg1[spath-1]=xxn;
+newpar[size(newpar)+1-1]=path;
+y=max(y,needcompile);
+}
+}
+x=arg1;
+typ=newpar;
+}
+FROMWSB.prototype.define = function FROMWSB() {
+scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list()));
+scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=["V","1","1","0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,-31,1,1,0],opar=list(),blocktype="d",firing=0,dep_ut=[None,true],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[2-1]=scicos_link(xx=[295.37067,295.37067,233.23733,233.23733,295.37067,295.37067],yy=[255.86971,223.45067,223.45067,337.85067,337.85067,307.29829],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]);
+scs_m_1.objs[3-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list());
+scs_m_1.objs[4-1]=scicos_link(xx=[338.9421,358.9421],yy=[281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]);
+model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list());
+gr_i=[];
+x=standard_define([5,2],model,[],gr_i);
+}
+FROMWSB.prototype.details = function FROMWSB() {
+}
+}
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index b015fdfc..45b958a0 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -1,5 +1,4 @@
-Syntax error in input LexToken(VAR,'sim',1,5389)
-Syntax error in input LexToken(VAR,'N',1,10287)
+Syntax error in input LexToken(FUNCTION,'function',1,10255)
 Syntax error in input LexToken(VAR,'order',1,12980)
 Syntax error in input LexToken(VAR,'x',1,13322)
 /* autogenerated from "macros/Sources/Sigbuilder.sci" */