Xcos: block visualization improvements 17/1217/4
Clément DAVID [Thu, 1 Jul 2010 15:34:37 +0000 (17:34 +0200)]
Use the <svg> width and height elements to get the real block image size.
Update PROD_f and SUM_f icons and use more advanced strategy to display label.
Remove theirs block images and choose an ellipse shape for them.
Also update the CLKSOMV block which has the SUM_f.svg icon.

Change-Id: I44a4076a1967570dd90c5621893e10c10233bce6

203 files changed:
scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabCanvas.java
scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/images/blocks/PRODUCT.svg
scilab/modules/xcos/images/blocks/PROD_f.svg [deleted file]
scilab/modules/xcos/images/blocks/SUM.svg
scilab/modules/xcos/images/blocks/SUM_f.svg [deleted file]
scilab/modules/xcos/images/palettes/ABS_VALUE.png
scilab/modules/xcos/images/palettes/AFFICH_m.png
scilab/modules/xcos/images/palettes/ANDBLK.png
scilab/modules/xcos/images/palettes/ANDLOG_f.png
scilab/modules/xcos/images/palettes/AUTOMAT.png
scilab/modules/xcos/images/palettes/BACKLASH.png
scilab/modules/xcos/images/palettes/BIGSOM_f.png
scilab/modules/xcos/images/palettes/BITCLEAR.png
scilab/modules/xcos/images/palettes/BITSET.png
scilab/modules/xcos/images/palettes/BOUNCE.png
scilab/modules/xcos/images/palettes/BOUNCEXY.png
scilab/modules/xcos/images/palettes/BPLATFORM.png
scilab/modules/xcos/images/palettes/Bache.png
scilab/modules/xcos/images/palettes/CANIMXY.png
scilab/modules/xcos/images/palettes/CANIMXY3D.png
scilab/modules/xcos/images/palettes/CBLOCK.png
scilab/modules/xcos/images/palettes/CCS.png
scilab/modules/xcos/images/palettes/CEVENTSCOPE.png
scilab/modules/xcos/images/palettes/CFSCOPE.png
scilab/modules/xcos/images/palettes/CLINDUMMY_f.png
scilab/modules/xcos/images/palettes/CLKSOMV_f.png
scilab/modules/xcos/images/palettes/CLOCK_c.png
scilab/modules/xcos/images/palettes/CLR.png
scilab/modules/xcos/images/palettes/CLSS.png
scilab/modules/xcos/images/palettes/CMAT3D.png
scilab/modules/xcos/images/palettes/CMATVIEW.png
scilab/modules/xcos/images/palettes/CMSCOPE.png
scilab/modules/xcos/images/palettes/CONSTRAINT_f.png
scilab/modules/xcos/images/palettes/CONST_m.png
scilab/modules/xcos/images/palettes/CONVERT.png
scilab/modules/xcos/images/palettes/COSBLK_f.png
scilab/modules/xcos/images/palettes/CSCOPE.png
scilab/modules/xcos/images/palettes/CSCOPXY.png
scilab/modules/xcos/images/palettes/CSCOPXY3D.png
scilab/modules/xcos/images/palettes/CUMSUM.png
scilab/modules/xcos/images/palettes/CURV_f.png
scilab/modules/xcos/images/palettes/CVS.png
scilab/modules/xcos/images/palettes/Capacitor.png
scilab/modules/xcos/images/palettes/ConstantVoltage.png
scilab/modules/xcos/images/palettes/Counter.png
scilab/modules/xcos/images/palettes/CurrentSensor.png
scilab/modules/xcos/images/palettes/DEADBAND.png
scilab/modules/xcos/images/palettes/DEBUG_SCICOS.png
scilab/modules/xcos/images/palettes/DELAYV_f.png
scilab/modules/xcos/images/palettes/DELAY_f.png
scilab/modules/xcos/images/palettes/DEMUX.png
scilab/modules/xcos/images/palettes/DERIV.png
scilab/modules/xcos/images/palettes/DFLIPFLOP.png
scilab/modules/xcos/images/palettes/DIFF_f.png
scilab/modules/xcos/images/palettes/DLATCH.png
scilab/modules/xcos/images/palettes/DLR.png
scilab/modules/xcos/images/palettes/DLRADAPT_f.png
scilab/modules/xcos/images/palettes/DLSS.png
scilab/modules/xcos/images/palettes/DOLLAR_f.png
scilab/modules/xcos/images/palettes/Diode.png
scilab/modules/xcos/images/palettes/EDGE_TRIGGER.png
scilab/modules/xcos/images/palettes/ENDBLK.png
scilab/modules/xcos/images/palettes/END_c.png
scilab/modules/xcos/images/palettes/ESELECT_f.png
scilab/modules/xcos/images/palettes/EVTDLY_c.png
scilab/modules/xcos/images/palettes/EVTGEN_f.png
scilab/modules/xcos/images/palettes/EVTVARDLY.png
scilab/modules/xcos/images/palettes/EXPBLK_m.png
scilab/modules/xcos/images/palettes/EXPRESSION.png
scilab/modules/xcos/images/palettes/EXTRACT.png
scilab/modules/xcos/images/palettes/EXTRACTBITS.png
scilab/modules/xcos/images/palettes/EXTRACTOR.png
scilab/modules/xcos/images/palettes/EXTTRI.png
scilab/modules/xcos/images/palettes/Extract_Activation.png
scilab/modules/xcos/images/palettes/FROMWSB.png
scilab/modules/xcos/images/palettes/GENERAL_f.png
scilab/modules/xcos/images/palettes/GENSIN_f.png
scilab/modules/xcos/images/palettes/GENSQR_f.png
scilab/modules/xcos/images/palettes/GotoTagVisibility.png
scilab/modules/xcos/images/palettes/Ground.png
scilab/modules/xcos/images/palettes/Gyrator.png
scilab/modules/xcos/images/palettes/HALT_f.png
scilab/modules/xcos/images/palettes/HYSTHERESIS.png
scilab/modules/xcos/images/palettes/IFTHEL_f.png
scilab/modules/xcos/images/palettes/INTEGRAL_f.png
scilab/modules/xcos/images/palettes/INTEGRAL_m.png
scilab/modules/xcos/images/palettes/INTMUL.png
scilab/modules/xcos/images/palettes/INTRP2BLK_f.png
scilab/modules/xcos/images/palettes/INTRPLBLK_f.png
scilab/modules/xcos/images/palettes/INVBLK.png
scilab/modules/xcos/images/palettes/ISELECT_m.png
scilab/modules/xcos/images/palettes/IdealTransformer.png
scilab/modules/xcos/images/palettes/Inductor.png
scilab/modules/xcos/images/palettes/JKFLIPFLOP.png
scilab/modules/xcos/images/palettes/LOGBLK_f.png
scilab/modules/xcos/images/palettes/LOGIC.png
scilab/modules/xcos/images/palettes/LOGICAL_OP.png
scilab/modules/xcos/images/palettes/LOOKUP_f.png
scilab/modules/xcos/images/palettes/MATBKSL.png
scilab/modules/xcos/images/palettes/MATCATH.png
scilab/modules/xcos/images/palettes/MATCATV.png
scilab/modules/xcos/images/palettes/MATDET.png
scilab/modules/xcos/images/palettes/MATDIAG.png
scilab/modules/xcos/images/palettes/MATDIV.png
scilab/modules/xcos/images/palettes/MATEIG.png
scilab/modules/xcos/images/palettes/MATEXPM.png
scilab/modules/xcos/images/palettes/MATINV.png
scilab/modules/xcos/images/palettes/MATLU.png
scilab/modules/xcos/images/palettes/MATMAGPHI.png
scilab/modules/xcos/images/palettes/MATMUL.png
scilab/modules/xcos/images/palettes/MATPINV.png
scilab/modules/xcos/images/palettes/MATRESH.png
scilab/modules/xcos/images/palettes/MATSING.png
scilab/modules/xcos/images/palettes/MATSUM.png
scilab/modules/xcos/images/palettes/MATTRAN.png
scilab/modules/xcos/images/palettes/MATZCONJ.png
scilab/modules/xcos/images/palettes/MATZREIM.png
scilab/modules/xcos/images/palettes/MAXMIN.png
scilab/modules/xcos/images/palettes/MAX_f.png
scilab/modules/xcos/images/palettes/MBLOCK.png
scilab/modules/xcos/images/palettes/MCLOCK_f.png
scilab/modules/xcos/images/palettes/MFCLCK_f.png
scilab/modules/xcos/images/palettes/MIN_f.png
scilab/modules/xcos/images/palettes/MUX.png
scilab/modules/xcos/images/palettes/M_SWITCH.png
scilab/modules/xcos/images/palettes/M_freq.png
scilab/modules/xcos/images/palettes/Modulo_Count.png
scilab/modules/xcos/images/palettes/NEGTOPOS_f.png
scilab/modules/xcos/images/palettes/NMOS.png
scilab/modules/xcos/images/palettes/NPN.png
scilab/modules/xcos/images/palettes/NRMSOM_f.png
scilab/modules/xcos/images/palettes/PDE.png
scilab/modules/xcos/images/palettes/PID.png
scilab/modules/xcos/images/palettes/PMOS.png
scilab/modules/xcos/images/palettes/PNP.png
scilab/modules/xcos/images/palettes/POSTONEG_f.png
scilab/modules/xcos/images/palettes/POWBLK_f.png
scilab/modules/xcos/images/palettes/PRODUCT.png
scilab/modules/xcos/images/palettes/PROD_f.png
scilab/modules/xcos/images/palettes/PerteDP.png
scilab/modules/xcos/images/palettes/PotentialSensor.png
scilab/modules/xcos/images/palettes/PuitsP.png
scilab/modules/xcos/images/palettes/QUANT_f.png
scilab/modules/xcos/images/palettes/RAMP.png
scilab/modules/xcos/images/palettes/RAND_m.png
scilab/modules/xcos/images/palettes/RATELIMITER.png
scilab/modules/xcos/images/palettes/READAU_f.png
scilab/modules/xcos/images/palettes/READC_f.png
scilab/modules/xcos/images/palettes/REGISTER.png
scilab/modules/xcos/images/palettes/RELATIONALOP.png
scilab/modules/xcos/images/palettes/RELAY_f.png
scilab/modules/xcos/images/palettes/RFILE_f.png
scilab/modules/xcos/images/palettes/RICC.png
scilab/modules/xcos/images/palettes/ROOTCOEF.png
scilab/modules/xcos/images/palettes/Resistor.png
scilab/modules/xcos/images/palettes/SAMPHOLD_m.png
scilab/modules/xcos/images/palettes/SATURATION.png
scilab/modules/xcos/images/palettes/SAWTOOTH_f.png
scilab/modules/xcos/images/palettes/SELECT_m.png
scilab/modules/xcos/images/palettes/SHIFT.png
scilab/modules/xcos/images/palettes/SIGNUM.png
scilab/modules/xcos/images/palettes/SINBLK_f.png
scilab/modules/xcos/images/palettes/SQRT.png
scilab/modules/xcos/images/palettes/SRFLIPFLOP.png
scilab/modules/xcos/images/palettes/STEP_FUNCTION.png
scilab/modules/xcos/images/palettes/SUBMAT.png
scilab/modules/xcos/images/palettes/SUMMATION.png
scilab/modules/xcos/images/palettes/SUM_f.png
scilab/modules/xcos/images/palettes/SUPER_f.png
scilab/modules/xcos/images/palettes/SWITCH2_m.png
scilab/modules/xcos/images/palettes/SWITCH_f.png
scilab/modules/xcos/images/palettes/SampleCLK.png
scilab/modules/xcos/images/palettes/Sigbuilder.png
scilab/modules/xcos/images/palettes/SourceP.png
scilab/modules/xcos/images/palettes/Switch.png
scilab/modules/xcos/images/palettes/TANBLK_f.png
scilab/modules/xcos/images/palettes/TCLSS.png
scilab/modules/xcos/images/palettes/TIME_DELAY.png
scilab/modules/xcos/images/palettes/TIME_f.png
scilab/modules/xcos/images/palettes/TKSCALE.png
scilab/modules/xcos/images/palettes/TOWS_c.png
scilab/modules/xcos/images/palettes/TRASH_f.png
scilab/modules/xcos/images/palettes/TrigFun.png
scilab/modules/xcos/images/palettes/VARIABLE_DELAY.png
scilab/modules/xcos/images/palettes/VanneReglante.png
scilab/modules/xcos/images/palettes/VariableResistor.png
scilab/modules/xcos/images/palettes/VoltageSensor.png
scilab/modules/xcos/images/palettes/WFILE_f.png
scilab/modules/xcos/images/palettes/WRITEAU_f.png
scilab/modules/xcos/images/palettes/WRITEC_f.png
scilab/modules/xcos/images/palettes/ZCROSS_f.png
scilab/modules/xcos/images/palettes/c_block.png
scilab/modules/xcos/images/palettes/fortran_block.png
scilab/modules/xcos/images/palettes/freq_div.png
scilab/modules/xcos/images/palettes/generic_block3.png
scilab/modules/xcos/images/palettes/scifunc_block_m.png
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/positionning/RoundBlock.java

index 402d972..1ce27f9 100644 (file)
@@ -18,7 +18,7 @@ import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
+import java.awt.geom.Dimension2D;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
@@ -292,7 +292,7 @@ public class ScilabCanvas extends mxInteractiveCanvas {
                }
 
                // Scale to the bounds
-               Rectangle2D bounds = background.getBounds();
+               Dimension2D bounds = ScilabGraphUtils.getSVGDocumentSizes(svgBackgroundImage);
 
                double sh = h / bounds.getHeight();
                double sw = w / bounds.getWidth();
@@ -339,7 +339,7 @@ public class ScilabCanvas extends mxInteractiveCanvas {
                 */
 
                // Iso scale to the bounds - border size
-               Rectangle2D bounds = icon.getBounds();
+               Dimension2D bounds = ScilabGraphUtils.getSVGDocumentSizes(url);
 
                // Calculating icon bordered bounds
                final double ih = bounds.getHeight();
@@ -360,17 +360,13 @@ public class ScilabCanvas extends mxInteractiveCanvas {
                // Adding borders
                ratio *= BORDER_RATIO;
 
-               // Translate the icon origin to the drawing origin.
-               double tx = -bounds.getX() * ratio;
-               double ty = -bounds.getY() * ratio;
-
                // Calculate scaled height and width
                final double sh = ratio * ih;
                final double sw = ratio * iw;
 
                // Center the image on the block
-               tx += (w - sw) / 2;
-               ty += (h - sh) / 2;
+               double tx = (w - sw) / 2;
+               double ty = (h - sh) / 2;
 
                /*
                 * Everything has been calculated, render now.
index e0d844d..978375a 100644 (file)
@@ -12,6 +12,7 @@
 
 package org.scilab.modules.graph.utils;
 
+import java.awt.geom.Dimension2D;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.URL;
@@ -53,6 +54,10 @@ public final class ScilabGraphUtils extends mxUtils {
         * Cache for the generated SVG components
         */
        private static Map<URL, WeakReference<GraphicsNode>> generatedSVGComponents = new HashMap<URL, WeakReference<GraphicsNode>>();
+       /**
+        * Cache for the generated SVG document sizes
+        */
+       private static Map<URL, Dimension2D> generatedSVGSizes = new HashMap<URL, Dimension2D>();
        
        /**
         * Cache for the generated latex icons
@@ -141,12 +146,33 @@ public final class ScilabGraphUtils extends mxUtils {
                                node = builder.build(ctx, doc);
                                
                                generatedSVGComponents.put(filename, node.getWeakReference());
+                               generatedSVGSizes.put(filename, ctx.getDocumentSize());
                        } catch (IOException e) {
                                LOG.error(e.getLocalizedMessage());
                        }
                }
                return node;
        }
+
+       /**
+        * Get the document size for a given URL.
+        * 
+        * This method use the Document size cache to get the svg element dimension
+        * and not the real size of the graphical tree.
+        * 
+        * @param filename the file
+        * @return the dimension of the file
+        */
+       public static Dimension2D getSVGDocumentSizes(URL filename) {
+               Dimension2D ret = generatedSVGSizes.get(filename);
+               
+               // Generate the GraphicsNode if not available
+               if (ret == null) {
+                       getSVGComponent(filename);
+                       ret = generatedSVGSizes.get(filename);
+               }
+               return ret;
+       }
        
        /**
         * Return a cached or a new instance of a TexIcon generated from the text.
index 1213be2..1fe0478 100644 (file)
@@ -154,7 +154,6 @@ images/blocks/PerteDP.svg \
 images/blocks/PMOS.svg \
 images/blocks/PNP.svg \
 images/blocks/PotentialSensor.svg \
-images/blocks/PROD_f.svg \
 images/blocks/PRODUCT.svg \
 images/blocks/PuitP.svg \
 images/blocks/QUANT_f.svg \
@@ -164,7 +163,6 @@ images/blocks/SampleCLK.svg \
 images/blocks/SATURATION.svg \
 images/blocks/SourceP.svg \
 images/blocks/STEP_FUNCTION.svg \
-images/blocks/SUM_f.svg \
 images/blocks/SUM.svg \
 images/blocks/SUPER.svg \
 images/blocks/SWITCH.svg \
index c553916..262b0cd 100644 (file)
@@ -558,7 +558,6 @@ images/blocks/PerteDP.svg \
 images/blocks/PMOS.svg \
 images/blocks/PNP.svg \
 images/blocks/PotentialSensor.svg \
-images/blocks/PROD_f.svg \
 images/blocks/PRODUCT.svg \
 images/blocks/PuitP.svg \
 images/blocks/QUANT_f.svg \
@@ -568,7 +567,6 @@ images/blocks/SampleCLK.svg \
 images/blocks/SATURATION.svg \
 images/blocks/SourceP.svg \
 images/blocks/STEP_FUNCTION.svg \
-images/blocks/SUM_f.svg \
 images/blocks/SUM.svg \
 images/blocks/SUPER.svg \
 images/blocks/SWITCH.svg \
index 0ef958c..f213558 100644 (file)
        <add as="EXPBLK_m" extend="blockWithLabel">
                <add as="displayedLabel" value="a^u" />
        </add>
-       <add as="PROD_f" extend="Icon">
-               <add as="image" value="$SCILAB/modules/xcos/images/blocks/PROD_f.svg" />
-               <!--
-                       <add as="shape" value="ellipse"/> <add as="perimeter"
-                       value="ellipsePerimeter"/> <add as="displayedLabel" value="&lt;FONT
-                       SIZE=&quot;6&quot;&gt;&#xD7;&lt;/FONT&gt;"/>
-               -->
+       <add as="PROD_f" extend="blockWithLabel">
+               <add as="shape" value="ellipse"/>
+               <remove as="image" />
+               <add as="fontSize" value="20" />
        </add>
        <add as="MATZREIM" extend="blockWithLabel">
                <add as="displayedLabel" value="Re &amp; Im" />
        <add as="SIGNUM" extend="blockWithLabel">
                <add as="displayedLabel" value="SIGN" />
        </add>
-       <add as="SUM_f" extend="Icon">
-               <add as="image" value="$SCILAB/modules/xcos/images/blocks/SUM_f.svg" />
-               <!--
-                       <add as="shape" value="ellipse"/> <add as="perimeter"
-                       value="ellipsePerimeter"/> <add as="displayedLabel" value="&lt;FONT
-                       SIZE=&quot;6&quot;&gt;+&lt;/FONT&gt;"/>
-               -->
+       <add as="SUM_f" extend="blockWithLabel">
+               <add as="shape" value="ellipse"/>
+               <remove as="image" />
+               <add as="fontSize" value="20" />
        </add>
+       
        <add as="CONSTRAINT_f" extend="blockWithLabel">
                <add as="displayedLabel" value="=0 ?" />
        </add>
                <add as="fillColor" value="white" />
                <add as="strokeColor" value="red" />
        </add>
-       <add as="CLKSOMV_f" extend="Icon">
-               <add as="image" value="$SCILAB/modules/xcos/images/blocks/SUM_f.svg" />
-               <!--
-                       <add as="shape" value="ellipse"/> <add as="strokeColor" value="red"/>
-                       <add as="perimeter" value="ellipsePerimeter"/> <add
-                       as="displayedLabel" value="&lt;FONT SIZE=&quot;6&quot;
-                       COLOR=&quot;red&quot;&gt;+&lt;/FONT&gt;"/>
-               -->
+       <add as="CLKSOMV_f" extend="blockWithLabel">
+               <add as="shape" value="ellipse"/>
+               <add as="displayedLabel" value="+" />
+               <add as="fontColor" value="red" />
+               <add as="strokeColor" value="red" />
+               <add as="fontSize" value="20" />
+               <add as="spacing" value="5" />
+               <add as="spacingLeft" value="6" />
+               <add as="spacingRight" value="6" />
        </add>
        <add as="EVTGEN_f" extend="blockWithLabel">
                <add as="displayedLabel" value="Event at&lt;BR&gt;
index af0712c..2f90302 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="40" xmlns="http://www.w3.org/2000/svg" version="1.1" height="40">
- <rect opacity="0" height="40" width="15" stroke="none" y="0" x="0" fill="#000"/>
  <text y="30" x="14" font-size="30" font-family="serif" fill="black">Π</text>
 </svg>
diff --git a/scilab/modules/xcos/images/blocks/PROD_f.svg b/scilab/modules/xcos/images/blocks/PROD_f.svg
deleted file mode 100644 (file)
index f26e785..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="40" xmlns="http://www.w3.org/2000/svg" version="1.1" height="40">
- <g id="layer1">
-  <path stroke-linejoin="round" d="M10,10l20,20m-20,0l20-20" stroke="#000" stroke-linecap="round" stroke-width="2px" fill="none"/>
- </g>
-</svg>
index 45365b8..f76cc1c 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="40" xmlns="http://www.w3.org/2000/svg" version="1.1" height="40">
- <rect id="layout1" opacity="0" height="40" width="15" stroke="none" y="0" x="0" fill="#000"/>
  <text y="30" x="14" font-size="30" font-family="serif" fill="black">Σ</text>
 </svg>
diff --git a/scilab/modules/xcos/images/blocks/SUM_f.svg b/scilab/modules/xcos/images/blocks/SUM_f.svg
deleted file mode 100644 (file)
index dd7fb6d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="40" xmlns="http://www.w3.org/2000/svg" version="1.1" height="40">
- <g id="layer1">
-  <path stroke-linejoin="round" d="M20,5v30m-15-15h30" stroke="#000" stroke-linecap="round" stroke-width="2px" fill="none"/>
- </g>
-</svg>
index 0f26837..e2d074f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ABS_VALUE.png and b/scilab/modules/xcos/images/palettes/ABS_VALUE.png differ
index f1a6320..ebc3f25 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/AFFICH_m.png and b/scilab/modules/xcos/images/palettes/AFFICH_m.png differ
index e7d31ef..64b33f4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ANDBLK.png and b/scilab/modules/xcos/images/palettes/ANDBLK.png differ
index e0d5b4f..bbf0152 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ANDLOG_f.png and b/scilab/modules/xcos/images/palettes/ANDLOG_f.png differ
index 89819cd..c1f82dc 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/AUTOMAT.png and b/scilab/modules/xcos/images/palettes/AUTOMAT.png differ
index 51b27f0..0a8431c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BACKLASH.png and b/scilab/modules/xcos/images/palettes/BACKLASH.png differ
index 1d38fdd..d737d01 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BIGSOM_f.png and b/scilab/modules/xcos/images/palettes/BIGSOM_f.png differ
index e11ddc9..264e891 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BITCLEAR.png and b/scilab/modules/xcos/images/palettes/BITCLEAR.png differ
index 2080c45..3db433f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BITSET.png and b/scilab/modules/xcos/images/palettes/BITSET.png differ
index 26c0980..6341cc4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BOUNCE.png and b/scilab/modules/xcos/images/palettes/BOUNCE.png differ
index 05b1d4f..d6074b9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BOUNCEXY.png and b/scilab/modules/xcos/images/palettes/BOUNCEXY.png differ
index 6c53e9d..682996a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BPLATFORM.png and b/scilab/modules/xcos/images/palettes/BPLATFORM.png differ
index 565a267..4d9d94d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Bache.png and b/scilab/modules/xcos/images/palettes/Bache.png differ
index 05b1d4f..d6074b9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CANIMXY.png and b/scilab/modules/xcos/images/palettes/CANIMXY.png differ
index 723aea7..19ff733 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CANIMXY3D.png and b/scilab/modules/xcos/images/palettes/CANIMXY3D.png differ
index a0bfdba..8f9dc82 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CBLOCK.png and b/scilab/modules/xcos/images/palettes/CBLOCK.png differ
index 24705c9..4968d35 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CCS.png and b/scilab/modules/xcos/images/palettes/CCS.png differ
index 4fd080c..5f01d74 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CEVENTSCOPE.png and b/scilab/modules/xcos/images/palettes/CEVENTSCOPE.png differ
index 9989dea..1eabcd5 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CFSCOPE.png and b/scilab/modules/xcos/images/palettes/CFSCOPE.png differ
index 97a9317..794d0a9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLINDUMMY_f.png and b/scilab/modules/xcos/images/palettes/CLINDUMMY_f.png differ
index 867e0ab..4127910 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLKSOMV_f.png and b/scilab/modules/xcos/images/palettes/CLKSOMV_f.png differ
index bf7cc16..2b68ff4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLOCK_c.png and b/scilab/modules/xcos/images/palettes/CLOCK_c.png differ
index 0126cc4..316d53a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLR.png and b/scilab/modules/xcos/images/palettes/CLR.png differ
index 19f49bb..8a065cc 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLSS.png and b/scilab/modules/xcos/images/palettes/CLSS.png differ
index 4011e93..867f958 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CMAT3D.png and b/scilab/modules/xcos/images/palettes/CMAT3D.png differ
index 0142ec5..ed68ab9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CMATVIEW.png and b/scilab/modules/xcos/images/palettes/CMATVIEW.png differ
index 9c1cfba..235edb4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CMSCOPE.png and b/scilab/modules/xcos/images/palettes/CMSCOPE.png differ
index 063eb4c..2add21f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CONSTRAINT_f.png and b/scilab/modules/xcos/images/palettes/CONSTRAINT_f.png differ
index a80cbd1..d69d32d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CONST_m.png and b/scilab/modules/xcos/images/palettes/CONST_m.png differ
index 6c91fbe..ae3bb4d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CONVERT.png and b/scilab/modules/xcos/images/palettes/CONVERT.png differ
index 17869ac..b2ab1e3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/COSBLK_f.png and b/scilab/modules/xcos/images/palettes/COSBLK_f.png differ
index 524af66..49cd1ed 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CSCOPE.png and b/scilab/modules/xcos/images/palettes/CSCOPE.png differ
index f15ad18..86179b1 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CSCOPXY.png and b/scilab/modules/xcos/images/palettes/CSCOPXY.png differ
index dc9f39b..6deca0d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CSCOPXY3D.png and b/scilab/modules/xcos/images/palettes/CSCOPXY3D.png differ
index 13146fd..c4319e6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CUMSUM.png and b/scilab/modules/xcos/images/palettes/CUMSUM.png differ
index 91dadc0..f6ae53e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CURV_f.png and b/scilab/modules/xcos/images/palettes/CURV_f.png differ
index 9033cbb..bd94f93 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CVS.png and b/scilab/modules/xcos/images/palettes/CVS.png differ
index 51ddf32..da2d94c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Capacitor.png and b/scilab/modules/xcos/images/palettes/Capacitor.png differ
index ee2edc3..6206cbc 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ConstantVoltage.png and b/scilab/modules/xcos/images/palettes/ConstantVoltage.png differ
index 1937189..731748d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Counter.png and b/scilab/modules/xcos/images/palettes/Counter.png differ
index 7b66f25..18c9f4e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CurrentSensor.png and b/scilab/modules/xcos/images/palettes/CurrentSensor.png differ
index 4486c13..070b2e8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DEADBAND.png and b/scilab/modules/xcos/images/palettes/DEADBAND.png differ
index bbbff56..d3d954d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DEBUG_SCICOS.png and b/scilab/modules/xcos/images/palettes/DEBUG_SCICOS.png differ
index 8fc8e38..f016ebf 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DELAYV_f.png and b/scilab/modules/xcos/images/palettes/DELAYV_f.png differ
index e171849..70165f8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DELAY_f.png and b/scilab/modules/xcos/images/palettes/DELAY_f.png differ
index 5fa5756..f8e41f3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DEMUX.png and b/scilab/modules/xcos/images/palettes/DEMUX.png differ
index 1a16318..6c65e74 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DERIV.png and b/scilab/modules/xcos/images/palettes/DERIV.png differ
index b2e2e48..3b8429b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DFLIPFLOP.png and b/scilab/modules/xcos/images/palettes/DFLIPFLOP.png differ
index cea4642..be7b1ea 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DIFF_f.png and b/scilab/modules/xcos/images/palettes/DIFF_f.png differ
index f34f18c..0705ba1 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLATCH.png and b/scilab/modules/xcos/images/palettes/DLATCH.png differ
index c04d7c0..07cd173 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLR.png and b/scilab/modules/xcos/images/palettes/DLR.png differ
index a8bbb89..f3fe8fb 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLRADAPT_f.png and b/scilab/modules/xcos/images/palettes/DLRADAPT_f.png differ
index ced6e10..2e87324 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLSS.png and b/scilab/modules/xcos/images/palettes/DLSS.png differ
index 2c20bd0..006e85c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DOLLAR_f.png and b/scilab/modules/xcos/images/palettes/DOLLAR_f.png differ
index 5c8bc94..f4deefa 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Diode.png and b/scilab/modules/xcos/images/palettes/Diode.png differ
index 81a8a7d..12bba22 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EDGE_TRIGGER.png and b/scilab/modules/xcos/images/palettes/EDGE_TRIGGER.png differ
index 4a7157a..409d8a1 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ENDBLK.png and b/scilab/modules/xcos/images/palettes/ENDBLK.png differ
index 8b9345b..594c789 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/END_c.png and b/scilab/modules/xcos/images/palettes/END_c.png differ
index 7ceb009..d57366a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ESELECT_f.png and b/scilab/modules/xcos/images/palettes/ESELECT_f.png differ
index 172ef99..cd8bc87 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EVTDLY_c.png and b/scilab/modules/xcos/images/palettes/EVTDLY_c.png differ
index 7536e3a..507cd73 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EVTGEN_f.png and b/scilab/modules/xcos/images/palettes/EVTGEN_f.png differ
index 6468be6..1bdb7b4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EVTVARDLY.png and b/scilab/modules/xcos/images/palettes/EVTVARDLY.png differ
index b5c1222..c7c7f5f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXPBLK_m.png and b/scilab/modules/xcos/images/palettes/EXPBLK_m.png differ
index ddf640a..6c24eea 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXPRESSION.png and b/scilab/modules/xcos/images/palettes/EXPRESSION.png differ
index 9923484..bf1ef8f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTRACT.png and b/scilab/modules/xcos/images/palettes/EXTRACT.png differ
index c279514..eb1d620 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTRACTBITS.png and b/scilab/modules/xcos/images/palettes/EXTRACTBITS.png differ
index 6b6aedc..3ac3ec6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTRACTOR.png and b/scilab/modules/xcos/images/palettes/EXTRACTOR.png differ
index 17a1a28..7ef2715 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTTRI.png and b/scilab/modules/xcos/images/palettes/EXTTRI.png differ
index 8b3019f..88ff335 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Extract_Activation.png and b/scilab/modules/xcos/images/palettes/Extract_Activation.png differ
index 02bdb1e..0366132 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/FROMWSB.png and b/scilab/modules/xcos/images/palettes/FROMWSB.png differ
index 7884690..1ac0150 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GENERAL_f.png and b/scilab/modules/xcos/images/palettes/GENERAL_f.png differ
index a2105e6..d6d9e6d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GENSIN_f.png and b/scilab/modules/xcos/images/palettes/GENSIN_f.png differ
index 0331946..dd69db7 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GENSQR_f.png and b/scilab/modules/xcos/images/palettes/GENSQR_f.png differ
index eb1b703..763fcb8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GotoTagVisibility.png and b/scilab/modules/xcos/images/palettes/GotoTagVisibility.png differ
index 07a266b..565d7b2 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Ground.png and b/scilab/modules/xcos/images/palettes/Ground.png differ
index 8c94bb9..3e0ee63 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Gyrator.png and b/scilab/modules/xcos/images/palettes/Gyrator.png differ
index e4f5077..884c8d9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/HALT_f.png and b/scilab/modules/xcos/images/palettes/HALT_f.png differ
index 0d20e56..4a2aa11 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/HYSTHERESIS.png and b/scilab/modules/xcos/images/palettes/HYSTHERESIS.png differ
index 715ce00..0c4a380 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/IFTHEL_f.png and b/scilab/modules/xcos/images/palettes/IFTHEL_f.png differ
index 3efea94..e9cac3e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INTEGRAL_f.png and b/scilab/modules/xcos/images/palettes/INTEGRAL_f.png differ
index 2b866d0..18ed3a4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INTEGRAL_m.png and b/scilab/modules/xcos/images/palettes/INTEGRAL_m.png differ
index 9226063..ca90277 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INTMUL.png and b/scilab/modules/xcos/images/palettes/INTMUL.png differ
index 90597d3..f3c8035 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INTRP2BLK_f.png and b/scilab/modules/xcos/images/palettes/INTRP2BLK_f.png differ
index 602eebd..fc046a5 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INTRPLBLK_f.png and b/scilab/modules/xcos/images/palettes/INTRPLBLK_f.png differ
index b3303b6..a602e44 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INVBLK.png and b/scilab/modules/xcos/images/palettes/INVBLK.png differ
index af051ab..35553a1 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ISELECT_m.png and b/scilab/modules/xcos/images/palettes/ISELECT_m.png differ
index 63973a9..a5aa67c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/IdealTransformer.png and b/scilab/modules/xcos/images/palettes/IdealTransformer.png differ
index e86909b..671c64d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Inductor.png and b/scilab/modules/xcos/images/palettes/Inductor.png differ
index dec7bc2..9c885bb 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/JKFLIPFLOP.png and b/scilab/modules/xcos/images/palettes/JKFLIPFLOP.png differ
index 353c101..5418478 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOGBLK_f.png and b/scilab/modules/xcos/images/palettes/LOGBLK_f.png differ
index 0eb7755..fef8fe8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOGIC.png and b/scilab/modules/xcos/images/palettes/LOGIC.png differ
index 3b36811..3c568f4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOGICAL_OP.png and b/scilab/modules/xcos/images/palettes/LOGICAL_OP.png differ
index 615fa18..92cfb50 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOOKUP_f.png and b/scilab/modules/xcos/images/palettes/LOOKUP_f.png differ
index 927fddb..d7b775a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATBKSL.png and b/scilab/modules/xcos/images/palettes/MATBKSL.png differ
index b420639..483c584 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATCATH.png and b/scilab/modules/xcos/images/palettes/MATCATH.png differ
index cd72c22..88aa302 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATCATV.png and b/scilab/modules/xcos/images/palettes/MATCATV.png differ
index deddc3d..0d03a79 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATDET.png and b/scilab/modules/xcos/images/palettes/MATDET.png differ
index 5c47035..d382ee4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATDIAG.png and b/scilab/modules/xcos/images/palettes/MATDIAG.png differ
index e4a84ee..a93eafa 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATDIV.png and b/scilab/modules/xcos/images/palettes/MATDIV.png differ
index 3e935fc..84be08a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATEIG.png and b/scilab/modules/xcos/images/palettes/MATEIG.png differ
index 9903d5a..4a46f76 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATEXPM.png and b/scilab/modules/xcos/images/palettes/MATEXPM.png differ
index 1400c74..39e0d01 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATINV.png and b/scilab/modules/xcos/images/palettes/MATINV.png differ
index 0344bbd..a59cb85 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATLU.png and b/scilab/modules/xcos/images/palettes/MATLU.png differ
index 270cdf5..5248f2f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATMAGPHI.png and b/scilab/modules/xcos/images/palettes/MATMAGPHI.png differ
index dde42a1..678e864 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATMUL.png and b/scilab/modules/xcos/images/palettes/MATMUL.png differ
index 92ad7d3..08b28c4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATPINV.png and b/scilab/modules/xcos/images/palettes/MATPINV.png differ
index 6c803fb..6805f6c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATRESH.png and b/scilab/modules/xcos/images/palettes/MATRESH.png differ
index f69bb00..3a4ca22 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATSING.png and b/scilab/modules/xcos/images/palettes/MATSING.png differ
index c1633a8..212962e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATSUM.png and b/scilab/modules/xcos/images/palettes/MATSUM.png differ
index 2665e51..d6c8874 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATTRAN.png and b/scilab/modules/xcos/images/palettes/MATTRAN.png differ
index 45f26ee..dd9f844 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATZCONJ.png and b/scilab/modules/xcos/images/palettes/MATZCONJ.png differ
index 8822da2..22d006d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATZREIM.png and b/scilab/modules/xcos/images/palettes/MATZREIM.png differ
index aea305b..42cfb36 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MAXMIN.png and b/scilab/modules/xcos/images/palettes/MAXMIN.png differ
index a39270c..95c6424 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MAX_f.png and b/scilab/modules/xcos/images/palettes/MAX_f.png differ
index 945876b..f7545c6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MBLOCK.png and b/scilab/modules/xcos/images/palettes/MBLOCK.png differ
index 90992bd..62dcb89 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MCLOCK_f.png and b/scilab/modules/xcos/images/palettes/MCLOCK_f.png differ
index d89146d..33d2521 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MFCLCK_f.png and b/scilab/modules/xcos/images/palettes/MFCLCK_f.png differ
index 298e5ec..d9bf0a0 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MIN_f.png and b/scilab/modules/xcos/images/palettes/MIN_f.png differ
index f9903b8..01b8da8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MUX.png and b/scilab/modules/xcos/images/palettes/MUX.png differ
index cc607ce..0aaf738 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/M_SWITCH.png and b/scilab/modules/xcos/images/palettes/M_SWITCH.png differ
index c0385b2..78b2ac8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/M_freq.png and b/scilab/modules/xcos/images/palettes/M_freq.png differ
index ca80c27..2a958aa 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Modulo_Count.png and b/scilab/modules/xcos/images/palettes/Modulo_Count.png differ
index 8df31fb..a2791e2 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/NEGTOPOS_f.png and b/scilab/modules/xcos/images/palettes/NEGTOPOS_f.png differ
index c44b7b3..8bc0fa5 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/NMOS.png and b/scilab/modules/xcos/images/palettes/NMOS.png differ
index 0612d8f..c7a738e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/NPN.png and b/scilab/modules/xcos/images/palettes/NPN.png differ
index c3e195b..d462434 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/NRMSOM_f.png and b/scilab/modules/xcos/images/palettes/NRMSOM_f.png differ
index d1e2e57..566fd1a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PDE.png and b/scilab/modules/xcos/images/palettes/PDE.png differ
index ec558b8..9f94a5e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PID.png and b/scilab/modules/xcos/images/palettes/PID.png differ
index 2e621aa..5a4885a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PMOS.png and b/scilab/modules/xcos/images/palettes/PMOS.png differ
index a865ac0..6f6d3cb 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PNP.png and b/scilab/modules/xcos/images/palettes/PNP.png differ
index 5ca11fc..87bab19 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/POSTONEG_f.png and b/scilab/modules/xcos/images/palettes/POSTONEG_f.png differ
index f7d7e8d..ce39bdc 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/POWBLK_f.png and b/scilab/modules/xcos/images/palettes/POWBLK_f.png differ
index 4cc49e8..68cf54b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PRODUCT.png and b/scilab/modules/xcos/images/palettes/PRODUCT.png differ
index 1ac8228..b404814 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PROD_f.png and b/scilab/modules/xcos/images/palettes/PROD_f.png differ
index db2e320..d718fd3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PerteDP.png and b/scilab/modules/xcos/images/palettes/PerteDP.png differ
index 63e8f4b..bd5f1ca 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PotentialSensor.png and b/scilab/modules/xcos/images/palettes/PotentialSensor.png differ
index 85ee7ba..637bcca 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PuitsP.png and b/scilab/modules/xcos/images/palettes/PuitsP.png differ
index 7d910c3..6778ba9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/QUANT_f.png and b/scilab/modules/xcos/images/palettes/QUANT_f.png differ
index fa3ffa4..ef910e2 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RAMP.png and b/scilab/modules/xcos/images/palettes/RAMP.png differ
index a5c4443..221bd3c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RAND_m.png and b/scilab/modules/xcos/images/palettes/RAND_m.png differ
index 88806ca..30ac0df 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RATELIMITER.png and b/scilab/modules/xcos/images/palettes/RATELIMITER.png differ
index 68bcaec..395304b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/READAU_f.png and b/scilab/modules/xcos/images/palettes/READAU_f.png differ
index 7cc8522..cb31a5d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/READC_f.png and b/scilab/modules/xcos/images/palettes/READC_f.png differ
index a2e6874..14db025 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/REGISTER.png and b/scilab/modules/xcos/images/palettes/REGISTER.png differ
index 854d8b3..d057009 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RELATIONALOP.png and b/scilab/modules/xcos/images/palettes/RELATIONALOP.png differ
index b8c63a3..65291e0 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RELAY_f.png and b/scilab/modules/xcos/images/palettes/RELAY_f.png differ
index 8970dbb..e9c7ceb 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RFILE_f.png and b/scilab/modules/xcos/images/palettes/RFILE_f.png differ
index c87d624..e3c0c56 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RICC.png and b/scilab/modules/xcos/images/palettes/RICC.png differ
index 3a9ca68..f57ec73 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ROOTCOEF.png and b/scilab/modules/xcos/images/palettes/ROOTCOEF.png differ
index b228ded..90d160d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Resistor.png and b/scilab/modules/xcos/images/palettes/Resistor.png differ
index 7ed700f..d308abe 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SAMPHOLD_m.png and b/scilab/modules/xcos/images/palettes/SAMPHOLD_m.png differ
index b6f04f3..80913ca 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SATURATION.png and b/scilab/modules/xcos/images/palettes/SATURATION.png differ
index 3245e98..cf65a83 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SAWTOOTH_f.png and b/scilab/modules/xcos/images/palettes/SAWTOOTH_f.png differ
index 75f6b6e..02ea836 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SELECT_m.png and b/scilab/modules/xcos/images/palettes/SELECT_m.png differ
index f3607f4..78abfb4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SHIFT.png and b/scilab/modules/xcos/images/palettes/SHIFT.png differ
index 201c276..715fa24 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SIGNUM.png and b/scilab/modules/xcos/images/palettes/SIGNUM.png differ
index 7829786..6ce4b66 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SINBLK_f.png and b/scilab/modules/xcos/images/palettes/SINBLK_f.png differ
index 34c33ba..bd23078 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SQRT.png and b/scilab/modules/xcos/images/palettes/SQRT.png differ
index b6cd899..e258569 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SRFLIPFLOP.png and b/scilab/modules/xcos/images/palettes/SRFLIPFLOP.png differ
index 00c05de..c4ae5a2 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/STEP_FUNCTION.png and b/scilab/modules/xcos/images/palettes/STEP_FUNCTION.png differ
index 9dbc6aa..ccaf2e8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SUBMAT.png and b/scilab/modules/xcos/images/palettes/SUBMAT.png differ
index e4c175d..fe3d1a6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SUMMATION.png and b/scilab/modules/xcos/images/palettes/SUMMATION.png differ
index 202a78c..cf9c5ba 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SUM_f.png and b/scilab/modules/xcos/images/palettes/SUM_f.png differ
index ddc9255..046071b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SUPER_f.png and b/scilab/modules/xcos/images/palettes/SUPER_f.png differ
index 11b0261..d83a32b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SWITCH2_m.png and b/scilab/modules/xcos/images/palettes/SWITCH2_m.png differ
index e603c0d..d6d54e3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SWITCH_f.png and b/scilab/modules/xcos/images/palettes/SWITCH_f.png differ
index 7e912f0..ff7f686 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SampleCLK.png and b/scilab/modules/xcos/images/palettes/SampleCLK.png differ
index 1f096cd..7a1127c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Sigbuilder.png and b/scilab/modules/xcos/images/palettes/Sigbuilder.png differ
index f155b18..2cfc99c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SourceP.png and b/scilab/modules/xcos/images/palettes/SourceP.png differ
index 7940bf7..8b2486b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Switch.png and b/scilab/modules/xcos/images/palettes/Switch.png differ
index 437bc29..99b71cf 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TANBLK_f.png and b/scilab/modules/xcos/images/palettes/TANBLK_f.png differ
index 381f122..bf195d4 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TCLSS.png and b/scilab/modules/xcos/images/palettes/TCLSS.png differ
index 9669cf5..80efac7 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TIME_DELAY.png and b/scilab/modules/xcos/images/palettes/TIME_DELAY.png differ
index 09eb0a2..7cf9741 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TIME_f.png and b/scilab/modules/xcos/images/palettes/TIME_f.png differ
index 1142e2d..9217fd9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TKSCALE.png and b/scilab/modules/xcos/images/palettes/TKSCALE.png differ
index 260bfb9..00248fd 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TOWS_c.png and b/scilab/modules/xcos/images/palettes/TOWS_c.png differ
index b7a5641..04edb86 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TRASH_f.png and b/scilab/modules/xcos/images/palettes/TRASH_f.png differ
index 57fb95d..b8c7f26 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TrigFun.png and b/scilab/modules/xcos/images/palettes/TrigFun.png differ
index ed2ff6e..208c090 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VARIABLE_DELAY.png and b/scilab/modules/xcos/images/palettes/VARIABLE_DELAY.png differ
index 82c3a9b..606ba48 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VanneReglante.png and b/scilab/modules/xcos/images/palettes/VanneReglante.png differ
index 36b59ce..c2171b5 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VariableResistor.png and b/scilab/modules/xcos/images/palettes/VariableResistor.png differ
index fc90bec..65fb55a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VoltageSensor.png and b/scilab/modules/xcos/images/palettes/VoltageSensor.png differ
index 8e58515..0d20906 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/WFILE_f.png and b/scilab/modules/xcos/images/palettes/WFILE_f.png differ
index 7d3b549..eaf7a4b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/WRITEAU_f.png and b/scilab/modules/xcos/images/palettes/WRITEAU_f.png differ
index 3583413..fd40326 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/WRITEC_f.png and b/scilab/modules/xcos/images/palettes/WRITEC_f.png differ
index 9ba1ba6..05e3d5c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ZCROSS_f.png and b/scilab/modules/xcos/images/palettes/ZCROSS_f.png differ
index fc7b018..3be6592 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/c_block.png and b/scilab/modules/xcos/images/palettes/c_block.png differ
index cdde3ae..4874f63 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/fortran_block.png and b/scilab/modules/xcos/images/palettes/fortran_block.png differ
index e0a4cf9..d9aae52 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/freq_div.png and b/scilab/modules/xcos/images/palettes/freq_div.png differ
index e7c87d5..0e6a98c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/generic_block3.png and b/scilab/modules/xcos/images/palettes/generic_block3.png differ
index f72a0a6..3b75df2 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/scifunc_block_m.png and b/scilab/modules/xcos/images/palettes/scifunc_block_m.png differ
index 4466bbf..a562727 100644 (file)
@@ -15,6 +15,8 @@ package org.scilab.modules.xcos.block.listener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.scilab.modules.types.scilabTypes.ScilabDouble;
 import org.scilab.modules.xcos.block.BasicBlock;
@@ -28,6 +30,7 @@ import org.scilab.modules.xcos.port.input.InputPort;
  */
 public class ProdPortLabelingListener implements PropertyChangeListener, Serializable {
        
+       private static final String NOT_PRINTED_LABEL = "×";
        private static ProdPortLabelingListener instance;
        
        /**
@@ -57,29 +60,71 @@ public class ProdPortLabelingListener implements PropertyChangeListener, Seriali
                final BasicBlock source = (BasicBlock) evt.getSource();
                final ScilabDouble data = (ScilabDouble) evt.getNewValue();
 
-               for (int i=0; i < source.getChildCount(); i++) {
+               /**
+                * Get the input port children
+                */
+               final List<InputPort> ports = new ArrayList<InputPort>();
+               for (int i = 0; i < source.getChildCount(); i++) {
                        final BasicPort port = (BasicPort) source.getChildAt(i);
                        
                        if (port instanceof InputPort) {
-                               
-                               final double gain;
-                               if (data.isEmpty()) {
-                                       gain = 1; 
-                               } else {
-                                       gain = data.getRealPart()[port.getOrdering() - 1][0]; 
+                               ports.add((InputPort) port);
+                       }
+               }
+
+               /**
+                * Set the ports labels
+                */
+               for (InputPort port : ports) {
+                       final double gain;
+                       
+                       if (data.isEmpty()) {
+                               gain = 1; 
+                       } else {
+                               gain = data.getRealPart()[port.getOrdering() - 1][0]; 
+                       }
+                       
+                       port.setValue(getLabel(gain));
+               }
+               
+               /**
+                * Check if all the values are equals to the default one.
+                */
+               boolean allPortIsDefaultLabel = true;
+               for (InputPort port : ports) {
+                       if (port.getValue() instanceof String) {
+                               String current = port.getValue().toString();
+                               if (!NOT_PRINTED_LABEL.equals(current)) {
+                                       allPortIsDefaultLabel = false;
+                                       break;
                                }
-                               
-                               port.setValue(getLabel(gain));
                        }
                }
+
+               if (!allPortIsDefaultLabel) {
+                       return;
+               }
                
+               /**
+                * When all values are equals to the default one, set it to the block
+                * and hide the children.
+                */
+               source.setValue(NOT_PRINTED_LABEL);
+               for (InputPort port : ports) {
+                       port.setValue("");
+               }
        }
        
+       /**
+        * Return the symbol for the gain value
+        * @param gain the current gain
+        * @return A label representing the gain
+        */
        private String getLabel(double gain) {
                if (gain > 0) {
-                       return "*";
+                       return NOT_PRINTED_LABEL;
                } else {
-                       return "/";
+                       return "÷";
                }
        }
 }
index a1b1558..28c851c 100644 (file)
@@ -15,6 +15,8 @@ package org.scilab.modules.xcos.block.listener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.scilab.modules.types.scilabTypes.ScilabDouble;
 import org.scilab.modules.xcos.block.BasicBlock;
@@ -28,6 +30,7 @@ import org.scilab.modules.xcos.port.input.InputPort;
  */
 public class SumPortLabelingListener implements PropertyChangeListener, Serializable {
        
+       private static final String NOT_PRINTED_LABEL = "+";
        private static SumPortLabelingListener instance;
        
        /**
@@ -57,27 +60,69 @@ public class SumPortLabelingListener implements PropertyChangeListener, Serializ
                final BasicBlock source = (BasicBlock) evt.getSource();
                final ScilabDouble data = (ScilabDouble) evt.getNewValue();
 
-               for (int i=0; i < source.getChildCount(); i++) {
+               /**
+                * Get the input port children
+                */
+               final List<InputPort> ports = new ArrayList<InputPort>();
+               for (int i = 0; i < source.getChildCount(); i++) {
                        final BasicPort port = (BasicPort) source.getChildAt(i);
                        
                        if (port instanceof InputPort) {
-                               
-                               final double gain;
-                               if (data.isEmpty()) {
-                                       gain = 1; 
-                               } else {
-                                       gain = data.getRealPart()[port.getOrdering() - 1][0]; 
+                               ports.add((InputPort) port);
+                       }
+               }
+
+               /**
+                * Set the ports labels
+                */
+               for (InputPort port : ports) {
+                       final double gain;
+                       
+                       if (data.isEmpty()) {
+                               gain = 1; 
+                       } else {
+                               gain = data.getRealPart()[port.getOrdering() - 1][0]; 
+                       }
+                       
+                       port.setValue(getLabel(gain));
+               }
+               
+               /**
+                * Check if all the values are equals to the default one.
+                */
+               boolean allPortIsDefaultLabel = true;
+               for (InputPort port : ports) {
+                       if (port.getValue() instanceof String) {
+                               String current = port.getValue().toString();
+                               if (!NOT_PRINTED_LABEL.equals(current)) {
+                                       allPortIsDefaultLabel = false;
+                                       break;
                                }
-                               
-                               port.setValue(getLabel(gain));
                        }
                }
+
+               if (!allPortIsDefaultLabel) {
+                       return;
+               }
                
+               /**
+                * When all values are equals to the default one, set it to the block
+                * and hide the children.
+                */
+               source.setValue(NOT_PRINTED_LABEL);
+               for (InputPort port : ports) {
+                       port.setValue("");
+               }
        }
        
+       /**
+        * Return the symbol for the gain value
+        * @param gain the current gain
+        * @return A label representing the gain
+        */
        private String getLabel(double gain) {
                if (gain > 0) {
-                       return "+";
+                       return NOT_PRINTED_LABEL; // "+"
                } else {
                        return "-";
                }
index a43c4c0..56b05e9 100644 (file)
@@ -29,7 +29,9 @@ public class RoundBlock extends BasicBlock {
        /**
         * Default constructor
         */
-       public RoundBlock() { }
+       public RoundBlock() {
+               super();
+       }
        
        /**
         * Set default values