summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-20 09:49:01 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-20 09:49:01 +0200
commit0049e685a51f74e422eac722040db782f87fc823 (patch)
tree00ed05ea2b592854f9702a896cfaecc580343252 /scilab/modules/scicos_blocks
parentd238528635fedd4de6f41cf693bd7d9e910a9cb7 (diff)
parent04fde5001a1a891a6621019334e389bce798e07a (diff)
downloadscilab-0049e685a51f74e422eac722040db782f87fc823.zip
scilab-0049e685a51f74e422eac722040db782f87fc823.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c Change-Id: I2baffdab5b8100dde645c111804d9453ed018906
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci4
-rw-r--r--scilab/modules/scicos_blocks/macros/Electrical/Diode.sci6
-rw-r--r--scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci4
-rw-r--r--scilab/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci2
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci2
10 files changed, 14 insertions, 14 deletions
diff --git a/scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci b/scilab/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
index c307c35..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;
@@ -114,7 +114,7 @@ case 'define' then
114 model.firing=-1 114 model.firing=-1
115 model.dep_ut=[%f %f] 115 model.dep_ut=[%f %f]
116 116
117 exprs=['A',sci2exp(1)] 117 exprs=['A';sci2exp(1)]
118 x=standard_define([1.5 1.5],model,exprs,' ') 118 x=standard_define([1.5 1.5],model,exprs,' ')
119 x.graphics.id="Goto" 119 x.graphics.id="Goto"
120end 120end
diff --git a/scilab/modules/scicos_blocks/macros/Electrical/Diode.sci b/scilab/modules/scicos_blocks/macros/Electrical/Diode.sci
index 69ff6b0..b6c52e2 100644
--- a/scilab/modules/scicos_blocks/macros/Electrical/Diode.sci
+++ b/scilab/modules/scicos_blocks/macros/Electrical/Diode.sci
@@ -37,9 +37,9 @@ case 'set' then
37 model=arg1.model; 37 model=arg1.model;
38 while %t do 38 while %t do
39 [ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue('Set Diode block parameter',.. 39 [ok,Ids,Vt,Maxexp,R,exprs]=scicos_getvalue('Set Diode block parameter',..
40 ['Saturation cuurent (A)',.. 40 ['Saturation cuurent (A)';..
41 'Voltage equivalent to temperature (Volt)',.. 41 'Voltage equivalent to temperature (Volt)';..
42 'Max exponent for linear continuation',.. 42 'Max exponent for linear continuation';..
43 'R (ohm)'], list('vec',1,'vec',1,'vec',1,'vec',1),exprs) 43 'R (ohm)'], list('vec',1,'vec',1,'vec',1,'vec',1),exprs)
44 if ~ok then break,end 44 if ~ok then break,end
45 model.rpar=[Ids;Vt;Maxexp;R] 45 model.rpar=[Ids;Vt;Maxexp;R]
diff --git a/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci b/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
index 16e3841..e4dec7c 100644
--- a/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
+++ b/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
@@ -40,7 +40,7 @@ case 'set' then
40 model=arg1.model; 40 model=arg1.model;
41 while %t do 41 while %t do
42 [ok,V,ph,frq,offset,start,exprs]=scicos_getvalue('Set voltage source parameter',.. 42 [ok,V,ph,frq,offset,start,exprs]=scicos_getvalue('Set voltage source parameter',..
43 ['Amplitude (Volt)','phase (rad)','Frequency (Hz)','Voltageoffset (V)','Timeoffset (s)'],.. 43 ['Amplitude (Volt)';'phase (rad)';'Frequency (Hz)';'Voltageoffset (V)';'Timeoffset (s)'],..
44 list('vec',1,'vec',1,'vec',1,'vec',1,'vec',1),exprs) 44 list('vec',1,'vec',1,'vec',1,'vec',1,'vec',1),exprs)
45 if ~ok then break,end 45 if ~ok then break,end
46 model.rpar=[V;ph;frq;offset;start] 46 model.rpar=[V;ph;frq;offset;start]
diff --git a/scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci b/scilab/modules/scicos_blocks/macros/Linear/REGISTER.sci
index a25e5dd..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/MatrixOp/CUMSUM.sci b/scilab/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
index a59a5bd..c79d62d 100644
--- a/scilab/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
+++ b/scilab/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
@@ -102,7 +102,7 @@ case 'define' then
102 model.blocktype='c' 102 model.blocktype='c'
103 model.firing=[] 103 model.firing=[]
104 model.dep_ut=[%t %f] 104 model.dep_ut=[%t %f]
105 label=[sci2exp(1),sci2exp(0)]; 105 label=[sci2exp(1);sci2exp(0)];
106 gr_i=['xstringb(orig(1),orig(2),''CUMSUM'',sz(1),sz(2),''fill'');'] 106 gr_i=['xstringb(orig(1),orig(2),''CUMSUM'',sz(1),sz(2),''fill'');']
107 x=standard_define([2 2],model,label,gr_i) 107 x=standard_define([2 2],model,label,gr_i)
108end 108end
diff --git a/scilab/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci b/scilab/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
index 8ce0c5d..a49a366 100644
--- a/scilab/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
+++ b/scilab/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
@@ -99,7 +99,7 @@ case 'define' then
99 model.blocktype='c' 99 model.blocktype='c'
100 model.firing=[] 100 model.firing=[]
101 model.dep_ut=[%t %f] 101 model.dep_ut=[%t %f]
102 label=[sci2exp(1),sci2exp(1)]; 102 label=[sci2exp(1);sci2exp(1)];
103 gr_i=['txt=[''Tri/Diag'';''Extraction''];';'xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'');'] 103 gr_i=['txt=[''Tri/Diag'';''Extraction''];';'xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'');']
104 x=standard_define([3 2],model,label,gr_i) 104 x=standard_define([3 2],model,label,gr_i)
105end 105end
diff --git a/scilab/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci b/scilab/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
index dca3639..3a930e0 100644
--- a/scilab/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
+++ b/scilab/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
@@ -104,7 +104,7 @@ case 'define' then
104 model.blocktype='c' 104 model.blocktype='c'
105 model.firing=[] 105 model.firing=[]
106 model.dep_ut=[%t %f] 106 model.dep_ut=[%t %f]
107 label=[sci2exp(1),sci2exp(0)]; 107 label=[sci2exp(1);sci2exp(0)];
108 gr_i=['xstringb(orig(1),orig(2),''MATSUM'',sz(1),sz(2),''fill'');'] 108 gr_i=['xstringb(orig(1),orig(2),''MATSUM'',sz(1),sz(2),''fill'');']
109 x=standard_define([2 2],model,label,gr_i) 109 x=standard_define([2 2],model,label,gr_i)
110end 110end
diff --git a/scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci b/scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci
index 9d0cdb7..6182e81 100644
--- a/scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci
+++ b/scilab/modules/scicos_blocks/macros/Misc/DIFF_f.sci
@@ -36,7 +36,7 @@ case 'set' then
36 model=arg1.model; 36 model=arg1.model;
37 while %t do 37 while %t do
38 [ok,x0,xd0,exprs]=scicos_getvalue('Set continuous linear system parameters',.. 38 [ok,x0,xd0,exprs]=scicos_getvalue('Set continuous linear system parameters',..
39 ['Initial state','Initial Derivative'],list('vec',1,'vec',1),exprs) 39 ['Initial state';'Initial Derivative'],list('vec',1,'vec',1),exprs)
40 40
41 41
42 if ~ok then break,end 42 if ~ok then break,end
diff --git a/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci b/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
index 10d79e9..807a398 100644
--- a/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
+++ b/scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
@@ -128,7 +128,7 @@ scs_m_1.objs(1)=scicos_block(..
128 sz=[70,40],.. 128 sz=[70,40],..
129 flip=%t,.. 129 flip=%t,..
130 theta=0,.. 130 theta=0,..
131 exprs=["V","1","1","0"],.. 131 exprs=["V";"1";"1";"0"],..
132 pin=[],.. 132 pin=[],..
133 pout=4,.. 133 pout=4,..
134 pein=2,.. 134 pein=2,..
diff --git a/scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci b/scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
index 1aec142..1df8852 100644
--- a/scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
+++ b/scilab/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
@@ -96,7 +96,7 @@ case 'define' then
96 model.dep_ut=[%f %t]; 96 model.dep_ut=[%f %t];
97 gr_i=['txt=[''From workspace''];'.. 97 gr_i=['txt=[''From workspace''];'..
98 ;'xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'')'] 98 ;'xstringb(orig(1),orig(2),txt,sz(1),sz(2),''fill'')']
99 exprs=[string(varnam),string(Method),string(ZC),string(OutEnd)]; 99 exprs=[string(varnam);string(Method);string(ZC);string(OutEnd)];
100 x=standard_define([3.5 2],model,exprs,gr_i) 100 x=standard_define([3.5 2],model,exprs,gr_i)
101end 101end
102endfunction 102endfunction