replace in with in1

25 files changed, 266 insertions, 34 deletions

diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js
index 6d03b9a4..8ecf506c 100644
--- a/js/Linear/BIGSOM_f.js
+++ b/js/Linear/BIGSOM_f.js
@@ -27,7 +27,7 @@ BIGSOM_f.prototype.define = function BIGSOM_f() {
 sgn=[1,1];
 model=scicos_model();
 model.sim=list("sum",2);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.out=-1;
 model.rpar=sgn;
 model.blocktype="c";
diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js
index 636ab9a0..8479afa7 100644
--- a/js/Linear/DELAYV_f.js
+++ b/js/Linear/DELAYV_f.js
@@ -7,7 +7,7 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-nin=model.in(1);
+nin=model.in1(1);
 z0=model.dstate;
 zz0=z0.slice(1-1,$-1);
 told=z0($);
@@ -44,7 +44,7 @@ zz0=z0.slice(1-1,$-1);
 T=1;
 model=scicos_model();
 model.sim=list("delayv",1);
-model.in=[nin,1];
+model.in1=[nin,1];
 model.out=nin;
 model.evtin=1;
 model.evtout=[1,1];
diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js
index 34a179e7..969de821 100644
--- a/js/Linear/DELAY_f.js
+++ b/js/Linear/DELAY_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4890)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,5081)
 /* autogenerated from "macros/Linear/DELAY_f.sci" */
 None
diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js
index 7adc33b3..13107bf8 100644
--- a/js/Linear/DERIV.js
+++ b/js/Linear/DERIV.js
@@ -8,7 +8,7 @@ x=arg1;
 DERIV.prototype.define = function DERIV() {
 model=scicos_model();
 model.sim=list("deriv",4);
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.blocktype="x";
 model.dep_ut=[true,None];
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index c3ea5c21..3f2877af 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -29,7 +29,7 @@ if (!ask_again) {
 graphics.exprs=exprs;
 model.state=[x0,xd0];
 model.out=[N];
-model.in=N;
+model.in1=N;
 x.graphics=graphics;
 x.model=model;
 break
@@ -41,7 +41,7 @@ DIFF_c.prototype.define = function DIFF_c() {
 x0=[0,0];
 model=scicos_model();
 model.sim=list("diffblk_c",10004);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.state=x0;
 model.blocktype="c";
diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js
index 8625f8e1..bf5ca2b8 100644
--- a/js/Linear/DOLLAR.js
+++ b/js/Linear/DOLLAR.js
@@ -76,7 +76,7 @@ in1=1;
 exprs=string([z,inh]);
 model=scicos_model();
 model.sim=list("dollar4",4);
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1-inh;
 model.dstate=z;
diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js
index 893131f1..18b2a5d9 100644
--- a/js/Linear/DOLLAR_f.js
+++ b/js/Linear/DOLLAR_f.js
@@ -26,7 +26,7 @@ if (ok) {
 if (ok) {
 graphics.exprs=exprs;
 model.dstate=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,inh]);
 model=scicos_model();
 model.sim="dollar";
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1-inh;
 model.dstate=z;
diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js
index 5f9397f6..fa3c85c7 100644
--- a/js/Linear/DOLLAR_m.js
+++ b/js/Linear/DOLLAR_m.js
@@ -76,7 +76,7 @@ in1=1;
 exprs=string([z,inh]);
 model=scicos_model();
 model.sim=list("dollar4",4);
-model.in=in1;
+model.in1=in1;
 model.out=in1;
 model.evtin=1-inh;
 model.dstate=z;
diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js
index d78df918..5901ff74 100644
--- a/js/Linear/GAINBLK.js
+++ b/js/Linear/GAINBLK.js
@@ -1,3 +1,147 @@
-Syntax error in input LexToken(IN,'in',1,5659)
 /* autogenerated from "macros/Linear/GAINBLK.sci" */
-None
+function GAINBLK() {
+GAINBLK.prototype.get = function GAINBLK() {
+}
+GAINBLK.prototype.set = function GAINBLK() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+if (size(exprs,"*")==1) {
+exprs=[exprs,sci2exp(0)];
+}
+while (true) {
+[ok,gain,over,exprs]=scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),exprs);
+if (!ok) {
+break
+}
+if (gain==[]) {
+message("Gain must have at least one element");
+} else {
+if (typeof(gain)=="constant") {
+if (isreal(gain)) {
+it=1;
+ot=1;
+model.sim=list("gainblk",4);
+model.rpar=gain.slice();
+model.opar=list();
+} else {
+message("type is not supported");
+ok=None;
+}
+} else {
+if ((over==0)) {
+if ((typeof(gain)=="int32")) {
+ot=3;
+model.sim=list("gainblk_i32n",4);
+} else if ((typeof(gain)=="int16")) {
+ot=4;
+model.sim=list("gainblk_i16n",4);
+} else if ((typeof(gain)=="int8")) {
+ot=5;
+model.sim=list("gainblk_i8n",4);
+} else if ((typeof(gain)=="uint32")) {
+ot=6;
+model.sim=list("gainblk_ui32n",4);
+} else if ((typeof(gain)=="uint16")) {
+ot=7;
+model.sim=list("gainblk_ui16n",4);
+} else if ((typeof(gain)=="uint8")) {
+ot=8;
+model.sim=list("gainblk_ui8n",4);
+} else {
+message("type is not supported.");
+ok=None;
+}
+} else if ((over==1)) {
+if ((typeof(gain)=="int32")) {
+ot=3;
+model.sim=list("gainblk_i32s",4);
+} else if ((typeof(gain)=="int16")) {
+ot=4;
+model.sim=list("gainblk_i16s",4);
+} else if ((typeof(gain)=="int8")) {
+ot=5;
+model.sim=list("gainblk_i8s",4);
+} else if ((typeof(gain)=="uint32")) {
+ot=6;
+model.sim=list("gainblk_ui32s",4);
+} else if ((typeof(gain)=="uint16")) {
+ot=7;
+model.sim=list("gainblk_ui16s",4);
+} else if ((typeof(gain)=="uint8")) {
+ot=8;
+model.sim=list("gainblk_ui8s",4);
+} else {
+message("type is not supported.");
+ok=None;
+}
+} else if ((over==2)) {
+if ((typeof(gain)=="int32")) {
+ot=3;
+model.sim=list("gainblk_i32e",4);
+} else if ((typeof(gain)=="int16")) {
+ot=4;
+model.sim=list("gainblk_i16e",4);
+} else if ((typeof(gain)=="int8")) {
+ot=5;
+model.sim=list("gainblk_i8e",4);
+} else if ((typeof(gain)=="uint32")) {
+ot=6;
+model.sim=list("gainblk_ui32e",4);
+} else if ((typeof(gain)=="uint16")) {
+ot=7;
+model.sim=list("gainblk_ui16e",4);
+} else if ((typeof(gain)=="uint8")) {
+ot=8;
+model.sim=list("gainblk_ui8e",4);
+} else {
+message("type is not an integer.");
+ok=None;
+}
+} else {
+message("Do on Overflow must be 0,1,2");
+ok=None;
+}
+model.rpar=[];
+model.opar=list(gain.slice());
+}
+if (ok) {
+[out,in1]=size(gain);
+if (out*in1!=1) {
+[model,graphics,ok]=set_io(model,graphics,list([in1,-1],ot),list([out,-1],ot),[],[]);
+} else {
+[model,graphics,ok]=set_io(model,graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]);
+}
+}
+if (ok) {
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+GAINBLK.prototype.define = function GAINBLK() {
+gain=1;
+in1=-1;
+out=-1;
+in2=-2;
+out2=-2;
+model=scicos_model();
+model.sim=list("gainblk",4);
+model.in1=in1;
+model.out=out;
+model.in2=in2;
+model.out2=out2;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[strcat(sci2exp(gain))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAINBLK.prototype.details = function GAINBLK() {
+}
+}
diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js
index a1fffa2b..fc9d6680 100644
--- a/js/Linear/GAINBLK_f.js
+++ b/js/Linear/GAINBLK_f.js
@@ -1,3 +1,47 @@
-Syntax error in input LexToken(IN,'in',1,1386)
 /* autogenerated from "macros/Linear/GAINBLK_f.sci" */
-None
+function GAINBLK_f() {
+GAINBLK_f.prototype.get = function GAINBLK_f() {
+}
+GAINBLK_f.prototype.set = function GAINBLK_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,gain,exprs]=scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs(1));
+if (!ok) {
+break
+}
+if (gain==[]) {
+message("Gain must have at least one element");
+} else {
+[out,in1]=size(gain);
+[model,graphics,ok]=check_io(model,graphics,in1,out,[],[]);
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=gain.slice();
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+GAINBLK_f.prototype.define = function GAINBLK_f() {
+gain=1;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim="gain";
+model.in1=in1;
+model.out=out;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[strcat(sci2exp(gain))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAINBLK_f.prototype.details = function GAINBLK_f() {
+}
+}
diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js
index bea1b63f..dc7c38b5 100644
--- a/js/Linear/GAIN_f.js
+++ b/js/Linear/GAIN_f.js
@@ -1,3 +1,47 @@
-Syntax error in input LexToken(IN,'in',1,1383)
 /* autogenerated from "macros/Linear/GAIN_f.sci" */
-None
+function GAIN_f() {
+GAIN_f.prototype.get = function GAIN_f() {
+}
+GAIN_f.prototype.set = function GAIN_f() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,gain,exprs]=scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs(1));
+if (!ok) {
+break
+}
+if (gain==[]) {
+message("Gain must have at least one element");
+} else {
+[out,in1]=size(gain);
+[model,graphics,ok]=check_io(model,graphics,in1,out,[],[]);
+if (ok) {
+graphics.exprs=exprs;
+model.rpar=gain.slice();
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+}
+GAIN_f.prototype.define = function GAIN_f() {
+gain=1;
+in1=1;
+out=1;
+model=scicos_model();
+model.sim="gain";
+model.in1=1;
+model.out=1;
+model.rpar=gain;
+model.blocktype="c";
+model.dep_ut=[true,None];
+exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+GAIN_f.prototype.details = function GAIN_f() {
+}
+}
diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js
index d539e1cd..55039721 100644
--- a/js/Linear/INTEGRAL.js
+++ b/js/Linear/INTEGRAL.js
@@ -65,7 +65,7 @@ rpar=[];
 model=scicos_model();
 model.state=0;
 model.sim=list("integral_func",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js
index 6d4f293e..b2c23f69 100644
--- a/js/Linear/INTEGRAL_f.js
+++ b/js/Linear/INTEGRAL_f.js
@@ -24,7 +24,7 @@ INTEGRAL_f.prototype.define = function INTEGRAL_f() {
 x0=0;
 model=scicos_model();
 model.sim="integr";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.state=x0;
 model.blocktype="c";
diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js
index e2d2c6b1..52e65658 100644
--- a/js/Linear/INTEGRAL_m.js
+++ b/js/Linear/INTEGRAL_m.js
@@ -107,7 +107,7 @@ rpar=[];
 model=scicos_model();
 model.state=0;
 model.sim=list("integral_func",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.in2=1;
 model.out2=1;
diff --git a/js/Linear/PID.js b/js/Linear/PID.js
index 4cf7b56a..1bfd2245 100644
--- a/js/Linear/PID.js
+++ b/js/Linear/PID.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3536)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3569)
 /* autogenerated from "macros/Linear/PID.sci" */
 None
diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js
index 32215b8b..7f2f02cb 100644
--- a/js/Linear/REGISTER.js
+++ b/js/Linear/REGISTER.js
@@ -66,7 +66,7 @@ REGISTER.prototype.define = function REGISTER() {
 z0=zeros(10,1);
 model=scicos_model();
 model.sim=list("delay4",4);
-model.in=1;
+model.in1=1;
 model.out=1;
 model.evtin=1;
 model.dstate=z0;
diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js
index 0f16c6fa..825260ed 100644
--- a/js/Linear/REGISTER_f.js
+++ b/js/Linear/REGISTER_f.js
@@ -29,7 +29,7 @@ REGISTER_f.prototype.define = function REGISTER_f() {
 z0=zeros(10,1);
 model=scicos_model();
 model.sim="delay";
-model.in=1;
+model.in1=1;
 model.out=1;
 model.evtin=1;
 model.dstate=z0;
diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js
index 35aadbe8..d7be3438 100644
--- a/js/Linear/SAMPHOLD.js
+++ b/js/Linear/SAMPHOLD.js
@@ -10,7 +10,7 @@ SAMPHOLD.prototype.define = function SAMPHOLD() {
 in1=-1;
 model=scicos_model();
 model.sim=list("samphold4",4);
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.evtin=1;
 model.blocktype="d";
diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js
index 4a8ce1b2..9f491a3e 100644
--- a/js/Linear/SAMPHOLD_m.js
+++ b/js/Linear/SAMPHOLD_m.js
@@ -18,7 +18,7 @@ message("Datatype is not supported");
 ok=None;
 }
 if (ok) {
-in1=[model.in,model.in2];
+in1=[model.in1,model.in2];
 [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(in1,it),1,[]);
 if (ok) {
 graphics.exprs=exprs;
@@ -33,7 +33,7 @@ break
 SAMPHOLD_m.prototype.define = function SAMPHOLD_m() {
 model=scicos_model();
 model.sim=list("samphold4_m",4);
-model.in=-1;
+model.in1=-1;
 model.in2=-2;
 model.intyp=1;
 model.outtyp=1;
diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js
index 87bfd226..c3e83bd3 100644
--- a/js/Linear/SAMPLEHOLD_f.js
+++ b/js/Linear/SAMPLEHOLD_f.js
@@ -10,7 +10,7 @@ SAMPLEHOLD_f.prototype.define = function SAMPLEHOLD_f() {
 in1=-1;
 model=scicos_model();
 model.sim="samphold";
-model.in=-1;
+model.in1=-1;
 model.out=-1;
 model.evtin=1;
 model.blocktype="d";
diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js
index fd3684e5..df747276 100644
--- a/js/Linear/SOM_f.js
+++ b/js/Linear/SOM_f.js
@@ -26,7 +26,7 @@ SOM_f.prototype.define = function SOM_f() {
 sgn=[1,1,1];
 model=scicos_model();
 model.sim=list("sum",2);
-model.in=[-1,-1,-1];
+model.in1=[-1,-1,-1];
 model.out=-1;
 model.rpar=sgn;
 model.blocktype="c";
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js
index 0c15982e..1accf905 100644
--- a/js/Linear/SUMMATION.js
+++ b/js/Linear/SUMMATION.js
@@ -121,7 +121,7 @@ SUMMATION.prototype.define = function SUMMATION() {
 sgn=[1,-1];
 model=scicos_model();
 model.sim=list("summation",4);
-model.in=[-1,-1];
+model.in1=[-1,-1];
 model.out=-1;
 model.in2=[-2,-2];
 model.out2=-2;
diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js
index 24f1303f..4aa657a5 100644
--- a/js/Linear/SUM_f.js
+++ b/js/Linear/SUM_f.js
@@ -8,7 +8,7 @@ x=arg1;
 SUM_f.prototype.define = function SUM_f() {
 model=scicos_model();
 model.sim=list("plusblk",2);
-model.in=[-1,-1,-1];
+model.in1=[-1,-1,-1];
 model.out=-1;
 model.blocktype="c";
 model.dep_ut=[true,None];
diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js
index d4c5e8cd..eac5285d 100644
--- a/js/Linear/TIME_DELAY.js
+++ b/js/Linear/TIME_DELAY.js
@@ -7,7 +7,7 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-nin=model.in(1);
+nin=model.in1(1);
 while (true) {
 [ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
@@ -42,7 +42,7 @@ init=0;
 N=1024;
 model=scicos_model();
 model.sim=list("time_delay",4);
-model.in=[nin];
+model.in1=[nin];
 model.out=nin;
 model.rpar=[T,init];
 model.ipar=N;
diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js
index a57831d6..380a890c 100644
--- a/js/Linear/VARIABLE_DELAY.js
+++ b/js/Linear/VARIABLE_DELAY.js
@@ -7,7 +7,7 @@ x=arg1;
 graphics=arg1.graphics;
 exprs=graphics.exprs;
 model=arg1.model;
-nin=model.in(1);
+nin=model.in1(1);
 while (true) {
 [ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
@@ -41,7 +41,7 @@ init=0;
 N=1024;
 model=scicos_model();
 model.sim=list("variable_delay",4);
-model.in=[nin,1];
+model.in1=[nin,1];
 model.out=nin;
 model.rpar=[T,init];
 model.ipar=N;