* Bug 16108 fixed: CSCOPE & CMSCOPE Label&id now displayed 97/20997/6
Samuel GOUGEON [Mon, 3 Jun 2019 10:32:12 +0000 (12:32 +0200)]
  http://bugzilla.scilab.org/16108

Change-Id: I75cd5face463a38964db542abc582fa95c3b79cb

scilab/CHANGES.md
scilab/modules/scicos_blocks/macros/Sinks/CMSCOPE.sci
scilab/modules/scicos_blocks/macros/Sinks/CSCOPE.sci
scilab/modules/xcos/etc/Xcos-style.xml

index 08b5296..15162e4 100644 (file)
@@ -438,6 +438,7 @@ Bug Fixes
 * [#16097](https://bugzilla.scilab.org/16097): `coth` was more than twice slower than `1./tanh()`. `tanh` and `coth` did not accept sparse-encoded input.
 * [#16102](https://bugzilla.scilab.org/16102): `lstcat` could not concatenate input lists with mixed objects of types>10 like 1:$, sin, sind, struct, cells, tlists or mlists. In addition, it was slow for very long inputs lists.
 * [#16104](https://bugzilla.scilab.org/16104): `assert_checkequal` did not support properly or at all Nan and void in lists, Nan in sparse, implicit lists, macros, libraries, built-in functions, graphical handles. For input arrays or lists of matching typeof and sizes, the failure message did not display neither the index nor the values of the first mismatching elements.
+* [#16108](https://bugzilla.scilab.org/16108): For the CSCOPE and CMSCOPE blocks, the Label&id parameter entered in their interface were not displayed below the block's icon.
 * [#16111](https://bugzilla.scilab.org/16111): `isglobal` was not supporting non-scalar array of strings as input.
 * [#16118](https://bugzilla.scilab.org/16118): `%s <> (1+%s)` returned %F.
 * [#16120](https://bugzilla.scilab.org/16120): `tree_show` was broken cells within containers.
index b71530c..a75bb39 100644 (file)
@@ -73,7 +73,7 @@ function [x,y,typ] = CMSCOPE(job,arg1,arg2)
                 mess=[mess ; _("The Window number must be >= -1") ; " "]
             end
             if size(per,"*")<>size(ymin,"*") then
-                mess=[mess ; 
+                mess=[mess ;
                       _("The size of ''Refresh Periods'' must match the Ymin|Ymax''s one");
                       " "]
             end
@@ -123,6 +123,8 @@ function [x,y,typ] = CMSCOPE(job,arg1,arg2)
                 model.label=nom;
                 graphics.id=nom;
                 graphics.exprs=exprs;
+                graphics.style = "CMSCOPE;verticalLabelPosition=bottom;" + ..
+                                 "verticalAlign=top;spacing=2;displayedLabel=" + nom
                 x.graphics=graphics;
                 x.model=model
                 //pause;
index 8d28e0d..8339abe 100644 (file)
@@ -93,6 +93,8 @@ function [x,y,typ]=CSCOPE(job,arg1,arg2)
                 model.label=nom;
                 graphics.id=nom
                 graphics.exprs=exprs;
+                graphics.style = "CSCOPE;verticalLabelPosition=bottom;" + ..
+                   "verticalAlign=top;spacing=2;displayedLabel=" + nom
                 x.graphics=graphics;
                 x.model=model
                 break
index 9a4d3b1..d81da20 100644 (file)
     <add as="CANIMXY" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/3DSCOPE.svg"/>
     </add>
-    <add as="CSCOPE" extend="Icon">
+    <add as="CSCOPE" extend="blockWithLabel">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/ASCOPE.svg"/>
+        <add as="displayedLabel" value=""/>
     </add>
     <add as="SCALE_CSCOPE" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/SCALE_ASCOPE.svg"/>
         <add as="spacing" value="2"/>
         <add as="displayedLabel" value="Mat. View"/>
     </add>
-    <add as="CMSCOPE" extend="Icon">
+    <add as="CMSCOPE" extend="blockWithLabel">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/ASCOPE.svg"/>
+        <add as="displayedLabel" value=""/>
     </add>
     <add as="SCALE_CMSCOPE" extend="Icon">
         <add as="image" value="$SCILAB/modules/xcos/images/blocks/SCALE_ASCOPE.svg"/>