* Bug 15963 fixed: EXPRESSION block => Math palette 19/21419/3
Samuel GOUGEON [Thu, 21 Feb 2019 01:20:05 +0000 (02:20 +0100)]
  http://bugzilla.scilab.org/15963

Change-Id: I16968bcc30a280f2774b14a462eb43a21051fd47

scilab/CHANGES.md
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/EXPRESSION.zcos.png [new file with mode: 0644]
scilab/modules/scicos_blocks/macros/NonLinear/EXPRESSION.sci [moved from scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci with 100% similarity]
scilab/modules/xcos/etc/palettes.xml
scilab/modules/xcos/examples/mathoperations_pal/EXPRESSION.zcos [moved from scilab/modules/xcos/examples/userdefinedfunctions_pal/en_US/EXPRESSION_en_US.zcos with 100% similarity]
scilab/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml
scilab/modules/xcos/help/en_US/palettes/Mathoperations_pal/EXPRESSION.xml [moved from scilab/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/EXPRESSION.xml with 96% similarity]
scilab/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/AA_Userdefinedfunctions_pal.xml
scilab/modules/xcos/help/fr_FR/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml
scilab/modules/xcos/help/gui/mathoperations_pal/en_US/EXPRESSION_gui.png [moved from scilab/modules/xcos/help/gui/userdefinedfunctions_pal/en_US/EXPRESSION_gui.png with 100% similarity]

index 66fdc8a..f40be82 100644 (file)
@@ -508,6 +508,7 @@ Bug Fixes
 * [#15921](https://bugzilla.scilab.org/15921): Xcos user's function `scifunc_block_m` block: any `<` in the expression was not displayed on the block's icon.
 * [#15934](https://bugzilla.scilab.org/15934): The `^ hat` page wrongly indicated that `^` applied to a rectangular matrix not being a vector is done element-wise.
 * [#15948](https://bugzilla.scilab.org/15948): `xlabel`, `ylabel`, `zlabel` and `title` needed to be upgraded.
+* [#15963](https://bugzilla.scilab.org/15963): The `EXPRESSION` block was more expected in the Mathematical palette.
 * [#15964](https://bugzilla.scilab.org/15954): A complex empty sparse matrix could be obtained after insertion.
 * [#15965](https://bugzilla.scilab.org/15965): `plot(x,y)` did not accept y as encoded integers.
 * [#15967](https://bugzilla.scilab.org/15967): `setdiff(1,[])` was [] instead of `1`. `setdiff(a,[],..)` was not enough tested.
index 674e87c..ecfe3fd 100644 (file)
@@ -39,7 +39,7 @@ DERIV_1.png=c9f8cd048fb9c2d0f875e7cc783767cb
 DLATCH_1.png=7ec2ce7f1b895e38e22af86c75810c7b
 DLATCH_fr_FR_1.png=01fb9aa73f5b67deb46db79159a36bc1
 DOLLAR_f_1.png=0b10b9eb56f4f302b40722fc37f90152
-EXPRESSION_1.png=f63c889d3d4602b03a883497318fda61
+EXPRESSION_1.png=d29bf3b5d25b1e2250c459aaed1a7774
 GENSIN_f_1.png=e4e9107e33977bc2ec15c56eda72b817
 GENSQR_f_1.png=5d1882efbb97cbba3134b38ece4a3669
 Graphics_1.png=27c8486b418fbb7c6824eed71d033448
diff --git a/scilab/modules/helptools/images/EXPRESSION.zcos.png b/scilab/modules/helptools/images/EXPRESSION.zcos.png
new file mode 100644 (file)
index 0000000..98ecb12
Binary files /dev/null and b/scilab/modules/helptools/images/EXPRESSION.zcos.png differ
index 82a44ed..2d2a3d4 100644 (file)
             <block name="EXPBLK_m">
                 <icon variable="SCI" path="/modules/xcos/images/palettes/EXPBLK_m.png"/>
             </block>
+            <block name="EXPRESSION">
+                <icon variable="SCI" path="/modules/xcos/images/palettes/EXPRESSION.png"/>
+            </block>
             <block name="GAINBLK_f">
                 <icon variable="SCI" path="/modules/xcos/images/palettes/GAINBLK_f.png"/>
             </block>
             <block name="DEBUG">
                 <icon variable="SCI" path="/modules/xcos/images/palettes/DEBUG.png"/>
             </block>
-            <block name="EXPRESSION">
-                <icon variable="SCI" path="/modules/xcos/images/palettes/EXPRESSION.png"/>
-            </block>
             <block name="MBLOCK">
                 <icon variable="SCI" path="/modules/xcos/images/palettes/MBLOCK.png"/>
             </block>
index 21954cb..7361190 100644 (file)
             </inlinemediaobject>
             </link>.
 
+            <link linkend="EXPRESSION">
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata linkend="EXPRESSION" fileref="../../../../images/palettes/EXPRESSION.png"
+                     style="width:100px; padding:10px; border-style:solid; border-width:1px; border-color:#1e90ff;"/>
+                </imageobject>
+            </inlinemediaobject>
+            </link>.
+
             <link linkend="GAINBLK_f">
             <inlinemediaobject>
                 <imageobject>
                 <link linkend="EXPBLK_m">EXPBLK_m</link>
             </listitem>
             <listitem>
+                <link linkend="EXPRESSION">EXPRESSION</link>
+            </listitem>
+            <listitem>
                 <link linkend="GAINBLK_f">GAINBLK_f</link>
             </listitem>
             <listitem>
@@ -69,7 +69,7 @@
         <title>Parameters</title>
         <inlinemediaobject>
             <imageobject>
-                <imagedata fileref="../../../gui/userdefinedfunctions_pal/en_US/EXPRESSION_gui.png"
+                <imagedata fileref="../../../gui/mathoperations_pal/en_US/EXPRESSION_gui.png"
                            align="center" style="float:right"/>
                     <!-- align => Javahelp, style => Online -->
             </imageobject>
             <emphasis>y = u(1) - u(2) - u(3)</emphasis>
         </para>
         <para>
-            <link type="scilab" linkend="scilab.xcos/xcos/examples/userdefinedfunctions_pal/en_US/EXPRESSION_en_US.zcos">
+            <link type="scilab" linkend="scilab.xcos/xcos/examples/mathoperations_pal/EXPRESSION.zcos">
                 <inlinemediaobject>
                     <imageobject>
-                        <imagedata fileref="../../../../examples/userdefinedfunctions_pal/en_US/EXPRESSION_en_US.zcos" align="center"/>
+                        <imagedata fileref="../../../../examples/mathoperations_pal/EXPRESSION.zcos" align="center"/>
                     </imageobject>
                 </inlinemediaobject>
             </link>
         </para>
         <scilab:image><![CDATA[
-importXcosDiagram(SCI + "/modules/xcos/examples/userdefinedfunctions_pal/en_US/EXPRESSION_en_US.zcos");
+importXcosDiagram(SCI + "/modules/xcos/examples/mathoperations_pal/EXPRESSION.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
     </refsection>
@@ -268,7 +268,7 @@ xcos_simulate(scs_m, 4);
         <title>Interfacing function</title>
         <itemizedlist>
             <listitem>
-                <para> SCI/modules/scicos_blocks/macros/Misc/EXPRESSION.sci</para>
+                <para> SCI/modules/scicos_blocks/macros/NonLinear/EXPRESSION.sci</para>
             </listitem>
         </itemizedlist>
     </refsection>
index dae7f18..38e4460 100644 (file)
             </inlinemediaobject>
             </link>.
 
-            <link linkend="EXPRESSION">
-            <inlinemediaobject>
-                <imageobject>
-                    <imagedata linkend="EXPRESSION" fileref="../../../../images/palettes/EXPRESSION.png"
-                     style="width:100px; padding:10px; border-style:solid; border-width:1px; border-color:#1e90ff;"/>
-                </imageobject>
-            </inlinemediaobject>
-            </link>.
-
             <link linkend="MBLOCK">
             <inlinemediaobject>
                 <imageobject>
                 <link linkend="CBLOCK">CBLOCK</link>
             </listitem>
             <listitem>
-                <link linkend="EXPRESSION">EXPRESSION</link>
-            </listitem>
-            <listitem>
                 <link linkend="fortran_block">fortran_block</link>
             </listitem>
             <listitem>
index 64d334d..8f6adde 100644 (file)
             </inlinemediaobject>
             </link>.
 
+            <link linkend="EXPRESSION">
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata linkend="EXPRESSION" fileref="../../../../images/palettes/EXPRESSION.png"
+                     style="width:100px; padding:10px; border-style:solid; border-width:1px; border-color:#1e90ff;"/>
+                </imageobject>
+            </inlinemediaobject>
+            </link>.
+
             <link linkend="GAINBLK_f">
             <inlinemediaobject>
                 <imageobject>
                 <link linkend="EXPBLK_m">EXPBLK_m</link>
             </listitem>
             <listitem>
+                <link linkend="EXPRESSION">EXPRESSION</link>
+            </listitem>
+            <listitem>
                 <link linkend="GAINBLK_f">GAINBLK_f</link>
             </listitem>
             <listitem>