bug 12877 fix 88/12388/3
Serge Steer [Fri, 30 Aug 2013 10:47:14 +0000 (12:47 +0200)]
Change-Id: Ieff02fd381b6fb3e67a4f527237cf79765a6022d

scilab/CHANGES_5.5.X
scilab/modules/scicos_blocks/macros/Sources/GENSIN_f.sci
scilab/modules/scicos_blocks/macros/Sources/GENSQR_f.sci
scilab/modules/scicos_blocks/macros/Sources/STEP.sci
scilab/modules/scicos_blocks/macros/Sources/STEP_FUNCTION.sci

index a2a7d32..3750162 100644 (file)
@@ -187,6 +187,8 @@ Xcos
 
 * Bug #12874 fixed - CSCOPE marks size were too small.
 
+* Bug #12877 fixed - Incorrect output port dimension and types in GENSIN_f, GENSQR_f, STEP_FUNCTION and STEP blocks
+
 
 Toolbox skeleton
 =================
index 2cbbe6c..6549ef1 100644 (file)
@@ -50,6 +50,11 @@ function [x,y,typ]=GENSIN_f(job,arg1,arg2)
             if ok then
                 [model,graphics,ok]=check_io(model,graphics,[],1,[],[])
                 model.rpar=[M;F;P]
+                //next two lines to fix invalid properties in scilab version
+                //prior 5.5.0
+                model.out2=1;
+                model.outtype=1;
+
                 graphics.exprs=exprs;
                 x.graphics=graphics;x.model=model
                 break
@@ -61,6 +66,8 @@ function [x,y,typ]=GENSIN_f(job,arg1,arg2)
         model.sim="gensin"
         model.in=[]
         model.out=1
+        model.out2=1
+        model.outtype=1
         model.rpar=[1;1;0]
         model.blocktype="c"
         model.dep_ut=[%f %t]
index f4cc569..f271c7d 100644 (file)
@@ -43,6 +43,11 @@ function [x,y,typ]=GENSQR_f(job,arg1,arg2)
             if ~ok then break,end
             graphics.exprs=exprs
             model.dstate=Amplitude
+            //next two lines to fix invalid properties in scilab version
+            //prior 5.5.0
+            model.out2=1;
+            model.outtype=1;
+
             x.graphics=graphics;x.model=model
             break
         end
@@ -50,8 +55,10 @@ function [x,y,typ]=GENSQR_f(job,arg1,arg2)
         Amplitude=1
         model=scicos_model()
         model.sim="gensqr"
-        model.out=1
-        model.evtin=1
+        model.out=1;
+        model.out2=1;
+        model.outtype=1;
+        model.evtin=1;
         model.dstate=Amplitude
         model.blocktype="d"
         model.dep_ut=[%f %f]
index d21c791..07932ac 100644 (file)
@@ -54,7 +54,9 @@ function [x,y,typ]=STEP(job,arg1,arg2)
                 end
             end
             if ok then
-                [model,graphics,ok]=check_io(model,graphics,[],size(fi,"*"),1,1)
+              model.out2=1;
+              model.outtype=1;
+              [model,graphics,ok]=check_io(model,graphics,[],size(fi,"*"),1,1)
             end
             if ok then
                 model.firing=temps
@@ -76,6 +78,8 @@ function [x,y,typ]=STEP(job,arg1,arg2)
         model.evtin=1
         model.evtout=1
         model.out=1
+        model.out2=1;
+        model.outtype=1;
         model.firing=1
         model.rpar=rpar
         model.blocktype="c"
index b1bd979..cbb73f8 100644 (file)
@@ -174,6 +174,9 @@ function [x,y,typ]=STEP_FUNCTION(job,arg1,arg2)
         model=scicos_model();
         model.sim = "csuper";
         model.out = 1;
+        model.out2=1;
+        model.outtype=1;
+
         model.rpar = scs_m_1;
 
         gr_i=[  "thick=xget(''thickness'')"