Xcos: set Gyrator and IdealTransformer output ports 52/1952/2
Clément DAVID [Thu, 16 Sep 2010 15:04:34 +0000 (17:04 +0200)]
As it is implicit blocks, changing input to output just change the placement.

Bug: #6500
Change-Id: Ia2eb6163508439918988795eade95f9be9f85fa4

scilab/CHANGES_5.3.X
scilab/modules/scicos_blocks/blocks/Gyrator.h5
scilab/modules/scicos_blocks/blocks/IdealTransformer.h5
scilab/modules/scicos_blocks/macros/Electrical/Gyrator.sci
scilab/modules/scicos_blocks/macros/Electrical/IdealTransformer.sci
scilab/modules/xcos/images/palettes/Gyrator.png
scilab/modules/xcos/images/palettes/IdealTransformer.png

index f42aadc..1bb1767 100644 (file)
@@ -6,8 +6,12 @@ Xcos:
 
 * Include all the old-scicos palettes on the binary version.
 
+* bug 6500 fixed - The ideal transformer block was unusable due to wrong port
+                   positioning.
+
 * bug 7219 fixed - The old gain demo did not work.
 
+
 * bug 7445 fixed - The Kalman filter and the Cont-Plant-Hybrid-Observer demos
                    did not simulate.
 
index c30f764..f7973c2 100644 (file)
Binary files a/scilab/modules/scicos_blocks/blocks/Gyrator.h5 and b/scilab/modules/scicos_blocks/blocks/Gyrator.h5 differ
index eb555d9..eb0b72f 100644 (file)
Binary files a/scilab/modules/scicos_blocks/blocks/IdealTransformer.h5 and b/scilab/modules/scicos_blocks/blocks/IdealTransformer.h5 differ
index 8e1905e..153edd3 100644 (file)
@@ -51,7 +51,7 @@ PrametersValue=[1;1]
 ParametersName=["G1";"G2"]
 model=scicos_model()                  
 Typein=[];Typeout=[];MI=[];MO=[]       
-P=[2.5,90,2,0;2.5,10,2,0;97.5,90,2,0;97.5,10,2,0]
+P=[2.5,90,2,0;2.5,10,2,0;97.5,90,-2,0;97.5,10,-2,0]
 PortName=["p1";"n1";"p2";"n2"]
 for i=1:size(P,'r')                                             
   if P(i,3)==1  then  Typein= [Typein; 'E'];MI=[MI;PortName(i)];end
@@ -86,7 +86,7 @@ function Gyrator_draw_ports(o)
   // draw input/output ports
   //------------------------
   // [x_in_Icon,y_in_Icon,type(2=imp_in/-2:imp_out/1=exp_input/-1_exp_output),orientation(degree)]
-  P=[2.5,90,2,0;2.5,10,2,0;97.5,90,2,0;97.5,10,2,0]
+  P=[2.5,90,2,0;2.5,10,2,0;97.5,90,-2,0;97.5,10,-2,0]
 
   //============================
   // setting the input/ outputs and direction
index 44c82f9..8c3ab7b 100644 (file)
@@ -52,7 +52,7 @@ PrametersValue=[1]
 ParametersName=["N"]
 model=scicos_model()                  
 Typein=[];Typeout=[];MI=[];MO=[]       
-P=[2.5,90,2,0;2.5,10,2,0;97.5,90,2,0;97.5,10,2,0]
+P=[2.5,90,2,0;2.5,10,2,0;97.5,90,-2,0;97.5,10,-2,0]
 PortName=["p1";"n1";"p2";"n2"]
 for i=1:size(P,'r')                                             
   if P(i,3)==1  then  Typein= [Typein; 'E'];MI=[MI;PortName(i)];end
@@ -87,7 +87,7 @@ function trns_draw_ports(o)
   // draw input/output ports
   //------------------------
   // [x_in_Icon,y_in_Icon,type(2=imp_in/-2:imp_out/1=exp_input/-1_exp_output),orientation(degree)]
-  P=[2.5,90,2,0;2.5,10,2,0;97.5,90,2,0;97.5,10,2,0]
+  P=[2.5,90,2,0;2.5,10,2,0;97.5,90,-2,0;97.5,10,-2,0]
 
   //============================
   // setting the input/ outputs and direction
index 3e0ee63..7e0be12 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Gyrator.png and b/scilab/modules/xcos/images/palettes/Gyrator.png differ
index a5aa67c..1a0d64d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/IdealTransformer.png and b/scilab/modules/xcos/images/palettes/IdealTransformer.png differ