replace in with in1

15 files changed, 79 insertions, 16 deletions

diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 005b09ec..35194d67 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3500)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3623)
 /* autogenerated from "macros/Sources/CLOCK_c.sci" */
 None
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 50e27e9a..dad9782a 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,3161)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,3284)
 /* autogenerated from "macros/Sources/CLOCK_f.sci" */
 None
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index 4b322a6b..6da9a9b0 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -32,7 +32,7 @@ CONST.prototype.define = function CONST() {
 C=1;
 model=scicos_model();
 model.sim=list("cstblk4",4);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=C;
 model.blocktype="d";
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index 82b2f343..eb78ecdc 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -29,7 +29,7 @@ CONST_f.prototype.define = function CONST_f() {
 C=1;
 model=scicos_model();
 model.sim=list("cstblk",1);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=C;
 model.blocktype="d";
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index a2e8ceb1..09a70e53 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -55,7 +55,7 @@ CONST_m.prototype.define = function CONST_m() {
 C=[1];
 model=scicos_model();
 model.sim=list("cstblk4",4);
-model.in=[];
+model.in1=[];
 model.out=size(C,1);
 model.in2=[];
 model.out2=size(C,2);
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index e148d3a1..77e041f8 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -49,7 +49,7 @@ ipar=[size(xx,1),axisdata.slice()];
 rpar=[xx,yy,rect.slice()];
 model=scicos_model();
 model.sim="intplt";
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=[xx,yy,rect.slice()];
 model.ipar=[size(xx,1),axisdata.slice()];
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index 9c4ee168..01e5121d 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4385)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4418)
 /* autogenerated from "macros/Sources/FROMWSB.sci" */
 None
diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js
index c08a7a9a..237f62f4 100644
--- a/js/Sources/GENSIN_f.js
+++ b/js/Sources/GENSIN_f.js
@@ -32,7 +32,7 @@ GENSIN_f.prototype.define = function GENSIN_f() {
 rpar=[1,1,0];
 model=scicos_model();
 model.sim="gensin";
-model.in=[];
+model.in1=[];
 model.out=1;
 model.out2=1;
 model.outtyp=1;
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index fbe7c45c..59447522 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -9,7 +9,7 @@ Ground_g.prototype.define = function Ground_g() {
 C=[0];
 model=scicos_model();
 model.sim=list("cstblk4_m",4);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.in2=[];
 model.out2=1;
diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js
index bdafc643..f21eeeff 100644
--- a/js/Sources/RAMP.js
+++ b/js/Sources/RAMP.js
@@ -30,7 +30,7 @@ stt=0;
 rpar=[slope,stt,iout];
 model=scicos_model();
 model.sim=list("ramp",4);
-model.in=[];
+model.in1=[];
 model.out=1;
 model.rpar=rpar;
 model.blocktype="c";
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index 4a6515bf..1ee2aa76 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -56,7 +56,7 @@ function_name="rndblk_m";
 funtyp=4;
 model=scicos_model();
 model.sim=list(function_name,funtyp);
-model.in=[];
+model.in1=[];
 model.in2=[];
 model.intyp=[];
 model.out=1;
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index eafac6be..aeff85c7 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -16,7 +16,7 @@ lunit=dstate(3);
 fname=exprs(3);
 frmt=exprs(4);
 while (true) {
-[ok,tmask1,outmask,fname1,frmt1,M,N,offset,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"READC_f" )," ",gettext("Read from C binary file")],[gettext("Time Record Selection"),gettext("Outputs Record Selection"),gettext("Input File Name"),gettext("Input Format"),gettext("Record Size"),gettext("Buffer Size"),gettext("Initial Record Index"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
+[ok,tmask1,outmask,fname1,frmt1,M,N,offset,swap,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"READC_f")," ",gettext("Read from C binary file")],[gettext("Time Record Selection"),gettext("Outputs Record Selection"),gettext("Input File Name"),gettext("Input Format"),gettext("Record Size"),gettext("Buffer Size"),gettext("Initial Record Index"),gettext("Swap Mode (0:No, 1:Yes)")],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
 if (!ok) {
 break
 }
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index 23bf9d84..8ffd10e8 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -1,3 +1,66 @@
-Syntax error in input LexToken(IN,'in',1,1163)
 /* autogenerated from "macros/Sources/STEP.sci" */
-None
+function STEP() {
+STEP.prototype.get = function STEP() {
+}
+STEP.prototype.set = function STEP() {
+x=arg1;
+graphics=arg1.graphics;
+exprs=graphics.exprs;
+model=arg1.model;
+while (true) {
+[ok,temps,in1,fi,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"STEP_FUNCTION")," ",gettext("Step Function")," "],[gettext("Step Time"),gettext("Initial Value"),gettext("Final Value")],list("vec",1,"vec",-1,"vec",-1),exprs);
+if (!ok) {
+break
+}
+in1=in1.slice();
+fi=fi.slice();
+if (size(in1,"*")!=size(fi,"*")) {
+if (size(in1,"*")==1) {
+in1=in1*ones(fi);
+} else if (size(fi,"*")==1) {
+fi=fi*ones(in1);
+} else {
+block_parameter_error(msprintf(gettext("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d."),size(in1,"*"),size(fi,"*")),gettext("Same sizes expected."));
+ok=None;
+}
+}
+if (ok) {
+model.out2=1;
+model.outtyp=1;
+[model,graphics,ok]=check_io(model,graphics,[],size(fi,"*"),1,1);
+}
+if (ok) {
+model.firing=temps;
+if (temps==0) {
+rpar=[fi,fi];
+} else {
+rpar=[in1,fi];
+}
+model.rpar=rpar;
+graphics.exprs=exprs;
+x.graphics=graphics;
+x.model=model;
+break
+}
+}
+}
+STEP.prototype.define = function STEP() {
+rpar=[0,1];
+model=scicos_model();
+model.sim=list("step_func",4);
+model.evtin=1;
+model.evtout=1;
+model.out=1;
+model.out2=1;
+model.outtyp=1;
+model.firing=1;
+model.rpar=rpar;
+model.blocktype="c";
+model.dep_ut=[None,None];
+exprs=[string(1),string(rpar)];
+gr_i=[];
+x=standard_define([2,2],model,exprs,gr_i);
+}
+STEP.prototype.details = function STEP() {
+}
+}
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index 2e0d3006..0e366bdf 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -1,3 +1,3 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4227)
+Syntax error in input LexToken(CLEAR,'clear',1,5508)
 /* autogenerated from "macros/Sources/STEP_FUNCTION.sci" */
 None
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 1f9d70dd..ff42b340 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -1,4 +1,4 @@
-Syntax error in input LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,4459)
+Syntax error in input LexToken(ASSIGNMENT,'=',1,4492)
 Syntax error in input LexToken(VAR,'N',1,10287)
 Syntax error in input LexToken(VAR,'order',1,12980)
 Syntax error in input LexToken(VAR,'x',1,13322)