From: Vladislav TRUBKIN <uladzislau.trubkin@scilab-enterprises.com>
Date: Mon, 19 May 2014 11:43:16 +0000 (+0200)
Subject: Bug #12718 fixed - Modelica Generic block reshaped the output ports and the label... 
X-Git-Tag: 5.5.1~174
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=37ff8d3ed0de77efcd8c5447b01cef13f5b73b6c

Bug #12718 fixed - Modelica Generic block reshaped the output ports and the label was double-written.

Change-Id: I320f8d9c958a2672a99aeeabe1b138ab38f9b64c
---

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index af1e609..5162096 100644
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -61,6 +61,8 @@ Xcos Bug Fixes
 
 * Bug #11823 fixed - Ctrl+F2 shortcut did not work on a selected block.
 
+* Bug #12718 fixed - Modelica Generic block reshaped the output ports and the label was double-written.
+
 * Bug #12751 fixed - cdummy_ entry point was not found when using Code Generation.
 
 * Bug #13285 fixed - There was no appropriate example of the syntax for scifunc_block_m GUI
diff --git a/scilab/modules/helptools/images/BouncingBall_Modelica.zcos.png b/scilab/modules/helptools/images/BouncingBall_Modelica.zcos.png
index 7e8ab23..9323a5d 100644
Binary files a/scilab/modules/helptools/images/BouncingBall_Modelica.zcos.png and b/scilab/modules/helptools/images/BouncingBall_Modelica.zcos.png differ
diff --git a/scilab/modules/xcos/demos/ModelicaBlocks/BouncingBall_Modelica.zcos b/scilab/modules/xcos/demos/ModelicaBlocks/BouncingBall_Modelica.zcos
index 9b89396..f5f6f73 100644
Binary files a/scilab/modules/xcos/demos/ModelicaBlocks/BouncingBall_Modelica.zcos and b/scilab/modules/xcos/demos/ModelicaBlocks/BouncingBall_Modelica.zcos differ
diff --git a/scilab/modules/xcos/etc/Xcos-style.xml b/scilab/modules/xcos/etc/Xcos-style.xml
index 0fc668d..020458d 100644
--- a/scilab/modules/xcos/etc/Xcos-style.xml
+++ b/scilab/modules/xcos/etc/Xcos-style.xml
@@ -412,8 +412,8 @@
         <add as="displayedLabel" value="x  == %s&lt;br/&gt;x' == %s"/>
     </add>
     <!-- MODELICA -->
-    <add as="MBLOCK" extend="Icon">
-        <add as="image" value="$SCILAB/modules/xcos/images/blocks/Modelica.svg"/>
+    <add as="MBLOCK" extend="blockWithLabel">
+        <add as="displayedLabel" value="Modelica&lt;BR&gt; generic"/>
     </add>
     <add as="FROMMO" extend="blockWithLabel">
         <add as="shape" value="hexagon"/>
diff --git a/scilab/modules/xcos/images/blocks/Modelica.svg b/scilab/modules/xcos/images/blocks/Modelica.svg
deleted file mode 100644
index 30d70df..0000000
--- a/scilab/modules/xcos/images/blocks/Modelica.svg
+++ /dev/null
@@ -1,5 +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">
- <text y="15" x="0" font-size="9" font-family="sans-serif" fill="black">Modelica</text>
- <text y="30" x="0" font-size="9" font-family="sans-serif" fill="black">generic</text>
-</svg>