* Bug 10702 fixed: FROMWSB & TOWS_c icons show varname 25/21025/4
Samuel GOUGEON [Tue, 25 Jun 2019 20:13:41 +0000 (22:13 +0200)]
  http://bugzilla.scilab.org/10702

Change-Id: Ia727476ef772c25efdc3551c8417b8cee512abe8

scilab/CHANGES.md
scilab/modules/scicos_blocks/macros/Sources/FROMWSB.sci
scilab/modules/xcos/etc/Xcos-style.xml

index 9026b72..21bcd9a 100644 (file)
@@ -293,6 +293,7 @@ Bug Fixes
 * [#10092](https://bugzilla.scilab.org/10092): The left and right Kronecker divisions were not actually implemented nor documented.
 * [#10353](https://bugzilla.scilab.org/10353): Documentation: The referential for the uicontrol.position property was not provided. Moreover, `gca().axes_bounds` refered to `fig.figure_size` instead of `fig.axes_size`.
 * [#10553](https://bugzilla.scilab.org/10553): After calling `colorbar`, retrieving the handle of the new color bar was not trivial.
+* [#10702](https://bugzilla.scilab.org/10702): The icon of the FROMWSB xcos block did not show the name of the source variable.
 * [#10723](https://bugzilla.scilab.org/10723): `subplot`'s action was unclearly described in its help page. Page improved.
 * [#11852](https://bugzilla.scilab.org/11852): File browser didn't update after file creation or removal.
 * [#11363](https://bugzilla.scilab.org/11363): `show_window()` did not raise the current graphics window.
index 8df2027..df5e7d0 100644 (file)
@@ -104,7 +104,10 @@ function [x,y,typ] = FROMWSB(job,arg1,arg2)
             end
         end
         x=arg1
+        x.graphics.style = "FROMWSB;displayedLabel=From workspace<BR><font color=""orange"">[ <b>" + ..
+                             xxn.graphics.exprs(1) + "</b> ]</font>;align=center";
         typ=newpar
+
     case "define" then
         scs_m_1=scicos_diagram(..
         version="scicos4.2",..
index 8a2a33c..9a4d3b1 100644 (file)
         <add as="displayedLabel" value="TK Scale"/>
     </add>
     <add as="FROMWSB" extend="blockWithLabel">
-        <!-- FIXME: update label from parameters (not as exprs) -->
-        <add as="displayedLabel" value="From workspace"/>
-        <!--<add as="displayedLabel" value="$\mathsf{\substack{From workspace\\ \Large %s}}$"/> -->
+        <add as="displayedLabel" value="From workspace&lt;BR&gt;&lt;font color=&quot;orange&quot;&gt;[&lt;b&gt; V &lt;/b&gt;]&lt;/font&gt;"/>
+        <add as="align" value="center"/>
     </add>
     <!-- CONTINUOUS -->
     <add as="DERIV" extend="blockWithLabel">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/CSCOPXY.svg"/>
     </add>
     <add as="TOWS_c" extend="blockWithLabel">
-        <add as="displayedLabel" value="To workspace&lt;BR&gt;%2$s [%1$s]"/>
+        <add as="displayedLabel" value="To workspace&lt;BR&gt;&lt;font color=&quot;orange&quot;&gt;&lt;b&gt; %2$s [%1$s]&lt;/b&gt;&lt;/font&gt;"/>
+        <add as="align" value="center"/>
     </add>
     <add as="CMAT3D" extend="blockWithLabel">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/ASCOPE.svg"/>