7 files changed, 352 insertions, 14 deletions
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index dff16c09..a8cff8bd 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -1,3 +1,52 @@
-Syntax error in input LexToken(SEMICOLON,';',1,1409)
 /* autogenerated from "macros/Branching/CLKGOTO.sci" */
-None
+function CLKGOTO() {
+CLKGOTO.prototype.get = function CLKGOTO() {
+}
+CLKGOTO.prototype.set = function CLKGOTO() {
+x=arg1;
+graphics=arg1.graphics;
+model=arg1.model;
+exprs=graphics.exprs;
+while (true) {
+[ok,tag,tagvis,exprs]=scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),exprs);
+if (!ok) {
+break
+}
+if (((tagvis<1)||(tagvis>3))) {
+message("Tag Visibility must be between 1 and 3");
+ok=None;
+}
+tagvis=int(tagvis);
+if (ok) {
+if (((model.opar!=list(tag))||(model.ipar!=tagvis))) {
+needcompile=4;
+y=needcompile;
+}
+model.opar=list(tag);
+model.ipar=tagvis;
+model.evtin=1;
+model.firing=-1;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+needcompile=resume(needcompile)
+}
+CLKGOTO.prototype.define = function CLKGOTO() {
+model=scicos_model();
+model.sim="clkgoto";
+model.evtin=1;
+model.opar=list("A");
+model.ipar=int(1);
+model.blocktype="d";
+model.firing=-1;
+model.dep_ut=[None,None];
+exprs=["A",sci2exp(1)];
+x=standard_define([2,1],model,exprs," ");
+x.graphics.id="Goto";
+}
+CLKGOTO.prototype.details = function CLKGOTO() {
+}
+}
diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js
index 2bc1136a..59694dfd 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -1,3 +1,56 @@
-Syntax error in input LexToken(SEMICOLON,';',1,1444)
 /* autogenerated from "macros/Branching/GOTO.sci" */
-None
+function GOTO() {
+GOTO.prototype.get = function GOTO() {
+}
+GOTO.prototype.set = function GOTO() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs);
+if (!ok) {
+break
+}
+tagvis=int(tagvis);
+if (((tagvis<1)||(tagvis>3))) {
+message("Tag Visibility must be between 1 and 3");
+ok=None;
+}
+if (ok) {
+if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) {
+needcompile=4;
+y=needcompile;
+}
+graphics.exprs=exprs;
+model.opar=list(tag);
+model.ipar=tagvis;
+x.model=model;
+x.graphics=graphics;
+arg1=x;
+break
+}
+}
+needcompile=resume(needcompile)
+}
+GOTO.prototype.define = function GOTO() {
+model=scicos_model();
+model.sim="goto";
+model.in=-1;
+model.in2=-2;
+model.intyp=-1;
+model.out=[];
+model.out2=[];
+model.outtyp=1;
+model.ipar=int(1);
+model.opar=list("A");
+model.blocktype="c";
+model.dep_ut=[None,None];
+exprs=["A",sci2exp(1)];
+gr_i=[];
+x=standard_define([2,1],model,exprs,gr_i);
+x.graphics.id="Goto";
+}
+GOTO.prototype.details = function GOTO() {
+}
+}
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index e6eff816..866e5b2e 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -1,3 +1,59 @@
-Syntax error in input LexToken(SEMICOLON,';',1,1446)
 /* autogenerated from "macros/Branching/GOTOMO.sci" */
-None
+function GOTOMO() {
+GOTOMO.prototype.get = function GOTOMO() {
+}
+GOTOMO.prototype.set = function GOTOMO() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,tag,tagvis,exprs]=scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs);
+if (!ok) {
+break
+}
+tagvis=int(tagvis);
+if (((tagvis<1)||(tagvis>3))) {
+message("Tag Visibility must be between 1 and 3");
+ok=None;
+}
+if (ok) {
+if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) {
+needcompile=4;
+y=needcompile;
+}
+graphics.exprs=exprs;
+model.opar=list(tag);
+model.ipar=tagvis;
+x.model=model;
+x.graphics=graphics;
+arg1=x;
+break
+}
+}
+needcompile=resume(needcompile)
+}
+GOTOMO.prototype.define = function GOTOMO() {
+model=scicos_model();
+model.sim="gotomo";
+model.in=-1;
+model.in2=-2;
+model.intyp=[];
+model.out=[];
+model.out2=[];
+model.outtyp=1;
+model.ipar=int(1);
+model.opar=list("A");
+model.blocktype="c";
+model.dep_ut=[None,None];
+mo=modelica();
+mo.model="gotomo";
+mo.inputs="p";
+exprs=["A",sci2exp(1)];
+gr_i=[];
+x=standard_define([2,1],model,exprs,gr_i);
+x.graphics.in_implicit=["I"];
+}
+GOTOMO.prototype.details = function GOTOMO() {
+}
+}
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index 9460811e..745401ac 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -1,3 +1,64 @@
-Syntax error in input LexToken(CLOSESQBRACKET,']',1,1758)
 /* autogenerated from "macros/Branching/ISELECT_m.sci" */
-None
+function ISELECT_m() {
+ISELECT_m.prototype.get = function ISELECT_m() {
+}
+ISELECT_m.prototype.set = function ISELECT_m() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,typ,nout,z0,exprs]=scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+if (z0>nout||z0<=0) {
+message("initial connected input is not a valid input port number");
+} else if (((typ<1)||(typ>8))) {
+message("Datatype is not supported");
+ok=None;
+} else {
+it=typ;
+ot=typ*ones(1,nout);
+if (ok) {
+out=[-ones(nout,1),-2*ones(nout,1)];
+in1=[-1,-2];
+[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(nout,1),[]);
+if (ok) {
+graphics.exprs=exprs;
+model.dstate=z0;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+}
+ISELECT_m.prototype.define = function ISELECT_m() {
+z0=1;
+nout=2;
+model=scicos_model();
+model.sim=list("selector_m",4);
+model.out=[-1,-1];
+model.out2=[-2,-2];
+model.outtyp=1;
+model.in=-1;
+model.in2=-2;
+model.intyp=1;
+model.evtout=[];
+model.state=[];
+model.rpar=[];
+model.ipar=[];
+model.firing=[];
+model.evtin=ones(nout,1);
+model.dstate=z0;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[sci2exp(1),sci2exp(nout),sci2exp(z0)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+ISELECT_m.prototype.details = function ISELECT_m() {
+}
+}
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index 833e6a63..dc7ac82f 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -1,3 +1,63 @@
-Syntax error in input LexToken(CLOSESQBRACKET,']',1,2040)
 /* autogenerated from "macros/Branching/M_SWITCH.sci" */
-None
+function M_SWITCH() {
+M_SWITCH.prototype.get = function M_SWITCH() {
+}
+M_SWITCH.prototype.set = function M_SWITCH() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,nin,base,rule,exprs]=scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+nin=int(nin);
+base=int(base);
+if (nin<1) {
+message("Number of inputs must be >=1 ");
+} else if (!((base==1)||(base==0))) {
+message("base indexing must be 1 or 0");
+} else if (!((rule==1)||(rule==0)||(rule==2)||(rule==3))) {
+message("incorrect rounding rule");
+} else {
+if (nin==1) {
+in1=[1,1,-1,1];
+out=[1,1];
+} else {
+in1=[1,-ones(nin,1)];
+in2=[1,-2*ones(nin,1)];
+in1=[in1,in2];
+out=[-1,-2];
+}
+it=[-1,-2*ones(nin,1)];
+ot=-2;
+[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),[],[]);
+if (ok) {
+graphics.exprs=exprs;
+model.ipar=[base,rule];
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+M_SWITCH.prototype.define = function M_SWITCH() {
+in1=[1,-1,-1];
+ipar=[1,3];
+nin=2;
+model=scicos_model();
+model.sim=list("mswitch",4);
+model.in=in1;
+model.out=-1;
+model.ipar=ipar;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[string(nin),string(ipar)];
+gr_i=[];
+x=standard_define([2.5,2],model,exprs,gr_i);
+}
+M_SWITCH.prototype.details = function M_SWITCH() {
+}
+}
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index 5e422e72..d580454a 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -1,3 +1,64 @@
-Syntax error in input LexToken(CLOSESQBRACKET,']',1,1759)
 /* autogenerated from "macros/Branching/SELECT_m.sci" */
-None
+function SELECT_m() {
+SELECT_m.prototype.get = function SELECT_m() {
+}
+SELECT_m.prototype.set = function SELECT_m() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,typ,nin,z0,exprs]=scicos_getvalue("Set parameters",["Datatype(1= real double  2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+if (z0>nin||z0<=0) {
+message("initial connected input is not a valid input port number");
+} else if (((typ<1)||(typ>8))&&(typ!=-1)) {
+message("Datatype is not supported");
+ok=None;
+} else {
+it=typ*ones(1,nin);
+ot=typ;
+if (ok) {
+in1=[-ones(nin,1),-2*ones(nin,1)];
+out=[-1,-2];
+[model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(nin,1),[]);
+if (ok) {
+graphics.exprs=exprs;
+model.dstate=z0;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+}
+SELECT_m.prototype.define = function SELECT_m() {
+z0=1;
+nin=2;
+model=scicos_model();
+model.sim=list("selector_m",4);
+model.in=[-1,-1];
+model.in2=[-2,-2];
+model.intyp=1;
+model.out=-1;
+model.out2=-2;
+model.outtyp=1;
+model.evtout=[];
+model.state=[];
+model.rpar=[];
+model.ipar=[];
+model.firing=[];
+model.evtin=ones(nin,1);
+model.dstate=z0;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[sci2exp(1),sci2exp(nin),sci2exp(z0)];
+gr_i=[];
+x=standard_define([3,2],model,exprs,gr_i);
+}
+SELECT_m.prototype.details = function SELECT_m() {
+}
+}
diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js
index 5dc84379..8743a359 100644
--- a/js/Branching/SELF_SWITCH.js
+++ b/js/Branching/SELF_SWITCH.js
@@ -1,5 +1,3 @@
 Syntax error in input LexToken(FUNCTION,'function',1,466)
-Syntax error in input LexToken(VAR,'diagram',1,701)
-Syntax error in input LexToken(VAR,'diagram',1,1371)
 /* autogenerated from "macros/Branching/SELF_SWITCH.sci" */
 None