replace in with in1

27 files changed, 172 insertions, 36 deletions

diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js
index a854b837..8dc9a676 100644
--- a/js/Misc/BACKLASH.js
+++ b/js/Misc/BACKLASH.js
@@ -33,7 +33,7 @@ BACKLASH.prototype.define = function BACKLASH() {
 exprs=["0","1","1"];
 model=scicos_model();
 model.sim=list("backlash",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=[0,1];
 model.nzcross=2;
diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js
index b1cf7c07..5328a819 100644
--- a/js/Misc/BOUNCE.js
+++ b/js/Misc/BOUNCE.js
@@ -90,7 +90,7 @@ state=[x,xd,y,yd];
 state=transpose(state);
 model=scicos_model();
 model.sim=list("bounce_ball",4);
-model.in=[];
+model.in1=[];
 model.out=[n,n];
 model.state=state.slice();
 model.rpar=[rpar1,rpar2,walls,g,C];
diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js
index 2ac6ccce..cee2800f 100644
--- a/js/Misc/BOUNCEXY.js
+++ b/js/Misc/BOUNCEXY.js
@@ -65,7 +65,7 @@ ymin=0;
 ymax=15;
 model=scicos_model();
 model.sim=list("bouncexy",4);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.in2=[1,1];
 model.intyp=[1,1];
 model.evtin=1;
diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js
index 83112a82..6dfa1a0b 100644
--- a/js/Misc/BPLATFORM.js
+++ b/js/Misc/BPLATFORM.js
@@ -48,7 +48,7 @@ ymin=0;
 ymax=15;
 model=scicos_model();
 model.sim=list("bplatform2",5);
-model.in=[1,1];
+model.in1=[1,1];
 model.evtin=1;
 model.dstate=0;
 model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index d0c659de..56c3e022 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1132)
+Syntax error in input LexToken(CLOSEBRACKET,')',1,2684)
 /* autogenerated from "macros/Misc/CBLOCK4.sci" */
 None
diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js
index ee58ef12..1fcf1056 100644
--- a/js/Misc/CONSTRAINT2_c.js
+++ b/js/Misc/CONSTRAINT2_c.js
@@ -43,7 +43,7 @@ if (!ask_again) {
 graphics.exprs=exprs;
 model.state=[x0,xd0];
 model.out=[N,N];
-model.in=N;
+model.in1=N;
 model.ipar=id;
 x.graphics=graphics;
 x.model=model;
@@ -57,7 +57,7 @@ xd0=[0];
 id=[0];
 model=scicos_model();
 model.sim=list("constraint_c",10004);
-model.in=1;
+model.in1=1;
 model.out=[1,1];
 model.state=[x0,xd0];
 model.ipar=id;
diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js
index de4018a8..2cef945f 100644
--- a/js/Misc/CONSTRAINT_c.js
+++ b/js/Misc/CONSTRAINT_c.js
@@ -22,7 +22,7 @@ if (ok) {
 graphics.exprs=exprs;
 model.state=[x0,zeros(N,1)];
 model.out=N;
-model.in=N;
+model.in1=N;
 model.ipar=-1*ones(N,1);
 x.graphics=graphics;
 x.model=model;
@@ -35,7 +35,7 @@ CONSTRAINT_c.prototype.define = function CONSTRAINT_c() {
 x0=[0,0];
 model=scicos_model();
 model.sim=list("constraint_c",10004);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.ipar=0;
 model.state=x0;
diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js
index 8ffdab65..a116b1eb 100644
--- a/js/Misc/DEADBAND.js
+++ b/js/Misc/DEADBAND.js
@@ -37,7 +37,7 @@ maxp=.5;
 rpar=[maxp,minp];
 model=scicos_model();
 model.sim=list("deadband",4);
-model.in=1;
+model.in1=1;
 model.nzcross=2;
 model.nmode=1;
 model.out=1;
diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js
index 854cebc1..8f37e923 100644
--- a/js/Misc/DEBUG.js
+++ b/js/Misc/DEBUG.js
@@ -1,3 +1,48 @@
-Syntax error in input LexToken(SCICOS_DEBUG,'scicos_debug',1,1617)
 /* autogenerated from "macros/Misc/DEBUG.sci" */
-None
+function DEBUG() {
+DEBUG.prototype.get = function DEBUG() {
+}
+DEBUG.prototype.set = function DEBUG() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+textmp=exprs(2);
+ok=true;
+while (1==1) {
+[txt]=dialog(["Enter scilab instructions for debugging."," Inputs are block and flag, output is block"],textmp);
+if (txt!=[]) {
+tt=["block=debug_scicos(block,flag)"];
+if (execstr("deff(tt,txt)","errcatch")==0) {
+warnMode=warning("query");
+warning("off");
+save(TMPDIR+"/debug_scicos",debug_scicos);
+warning(warnMode);
+exprs[2-1]=txt;
+if ((scicos_debug()!=2&&scicos_debug()!=3)) {
+scicos_debug(2);
+}
+break
+} else {
+message(["Error in the instructions",lasterror()]);
+}
+} else {
+ok=None;
+break
+}
+}
+if (ok) {
+graphics.exprs=exprs;
+x.graphics=graphics;
+}
+}
+DEBUG.prototype.define = function DEBUG() {
+model=scicos_model();
+model.sim=list("%debug_scicos",99);
+model.blocktype="d";
+exprs=list("","xcos_debug_gui(flag,block);");
+gr_i=[];
+x=standard_define([8,2],model,exprs,gr_i);
+}
+DEBUG.prototype.details = function DEBUG() {
+}
+}
diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js
index d513f4c5..0301949e 100644
--- a/js/Misc/DIFF_f.js
+++ b/js/Misc/DIFF_f.js
@@ -24,7 +24,7 @@ DIFF_f.prototype.define = function DIFF_f() {
 x0=[0,0];
 model=scicos_model();
 model.sim=list("diffblk",10001);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.state=x0;
 model.blocktype="c";
diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js
index e8099884..616a2fee 100644
--- a/js/Misc/EDGETRIGGER.js
+++ b/js/Misc/EDGETRIGGER.js
@@ -23,7 +23,7 @@ EDGETRIGGER.prototype.define = function EDGETRIGGER() {
 edge=1;
 model=scicos_model();
 model.sim=list("edgetrig",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.dstate=0;
 model.nzcross=1;
diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js
index 6a6b8b74..3127a38b 100644
--- a/js/Misc/EDGE_TRIGGER.js
+++ b/js/Misc/EDGE_TRIGGER.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4093)
+Syntax error in input LexToken(CLEAR,'clear',1,6437)
 /* autogenerated from "macros/Misc/EDGE_TRIGGER.sci" */
 None
diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js
index d7729b20..68a6186e 100644
--- a/js/Misc/ENDBLK.js
+++ b/js/Misc/ENDBLK.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4455)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4488)
 /* autogenerated from "macros/Misc/ENDBLK.sci" */
 None
diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js
index f1683776..995b19e4 100644
--- a/js/Misc/Extract_Activation.js
+++ b/js/Misc/Extract_Activation.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1007)
+Syntax error in input LexToken(CLEAR,'clear',1,3539)
 /* autogenerated from "macros/Misc/Extract_Activation.sci" */
 None
diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js
index 70135a50..d2be3dd2 100644
--- a/js/Misc/IMPSPLIT_f.js
+++ b/js/Misc/IMPSPLIT_f.js
@@ -13,7 +13,7 @@ mo.model="limpsplit";
 mo.inputs="n";
 mo.outputs=["n","n"];
 model.equations=mo;
-model.in=ones(size(mo.inputs,"*"),1);
+model.in1=ones(size(mo.inputs,"*"),1);
 model.out=ones(size(mo.outputs,"*"),1);
 x=standard_define([1,1]/3,model,[],[]);
 x.graphics.in_implicit=["I"];
diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js
index c1a6e3c0..d03347a1 100644
--- a/js/Misc/MEMORY_f.js
+++ b/js/Misc/MEMORY_f.js
@@ -27,7 +27,7 @@ in1=out;
 if (ok) {
 graphics.exprs=exprs;
 model.rpar=a;
-model.in=in1;
+model.in1=in1;
 model.out=out;
 x.graphics=graphics;
 x.model=model;
@@ -41,7 +41,7 @@ in1=1;
 exprs=[string(z),string(1)];
 model=scicos_model();
 model.sim="memo";
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1;
 model.dstate=0;
diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js
index 068b9edb..5074d0c3 100644
--- a/js/Misc/PENDULUM_ANIM.js
+++ b/js/Misc/PENDULUM_ANIM.js
@@ -48,7 +48,7 @@ ymin=-5;
 ymax=5;
 model=scicos_model();
 model.sim=list("anim_pen",5);
-model.in=[1,1];
+model.in1=[1,1];
 model.evtin=1;
 model.dstate=0;
 model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax];
diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js
index 777258ad..8bbbe562 100644
--- a/js/Misc/RATELIMITER.js
+++ b/js/Misc/RATELIMITER.js
@@ -30,7 +30,7 @@ maxp=1;
 rpar=[maxp,minp];
 model=scicos_model();
 model.sim=list("ratelimiter",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index 33d0d152..bb6b8848 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -78,7 +78,7 @@ ipar=[2];
 label="&lt";
 model=scicos_model();
 model.sim=list("relationalop",4);
-model.in=[1,1];
+model.in1=[1,1];
 model.out=1;
 model.ipar=ipar;
 model.blocktype="c";
diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js
index cc3c2277..6d826381 100644
--- a/js/Misc/SPLIT_f.js
+++ b/js/Misc/SPLIT_f.js
@@ -8,7 +8,7 @@ x=arg1;
 SPLIT_f.prototype.define = function SPLIT_f() {
 model=scicos_model();
 model.sim="lsplit";
-model.in=-1;
+model.in1=-1;
 model.out=[-1,-1,-1];
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js
index 19aa3cfb..af391b2c 100644
--- a/js/Misc/SUPER_f.js
+++ b/js/Misc/SUPER_f.js
@@ -1,3 +1,31 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1198)
 /* autogenerated from "macros/Misc/SUPER_f.sci" */
-None
+function SUPER_f() {
+SUPER_f.prototype.get = function SUPER_f() {
+}
+SUPER_f.prototype.set = function SUPER_f() {
+xcos(arg1.model.rpar);
+}
+SUPER_f.prototype.define = function SUPER_f() {
+scs=scicos_diagram();
+scs.props.title="Super Block";
+in1=IN_f("define");
+in1.graphics.orig=[40,40];
+in1.graphics.sz=[20,20];
+out=OUT_f("define");
+out.graphics.orig=[240,40];
+out.graphics.sz=[20,20];
+scs.objs[1-1]=in1;
+scs.objs[2-1]=out;
+model=scicos_model();
+model.sim="super";
+model.in1=1;
+model.out=1;
+model.rpar=scs;
+model.blocktype="h";
+model.dep_ut=[None,None];
+gr_i=[];
+x=standard_define([2,2],model,[],gr_i);
+}
+SUPER_f.prototype.details = function SUPER_f() {
+}
+}
diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js
index 08e0e85f..d997af37 100644
--- a/js/Misc/TEXT_f.js
+++ b/js/Misc/TEXT_f.js
@@ -1,3 +1,66 @@
-Syntax error in input LexToken(SCICOS_GRAPHICS,'scicos_graphics',1,3437)
 /* autogenerated from "macros/Misc/TEXT_f.sci" */
-None
+function TEXT_f() {
+TEXT_f.prototype.get = function TEXT_f() {
+}
+TEXT_f.prototype.set = function TEXT_f() {
+x=arg1;
+graphics=arg1.graphics;
+orig=graphics.orig;
+exprs=graphics.exprs;
+model=arg1.model;
+if (size(exprs,"*")==1) {
+exprs=[exprs,"3","1"];
+}
+while (true) {
+[ok,txt,font,siz,exprs]=scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),exprs);
+if (!ok) {
+break
+}
+if (font<=0||font>6) {
+message("Font number must be greater than 0 and less than 7");
+ok=None;
+}
+if (siz<0) {
+message("Font size must be positive");
+ok=None;
+}
+if (ok) {
+graphics.exprs=exprs;
+gh_winpal=gca();
+default_font_style=gh_winpal.font_style;
+default_font_size=gh_winpal.font_size;
+default_font_color=gh_winpal.font_color;
+gh_winpal.font_style=font;
+gh_winpal.font_size=siz;
+r=xstringl(0,0,exprs(1),evstr(exprs(2)),evstr(exprs(3)));
+gh_winpal.font_style=default_font_style;
+gh_winpal.font_size=default_font_size;
+gh_winpal.font_color=default_font_color;
+sz=r.slice(3-1,4);
+graphics.sz=sz;
+x.graphics=graphics;
+ipar=[font,siz];
+model.rpar=txt;
+model.ipar=ipar;
+x.model=model;
+break
+}
+}
+}
+TEXT_f.prototype.define = function TEXT_f() {
+font=2;
+siz=1;
+model=scicos_model();
+model.sim="text";
+model.rpar="Text";
+model.ipar=[font,siz];
+exprs=["Text",string(font),string(siz)];
+graphics=scicos_graphics();
+graphics.orig=[0,0];
+graphics.sz=[2,1];
+graphics.exprs=exprs;
+x=mlist(["Text","graphics","model","void","gui"],graphics,model," ","TEXT_f");
+}
+TEXT_f.prototype.details = function TEXT_f() {
+}
+}
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index f3fe984e..9585e456 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -22,7 +22,7 @@ ni=size(i,1);
 o=int(o.slice());
 no=size(o,1);
 tt=label[2-1];
-if (model.sim(1)!=funam||size(model.in,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
+if (model.sim(1)!=funam||size(model.in1,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
 tt=[];
 }
 [ok,tt]=CFORTR(funam,tt,i,o);
@@ -54,7 +54,7 @@ rpar=[];
 funam="toto";
 model=scicos_model();
 model.sim=list(" ",2001);
-model.in=in1;
+model.in1=in1;
 model.out=out;
 model.evtin=clkin;
 model.evtout=clkout;
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index 4bc445c8..f1d7374f 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -22,7 +22,7 @@ ni=size(i,1);
 o=int(o.slice());
 no=size(o,1);
 tt=label[2-1];
-if (model.sim(1)!=funam||size(model.in,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
+if (model.sim(1)!=funam||size(model.in1,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) {
 tt=[];
 }
 [ok,tt]=FORTR(funam,tt,i,o);
@@ -44,7 +44,7 @@ break
 fortran_block.prototype.define = function fortran_block() {
 model=scicos_model();
 model.sim=list(" ",1001);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.evtin=[];
 model.evtout=[];
@@ -56,7 +56,7 @@ model.blocktype="c";
 model.firing=[];
 model.dep_ut=[true,None];
 funam="forty";
-label=list([sci2exp(model.in),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
+label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([]));
 gr_i=[];
 x=standard_define([4,2],model,label,gr_i);
 }
diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js
index 44e846e3..38fad25e 100644
--- a/js/Misc/func_block.js
+++ b/js/Misc/func_block.js
@@ -19,7 +19,7 @@ x.graphics=graphics;
 func_block.prototype.define = function func_block() {
 model=scicos_model();
 model.sim=" ";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index f1cad651..3d9a5ef7 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(IN,'in',1,1203)
+Syntax error in input LexToken(CLOSEBRACKET,')',1,3302)
 /* autogenerated from "macros/Misc/generic_block3.sci" */
 None
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index 7f7d543e..0c0c8f3c 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -69,7 +69,7 @@ rpar=[];
 it=1;
 model=scicos_model();
 model.sim=list("scifunc",3);
-model.in=in1;
+model.in1=in1;
 model.in2=in1;
 model.intyp=it;
 model.out=out;