Xcos: show possible parameters on blocks 39/4439/4
Clément DAVID [Mon, 11 Jul 2011 08:31:00 +0000 (10:31 +0200)]
Update Xcos-style.xml to handle more block parameters
Fix an NPE issue on wrong style description
Update all the images with JIMS:
    jimport("org.scilab.modules.xcos.palette.Palette")
    jinvoke(Palette, "generateAllPaletteImages")

Change-Id: I6af12197de1eaefff4e5ff4157c07a63cb27c8d2

211 files changed:
scilab/modules/xcos/etc/Xcos-style.xml
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/CLKFROM.png
scilab/modules/xcos/images/palettes/CLKGOTO.png
scilab/modules/xcos/images/palettes/CLKGotoTagVisibility.png
scilab/modules/xcos/images/palettes/CLKINV_f.png
scilab/modules/xcos/images/palettes/CLKOUTV_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_c.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/FROM.png
scilab/modules/xcos/images/palettes/FROMMO.png
scilab/modules/xcos/images/palettes/FROMWSB.png
scilab/modules/xcos/images/palettes/GAINBLK_f.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/GOTO.png
scilab/modules/xcos/images/palettes/GOTOMO.png
scilab/modules/xcos/images/palettes/GotoTagVisibility.png
scilab/modules/xcos/images/palettes/GotoTagVisibilityMO.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/INIMPL_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/IN_f.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/OUTIMPL_f.png
scilab/modules/xcos/images/palettes/OUT_f.png
scilab/modules/xcos/images/palettes/OpAmp.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/SineVoltage.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/VVsourceAC.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/VsourceAC.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/graph/XcosDiagram.java

index a72bf17..a88507f 100644 (file)
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/CLOCK_f.svg"/>
   </add>
   <add as="Modulo_Count" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
     <add as="displayedLabel" value="Counter&lt;BR&gt;Modulo %2$s"/>
   </add>
   <add as="Sigbuilder" extend="blockWithLabel">
     <add as="displayedLabel" value="TK Scale"/>
   </add>
   <add as="FROMWSB" extend="blockWithLabel">
-    <!-- FIXME : Show workspace under block  -->
+    <!-- FIXME: update label from parameters (not as exprs) -->
     <add as="displayedLabel" value="From workspace"/>
   </add>
   <!-- CONTINUOUS -->
     <add as="displayedLabel" value="Modelica&lt;BR;&gt;         generic"/>
   </add>
   <add as="FROMMO" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
     <add as="rounded" value="1"/>
     <add as="shape" value="rectangle"/>
+    <add as="displayedLabel" value="%s"/>
   </add>
   <add as="GOTOMO" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
     <add as="rounded" value="1"/>
     <add as="shape" value="rectangle"/>
+    <add as="displayedLabel" value="%s"/>
   </add>
   <add as="GotoTagVisibilityMO" extend="blockWithLabel">
-    <!-- TODO: icon to be verified -->
     <add as="displayedLabel" value="&lt;FONT SIZE=&quot;6&quot;&gt;{%s}&lt;/FONT&gt;"/>
     <add as="shape" value="ellipse"/>
     <add as="strokeColor" value="green"/>
   </add>
   <!-- INTEGER -->
   <add as="BITCLEAR" extend="blockWithLabel">
-    <add as="displayedLabel" value="Clear bit"/>
-    <!-- FIXME : Show parameters over block  -->
+    <add as="displayedLabel" value="Clear bit %2$s"/>
   </add>
   <add as="BITSET" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
-    <add as="displayedLabel" value="Set bit"/>
+    <add as="displayedLabel" value="Set bit %2$s"/>
   </add>
   <add as="CONVERT" extend="blockWithLabel">
+    <!-- FIXME: update label from parameters -->
     <add as="displayedLabel" value="Convert to"/>
-    <!-- FIXME : Show parameters over block  -->
   </add>
   <add as="EXTRACTBITS" extend="blockWithLabel">
-    <add as="displayedLabel" value="Extract Bits"/>
-    <!-- FIXME : Show parameters over block  -->
+    <add as="displayedLabel" value="Extract Bits %2$s"/>
   </add>
   <add as="INTMUL" extend="blockWithLabel">
     <add as="displayedLabel" value="INTMUL"/>
   </add>
   <add as="SHIFT" extend="blockWithLabel">
-    <add as="displayedLabel" value="Arithmetic&lt;BR&gt;         shift"/>
+    <add as="displayedLabel" value="Arithmetic&lt;BR&gt;         shift %2$s"/>
   </add>
   <add as="LOGIC" extend="blockWithLabel">
     <add as="displayedLabel" value="LOGIC"/>
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/CSCOPXY.svg"/>
   </add>
   <add as="TOWS_c" extend="blockWithLabel">
-    <!-- FIXME : Show workspace under block  -->
     <add as="displayedLabel" value="To workspace&lt;BR&gt;%2$s [%1$s]"/>
   </add>
   <add as="CMAT3D" extend="blockWithLabel">
     <add as="spacingRight" value="6"/>
   </add>
   <add as="EVTGEN_f" extend="blockWithLabel">
-    <add as="displayedLabel" value="Event at&lt;BR&gt;         time 0"/>
-    <!-- FIXME : Show parameters over block  -->
+    <add as="displayedLabel" value="Event at&lt;BR&gt;         time %s"/>
   </add>
   <add as="EVTVARDLY" extend="blockWithLabel">
     <add as="displayedLabel" value="Event&lt;BR&gt;         delay"/>
     <add as="displayedLabel" value="LOGICAL&lt;BR&gt;         AND"/>
   </add>
   <add as="EVTDLY_c" extend="blockWithLabel">
-    <add as="displayedLabel" value="Delay"/>
-    <!-- FIXME : Show parameters over block  -->
+    <add as="displayedLabel" value="Delay: %s"/>
   </add>
   <add as="CEVENTSCOPE" extend="Icon">
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/DSCOPE.svg"/>
     <add as="displayedLabel" value="Control&lt;BR&gt;         M_Port&lt;BR&gt;         Switch"/>
   </add>
   <add as="SWITCH_f" extend="blockWithLabel">
-    <add as="displayedLabel" value="SWITCH&lt;BR&gt;         1"/>
-    <!-- FIXME : Show parameters over block  -->
+    <add as="displayedLabel" value="SWITCH&lt;BR&gt;         %1$s"/>
   </add>
   <add as="SWITCH2_m" extend="blockWithLabel">
     <add as="displayedLabel" value="SWITCH"/>
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/Diode.svg"/>
   </add>
   <add as="VsourceAC" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
     <add as="shape" value="ellipse"/>
     <add as="perimeter" value="ellipsePerimeter"/>
     <add as="textAlign" value="center"/>
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/PNP.svg"/>
   </add>
   <add as="SineVoltage" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
     <add as="shape" value="ellipse"/>
     <add as="perimeter" value="ellipsePerimeter"/>
     <add as="displayedLabel" value="%s V&lt;br/&gt;~"/>
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/DEADBAND.svg"/>
   </add>
   <add as="Counter" extend="blockWithLabel">
-    <!-- FIXME : Show parameters over block  -->
     <add as="displayedLabel" value="Counter&lt;BR&gt;%s &amp;#8594; %s"/>
   </add>
   <add as="CLOCK_f" extend="Icon">
index 465d99b..1695bbd 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 46bc7b3..c48a495 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 123ce31..3d58eff 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ANDBLK.png and b/scilab/modules/xcos/images/palettes/ANDBLK.png differ
index c8de3be..dbd4aab 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 a704382..60e758a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/AUTOMAT.png and b/scilab/modules/xcos/images/palettes/AUTOMAT.png differ
index 0e415e4..abdfbeb 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BACKLASH.png and b/scilab/modules/xcos/images/palettes/BACKLASH.png differ
index 7e193c7..226e4a0 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 05c5de8..36bc5b3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BITCLEAR.png and b/scilab/modules/xcos/images/palettes/BITCLEAR.png differ
index db2f810..d189d87 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BITSET.png and b/scilab/modules/xcos/images/palettes/BITSET.png differ
index a59d1d6..f2d8c45 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BOUNCE.png and b/scilab/modules/xcos/images/palettes/BOUNCE.png differ
index e4b0789..f0f7189 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BOUNCEXY.png and b/scilab/modules/xcos/images/palettes/BOUNCEXY.png differ
index e657cb1..8881978 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/BPLATFORM.png and b/scilab/modules/xcos/images/palettes/BPLATFORM.png differ
index d6c5787..b14f0a3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Bache.png and b/scilab/modules/xcos/images/palettes/Bache.png differ
index e4b0789..f0f7189 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CANIMXY.png and b/scilab/modules/xcos/images/palettes/CANIMXY.png differ
index 2a8dfc7..873614d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CANIMXY3D.png and b/scilab/modules/xcos/images/palettes/CANIMXY3D.png differ
index 135a6a5..c43391f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CBLOCK.png and b/scilab/modules/xcos/images/palettes/CBLOCK.png differ
index a6a84d0..4712430 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CCS.png and b/scilab/modules/xcos/images/palettes/CCS.png differ
index b509174..c71a194 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CEVENTSCOPE.png and b/scilab/modules/xcos/images/palettes/CEVENTSCOPE.png differ
index 2d0a6ea..c598852 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CFSCOPE.png and b/scilab/modules/xcos/images/palettes/CFSCOPE.png differ
index f163c21..8e62c7e 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 c5c96ea..83b1026 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLKFROM.png and b/scilab/modules/xcos/images/palettes/CLKFROM.png differ
index b41f90f..5ef375c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLKGOTO.png and b/scilab/modules/xcos/images/palettes/CLKGOTO.png differ
index b39bd80..db8cc2c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLKGotoTagVisibility.png and b/scilab/modules/xcos/images/palettes/CLKGotoTagVisibility.png differ
index 06888b8..58116a0 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLKINV_f.png and b/scilab/modules/xcos/images/palettes/CLKINV_f.png differ
index e8d5a55..f846a66 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLKOUTV_f.png and b/scilab/modules/xcos/images/palettes/CLKOUTV_f.png differ
index 7babffa..e366d0d 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 05bea29..e83ee6c 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 83dbc4e..816b6b6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLR.png and b/scilab/modules/xcos/images/palettes/CLR.png differ
index 7a931f4..188c463 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CLSS.png and b/scilab/modules/xcos/images/palettes/CLSS.png differ
index 3040004..583af51 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CMAT3D.png and b/scilab/modules/xcos/images/palettes/CMAT3D.png differ
index cb50e03..6a1841a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CMATVIEW.png and b/scilab/modules/xcos/images/palettes/CMATVIEW.png differ
index 589a0c4..4c4e677 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CMSCOPE.png and b/scilab/modules/xcos/images/palettes/CMSCOPE.png differ
index 480b0e3..0c1c27c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CONSTRAINT_c.png and b/scilab/modules/xcos/images/palettes/CONSTRAINT_c.png differ
index 3274f27..97cb6c5 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 f4c0dfc..4c530cd 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CONVERT.png and b/scilab/modules/xcos/images/palettes/CONVERT.png differ
index 78719f1..f881424 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 84d9cf9..9584f90 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CSCOPE.png and b/scilab/modules/xcos/images/palettes/CSCOPE.png differ
index d238c42..6205dc3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CSCOPXY.png and b/scilab/modules/xcos/images/palettes/CSCOPXY.png differ
index 3ecbdc9..331a66a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CSCOPXY3D.png and b/scilab/modules/xcos/images/palettes/CSCOPXY3D.png differ
index 933dcef..ab5810f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CUMSUM.png and b/scilab/modules/xcos/images/palettes/CUMSUM.png differ
index 723ad4a..0b38f8f 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 7eb5c7c..2888153 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CVS.png and b/scilab/modules/xcos/images/palettes/CVS.png differ
index 1518dd1..4c9e046 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Capacitor.png and b/scilab/modules/xcos/images/palettes/Capacitor.png differ
index cef483f..8c865af 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ConstantVoltage.png and b/scilab/modules/xcos/images/palettes/ConstantVoltage.png differ
index c86d522..bdf9a00 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Counter.png and b/scilab/modules/xcos/images/palettes/Counter.png differ
index 39e6623..6d3e03e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/CurrentSensor.png and b/scilab/modules/xcos/images/palettes/CurrentSensor.png differ
index 7929007..cc5207d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DEADBAND.png and b/scilab/modules/xcos/images/palettes/DEADBAND.png differ
index 58088a7..25b0671 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 eaac3f6..4014617 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 4a43c8d..cda2e2b 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 de4f7b7..9a984e2 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DEMUX.png and b/scilab/modules/xcos/images/palettes/DEMUX.png differ
index 30683ce..967fe1f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DERIV.png and b/scilab/modules/xcos/images/palettes/DERIV.png differ
index f9cab5e..bb40833 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DFLIPFLOP.png and b/scilab/modules/xcos/images/palettes/DFLIPFLOP.png differ
index 0396530..dea1bf2 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 5a666e1..972271e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLATCH.png and b/scilab/modules/xcos/images/palettes/DLATCH.png differ
index ee85cb6..a053735 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLR.png and b/scilab/modules/xcos/images/palettes/DLR.png differ
index 5a707e7..d9de88e 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 3c754b3..36e5c08 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/DLSS.png and b/scilab/modules/xcos/images/palettes/DLSS.png differ
index 2998f6b..012f0af 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 f66b52a..46d6415 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Diode.png and b/scilab/modules/xcos/images/palettes/Diode.png differ
index 2422cce..3690ee1 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 c293be6..238dc06 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ENDBLK.png and b/scilab/modules/xcos/images/palettes/ENDBLK.png differ
index 6b963ac..1119be3 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 60e4fe9..0e11d3d 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 c287ad0..ba2b7da 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 4fee791..e2d298a 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 a7301bb..80904a7 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EVTVARDLY.png and b/scilab/modules/xcos/images/palettes/EVTVARDLY.png differ
index 69ef2d9..1e119c7 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 db9e7bd..2dff87a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXPRESSION.png and b/scilab/modules/xcos/images/palettes/EXPRESSION.png differ
index 404dbc5..7b22ed8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTRACT.png and b/scilab/modules/xcos/images/palettes/EXTRACT.png differ
index 1df7aa4..3180362 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTRACTBITS.png and b/scilab/modules/xcos/images/palettes/EXTRACTBITS.png differ
index abdd0bc..7fe8e1c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTRACTOR.png and b/scilab/modules/xcos/images/palettes/EXTRACTOR.png differ
index 2ee954b..b5b685e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/EXTTRI.png and b/scilab/modules/xcos/images/palettes/EXTTRI.png differ
index 15a8a23..a4bd3af 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 885c574..bfad61a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/FROM.png and b/scilab/modules/xcos/images/palettes/FROM.png differ
index 26d2000..8449a83 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/FROMMO.png and b/scilab/modules/xcos/images/palettes/FROMMO.png differ
index a1e9166..b901c6b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/FROMWSB.png and b/scilab/modules/xcos/images/palettes/FROMWSB.png differ
index 8bd87e8..d4f8479 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GAINBLK_f.png and b/scilab/modules/xcos/images/palettes/GAINBLK_f.png differ
index 329d41f..cb8c3e5 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 51961ab..c8973dc 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 da98a39..0124644 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 3f83a69..35272b3 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GOTO.png and b/scilab/modules/xcos/images/palettes/GOTO.png differ
index f50ecc7..d569d59 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GOTOMO.png and b/scilab/modules/xcos/images/palettes/GOTOMO.png differ
index 9206d1d..3d1adcc 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GotoTagVisibility.png and b/scilab/modules/xcos/images/palettes/GotoTagVisibility.png differ
index 68a863e..4d2b87a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/GotoTagVisibilityMO.png and b/scilab/modules/xcos/images/palettes/GotoTagVisibilityMO.png differ
index 8453471..254fea8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Ground.png and b/scilab/modules/xcos/images/palettes/Ground.png differ
index 79f6eed..fa8fc57 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Gyrator.png and b/scilab/modules/xcos/images/palettes/Gyrator.png differ
index 413e773..1ab90e1 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 a33a109..e22e09b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/HYSTHERESIS.png and b/scilab/modules/xcos/images/palettes/HYSTHERESIS.png differ
index 1a17ea2..02a2c6b 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 a32df00..30d8be7 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INIMPL_f.png and b/scilab/modules/xcos/images/palettes/INIMPL_f.png differ
index c1bd006..e53491b 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 d787862..694a79c 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 7ce481d..7da7c6e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INTMUL.png and b/scilab/modules/xcos/images/palettes/INTMUL.png differ
index fe75b27..bcf60ad 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 9227adc..438812a 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 50e6978..1f0d285 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/INVBLK.png and b/scilab/modules/xcos/images/palettes/INVBLK.png differ
index 97baea3..4bf1466 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/IN_f.png and b/scilab/modules/xcos/images/palettes/IN_f.png differ
index 12040b8..2a7831a 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 6004508..1399449 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/IdealTransformer.png and b/scilab/modules/xcos/images/palettes/IdealTransformer.png differ
index f6d3e81..6b89bb7 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Inductor.png and b/scilab/modules/xcos/images/palettes/Inductor.png differ
index 435d9da..a41b03f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/JKFLIPFLOP.png and b/scilab/modules/xcos/images/palettes/JKFLIPFLOP.png differ
index 940d0d9..e236afc 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 c5fb72a..f171589 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/LOGIC.png and b/scilab/modules/xcos/images/palettes/LOGIC.png differ
index 39d34ad..56bad13 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 f4c9335..59c40ad 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 589b6e3..015010f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATBKSL.png and b/scilab/modules/xcos/images/palettes/MATBKSL.png differ
index af7bb95..2ccb020 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATCATH.png and b/scilab/modules/xcos/images/palettes/MATCATH.png differ
index 77e1cd7..b6c9279 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATCATV.png and b/scilab/modules/xcos/images/palettes/MATCATV.png differ
index b40b520..fc95d45 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATDET.png and b/scilab/modules/xcos/images/palettes/MATDET.png differ
index c3f30dc..0b6a6ec 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATDIAG.png and b/scilab/modules/xcos/images/palettes/MATDIAG.png differ
index 9b80527..48d151d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATDIV.png and b/scilab/modules/xcos/images/palettes/MATDIV.png differ
index a2e3fd6..baf2faf 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATEIG.png and b/scilab/modules/xcos/images/palettes/MATEIG.png differ
index 316d09e..2b4b184 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATEXPM.png and b/scilab/modules/xcos/images/palettes/MATEXPM.png differ
index 210fdaa..7819723 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATINV.png and b/scilab/modules/xcos/images/palettes/MATINV.png differ
index 077346f..e6f282b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATLU.png and b/scilab/modules/xcos/images/palettes/MATLU.png differ
index d3619e7..f4c4f13 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATMAGPHI.png and b/scilab/modules/xcos/images/palettes/MATMAGPHI.png differ
index 1312851..130ab03 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATMUL.png and b/scilab/modules/xcos/images/palettes/MATMUL.png differ
index f4a1c6f..c28f9ec 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATPINV.png and b/scilab/modules/xcos/images/palettes/MATPINV.png differ
index 81d36a3..0623bc6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATRESH.png and b/scilab/modules/xcos/images/palettes/MATRESH.png differ
index 7b6735b..5d5a09f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATSING.png and b/scilab/modules/xcos/images/palettes/MATSING.png differ
index b3addad..db4aa22 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATSUM.png and b/scilab/modules/xcos/images/palettes/MATSUM.png differ
index e4aee4d..5cf39eb 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATTRAN.png and b/scilab/modules/xcos/images/palettes/MATTRAN.png differ
index 603e781..1851fa8 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATZCONJ.png and b/scilab/modules/xcos/images/palettes/MATZCONJ.png differ
index ea4554b..1c6ed23 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MATZREIM.png and b/scilab/modules/xcos/images/palettes/MATZREIM.png differ
index 75cb05c..288f45e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MAXMIN.png and b/scilab/modules/xcos/images/palettes/MAXMIN.png differ
index 215341c..ca74256 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 7f890e6..54b8b23 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MBLOCK.png and b/scilab/modules/xcos/images/palettes/MBLOCK.png differ
index a0efcca..5fa09e7 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 19b4f74..a88abe9 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 e48e3c6..ec3361f 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 7f9bcf3..d6d714d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/MUX.png and b/scilab/modules/xcos/images/palettes/MUX.png differ
index 394c234..c3fe68e 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 3b3af0e..a0cb12f 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 be07d1f..24bcba6 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 7def0c7..47e7ce0 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 ae842b3..761f695 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/NMOS.png and b/scilab/modules/xcos/images/palettes/NMOS.png differ
index 10d06fe..42af0ec 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/NPN.png and b/scilab/modules/xcos/images/palettes/NPN.png differ
index e9acb35..2712dfb 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 f8d4dc3..92b4f4f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/OUTIMPL_f.png and b/scilab/modules/xcos/images/palettes/OUTIMPL_f.png differ
index 8a4af8b..4cd2cc6 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/OUT_f.png and b/scilab/modules/xcos/images/palettes/OUT_f.png differ
index a3bd1b4..b539fed 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/OpAmp.png and b/scilab/modules/xcos/images/palettes/OpAmp.png differ
index 3099101..6bc3389 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PDE.png and b/scilab/modules/xcos/images/palettes/PDE.png differ
index 59adf7e..96c275e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PID.png and b/scilab/modules/xcos/images/palettes/PID.png differ
index 92fe2ae..2021978 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PMOS.png and b/scilab/modules/xcos/images/palettes/PMOS.png differ
index c36e72a..75d2a4e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PNP.png and b/scilab/modules/xcos/images/palettes/PNP.png differ
index 928c7d7..e87c289 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 ad885ed..f0f31ed 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 8961c77..c040a1d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PRODUCT.png and b/scilab/modules/xcos/images/palettes/PRODUCT.png differ
index 84d5fdf..396365a 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 38a8399..195693b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PerteDP.png and b/scilab/modules/xcos/images/palettes/PerteDP.png differ
index ef5bc1f..09593d9 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PotentialSensor.png and b/scilab/modules/xcos/images/palettes/PotentialSensor.png differ
index 90412fc..8ebe42f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/PuitsP.png and b/scilab/modules/xcos/images/palettes/PuitsP.png differ
index 6251881..1e4a8f8 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 496a357..57b7703 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RAMP.png and b/scilab/modules/xcos/images/palettes/RAMP.png differ
index d4b937b..4b2179c 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 f1acbd5..6777770 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RATELIMITER.png and b/scilab/modules/xcos/images/palettes/RATELIMITER.png differ
index e3821be..6eee394 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 31bc9e1..e0e8145 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 fed7dba..1b19075 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/REGISTER.png and b/scilab/modules/xcos/images/palettes/REGISTER.png differ
index affb99e..e4e6781 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RELATIONALOP.png and b/scilab/modules/xcos/images/palettes/RELATIONALOP.png differ
index 69026ac..9105e2b 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 d948011..3a829e7 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 07a44f2..c54a096 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/RICC.png and b/scilab/modules/xcos/images/palettes/RICC.png differ
index 4d8ae1b..ff7c928 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/ROOTCOEF.png and b/scilab/modules/xcos/images/palettes/ROOTCOEF.png differ
index c79a4c1..1832a6e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Resistor.png and b/scilab/modules/xcos/images/palettes/Resistor.png differ
index 89ffc9e..8a3232c 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 bd8da14..e4c9a50 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SATURATION.png and b/scilab/modules/xcos/images/palettes/SATURATION.png differ
index 30029e9..0f19c6e 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 d39f9ce..26cee62 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 f5b2e79..b887f9b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SHIFT.png and b/scilab/modules/xcos/images/palettes/SHIFT.png differ
index c9a2ce7..7f17341 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SIGNUM.png and b/scilab/modules/xcos/images/palettes/SIGNUM.png differ
index 1a5c43e..862c102 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 1c9872c..afb968f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SQRT.png and b/scilab/modules/xcos/images/palettes/SQRT.png differ
index c5dedec..bade482 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SRFLIPFLOP.png and b/scilab/modules/xcos/images/palettes/SRFLIPFLOP.png differ
index 39a1beb..f197dc0 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 b66b41a..819470f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SUBMAT.png and b/scilab/modules/xcos/images/palettes/SUBMAT.png differ
index 0163d95..88f248d 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SUMMATION.png and b/scilab/modules/xcos/images/palettes/SUMMATION.png differ
index 7f795bb..8458fd8 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 4f9fdef..8e4069d 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 3006a90..ad2f1b6 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 83b3502..6541f6f 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 7308808..92ea94c 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SampleCLK.png and b/scilab/modules/xcos/images/palettes/SampleCLK.png differ
index cd6267f..85b60ce 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Sigbuilder.png and b/scilab/modules/xcos/images/palettes/Sigbuilder.png differ
index d723cf7..39a2b0b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SineVoltage.png and b/scilab/modules/xcos/images/palettes/SineVoltage.png differ
index 554f1da..edd7dd5 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/SourceP.png and b/scilab/modules/xcos/images/palettes/SourceP.png differ
index 043a7aa..366db22 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/Switch.png and b/scilab/modules/xcos/images/palettes/Switch.png differ
index 9fdccb6..adf141f 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 88bbc32..07f6d44 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TCLSS.png and b/scilab/modules/xcos/images/palettes/TCLSS.png differ
index 0cbcd8a..b67bc09 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 ce4715e..80b00e2 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 29aa6fa..c64e787 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TKSCALE.png and b/scilab/modules/xcos/images/palettes/TKSCALE.png differ
index 011590a..a580656 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 16866a0..3eb3864 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 a6c4bfe..003f61e 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/TrigFun.png and b/scilab/modules/xcos/images/palettes/TrigFun.png differ
index 38bc7f5..3bac47f 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VVsourceAC.png and b/scilab/modules/xcos/images/palettes/VVsourceAC.png differ
index c7a67fe..72b8e20 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VanneReglante.png and b/scilab/modules/xcos/images/palettes/VanneReglante.png differ
index 35ee489..1605ece 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VariableResistor.png and b/scilab/modules/xcos/images/palettes/VariableResistor.png differ
index 11a7f75..9b6c66a 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VoltageSensor.png and b/scilab/modules/xcos/images/palettes/VoltageSensor.png differ
index 59792db..a8b282b 100644 (file)
Binary files a/scilab/modules/xcos/images/palettes/VsourceAC.png and b/scilab/modules/xcos/images/palettes/VsourceAC.png differ
index 203e1fc..6bfcd3b 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 a9811e9..133f379 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 2a459eb..c700c81 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 2a953f4..00d8353 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 bd176e9..e98dc24 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 4e6c21c..b17a3ed 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 0eefb46..63dc814 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 164cc1d..99f532e 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 69b8d68..1415ec5 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 d723334..a4ac951 100644 (file)
@@ -1449,26 +1449,30 @@ public class XcosDiagram extends ScilabGraph {
         */
        @Override
        public String convertValueToString(Object cell) {
+               String ret = null;
+               
                if (cell != null) {
                        final Map<String, Object> style = getCellStyle(cell);
                        
                        final String customLabel = (String) style.get("displayedLabel");
                        if (customLabel != null && cell instanceof BasicBlock) {
                                try {
-                                       return String.format(customLabel, ((BasicBlock) cell).getExprsFormat());
+                                       ret = String.format(customLabel, ((BasicBlock) cell).getExprsFormat());
                                } catch (IllegalFormatException e) {
                                        LOG.error(e);
+                                       ret = customLabel;
                                }
                        } else {
                                final String label = super.convertValueToString(cell);
                                if (label.isEmpty() && cell instanceof BasicBlock) {
-                                       return ((BasicBlock) cell).getInterfaceFunctionName();
+                                       ret = ((BasicBlock) cell).getInterfaceFunctionName();
+                               } else {
+                                       ret = label;
                                }
-                               return label;
                        }
-                       
                }
-               return null;
+               
+               return ret;
        }
        
        /**