Xcos demos: refresh and update for the upcoming release

 * Plant discrete controller had a simulation issue with a Superblock,
it's possible to make it work after some GUI manipulation.
 * Hydraulics links have been aligned to the grid
 * AND Gate produced $\mathfs$ errors on loading
 * NOR Gate produced $\mathfs$ errors on loading

Change-Id: Ie137757082d6ba33cb81d94479d43733b3c15825

diff --git a/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci b/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
index b90749b..5b37f94 100644 (file)
--- a/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
+++ b/scilab/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
@@ -45,9 +45,6 @@ function [x,y,typ]= SineVoltage(job,arg1,arg2)
             graphics.exprs=exprs
             x.graphics=graphics;
             x.model=model
-            // Updating the label:
-            lab = "SineVoltage;displayedLabel=$\mathsf{\substack{"+exprs(1)+"\,V\\ \sim\,"+exprs(3)+"}}$"
-            x.graphics.style = lab;
             break
         end
     case "define" then

diff --git a/scilab/modules/xcos/demos/ModelicaBlocks/Hydraulics.zcos b/scilab/modules/xcos/demos/ModelicaBlocks/Hydraulics.zcos
index ed73057..464f613 100644 (file)
Binary files a/scilab/modules/xcos/demos/ModelicaBlocks/Hydraulics.zcos and b/scilab/modules/xcos/demos/ModelicaBlocks/Hydraulics.zcos differ

diff --git a/scilab/modules/xcos/demos/Plant_DiscreteController.zcos b/scilab/modules/xcos/demos/Plant_DiscreteController.zcos
index e626097..b4f57dc 100644 (file)
Binary files a/scilab/modules/xcos/demos/Plant_DiscreteController.zcos and b/scilab/modules/xcos/demos/Plant_DiscreteController.zcos differ

diff --git a/scilab/modules/xcos/etc/Xcos-style.xml b/scilab/modules/xcos/etc/Xcos-style.xml
index 20edcf4..2e56f50 100644 (file)
--- a/scilab/modules/xcos/etc/Xcos-style.xml
+++ b/scilab/modules/xcos/etc/Xcos-style.xml
@@ -859,7 +859,7 @@
     <add as="SineVoltage" extend="blockWithLabel">
         <add as="shape" value="ellipse"/>
         <add as="perimeter" value="ellipsePerimeter"/>
-        <add as="displayedLabel" value="$\mathsf{\substack{%s\,V\vphantom{%s}\\ \sim\,%s}}$"/>
+        <add as="displayedLabel" value="$\mathsf{\substack{%1$s\,V\\ \sim\,%3s}}$"/>
     </add>
     <add as="Switch" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/SWITCH.svg"/>