summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-04-14 17:40:25 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-15 08:54:38 +0200
commit83448f9e5497f960aab367177a8e96d5b02df24a (patch)
tree1cce1591921f21d5ac03ee7fc05c2f7ea7129b16 /scilab/modules/scicos_blocks
parent0104033592325dd7017a48d9dc27f1649c87d6b6 (diff)
downloadscilab-83448f9e5497f960aab367177a8e96d5b02df24a.zip
scilab-83448f9e5497f960aab367177a8e96d5b02df24a.tar.gz
Xcos: typo fixes
Use a one line "then pause, end;" Remove the unused disp(). Remove demi-colons on function args (MUST be commas) Update REGISTER and FROMWSC Change-Id: I895ff4965133e1387976c2221b6e16ceda979a9d
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci4
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci2
3 files changed, 4 insertions, 4 deletions
diff --git a/scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci b/scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
index 6fef810..cf8bf9a 100644
--- a/scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
+++ b/scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
@@ -83,7 +83,7 @@ case 'set' then
83 exprs=graphics.exprs 83 exprs=graphics.exprs
84 while %t do 84 while %t do
85 [ok,tag,tagvis,exprs]=scicos_getvalue('Set block parameters',.. 85 [ok,tag,tagvis,exprs]=scicos_getvalue('Set block parameters',..
86 ['Tag';'Tag Visibility (1=Local 2=Scoped 3=Global)'];list('str',-1,'vec',1),exprs) 86 ['Tag';'Tag Visibility (1=Local 2=Scoped 3=Global)'], list('str',-1,'vec',1),exprs)
87 if ~ok then break,end 87 if ~ok then break,end
88 if ((tagvis<1)|(tagvis>3)) then 88 if ((tagvis<1)|(tagvis>3)) then
89 message('Tag Visibility must be between 1 and 3');ok=%f; 89 message('Tag Visibility must be between 1 and 3');ok=%f;
diff --git a/scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci b/scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci
index bb3f3e3..c052009 100644
--- a/scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci
+++ b/scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci
@@ -34,7 +34,7 @@ case 'set' then
34 x=arg1; 34 x=arg1;
35 graphics=arg1.graphics;exprs=graphics.exprs 35 graphics=arg1.graphics;exprs=graphics.exprs
36 model=arg1.model; 36 model=arg1.model;
37 if size(exprs,1)==1 then exprs=[exprs,sci2exp(1)];end 37 if size(exprs,1)==1 then exprs=[exprs;sci2exp(1)];end
38 while %t do 38 while %t do
39 [ok,z0,it,exprs]=scicos_getvalue('Set delay parameters',.. 39 [ok,z0,it,exprs]=scicos_getvalue('Set delay parameters',..
40 ['Register initial condition';.. 40 ['Register initial condition';..
@@ -93,7 +93,7 @@ case 'define' then
93 model.blocktype='d' 93 model.blocktype='d'
94 model.dep_ut=[%f %f] 94 model.dep_ut=[%f %f]
95 95
96 exprs=strcat(string(z0);';') 96 exprs=strcat(string(z0), ';')
97 gr_i=['dly=model.rpar;'; 97 gr_i=['dly=model.rpar;';
98 'txt=[''Shift'';''Register'';string(dly)];'; 98 'txt=[''Shift'';''Register'';string(dly)];';
99 'xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'')'] 99 'xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'')']
diff --git a/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci b/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
index 214262a..b2717d4 100644
--- a/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
+++ b/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
@@ -130,7 +130,7 @@ scs_m_1.objs(1)=scicos_block(..
130 sz=[70,40],.. 130 sz=[70,40],..
131 flip=%t,.. 131 flip=%t,..
132 theta=0,.. 132 theta=0,..
133 exprs=["V","1","1","0"],.. 133 exprs=["V";"1";"1";"0"],..
134 pin=[],.. 134 pin=[],..
135 pout=4,.. 135 pout=4,..
136 pein=2,.. 136 pein=2,..