Bug #13391 fixed - scifunc_block_m help page was not clear about the block 26/14526/3
Vladislav TRUBKIN [Wed, 14 May 2014 09:48:45 +0000 (11:48 +0200)]
                   using. Added the example.

Change-Id: I148165581257f0eade8ce13cc3803f4e3a62c2ee

14 files changed:
scilab/CHANGES_5.5.X
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/_LaTeX_FROMWSB.xml_5.png
scilab/modules/helptools/images/_LaTeX_FROMWSB.xml_6.png
scilab/modules/helptools/images/_MathML_convol.xml_1.png
scilab/modules/helptools/images/_MathML_cspect.xml_1.png
scilab/modules/helptools/images/champ_2.png
scilab/modules/helptools/images/champ_3.png
scilab/modules/helptools/images/contour2d_2.png
scilab/modules/helptools/images/scifunc_block_m_1.png [new file with mode: 0644]
scilab/modules/helptools/images/scifunc_block_m_en_US.zcos.png [new file with mode: 0644]
scilab/modules/helptools/images/surf_2.png
scilab/modules/xcos/examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos [new file with mode: 0644]
scilab/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/scifunc_block_m.xml

index 6832dce..13b5d4c 100644 (file)
@@ -45,6 +45,9 @@ Xcos Bug Fixes
 * Bug #13385 fixed - TOWS_c and FROMWSB Xcos blocs needed better examples on how
                      to get or write a Scilab variable.
                      
+* Bug #13391 fixed - scifunc_block_m help page was not clear about the block using.
+                     Example has been added.  
+
 * Bug #13396 fixed - MBLOCK did not work with an external file containing the modelica class.
 
 
index c9484be..40f2501 100644 (file)
@@ -286,8 +286,8 @@ _LaTeX_FROMWSB.xml_1.png=feeff6ccf7aa5e2628deb23b59c1c759
 _LaTeX_FROMWSB.xml_2.png=89ac95276e337f7f5deb93198d6833b5
 _LaTeX_FROMWSB.xml_3.png=feeff6ccf7aa5e2628deb23b59c1c759
 _LaTeX_FROMWSB.xml_4.png=34e58a0bbafa0ba54a7640470bb2cb56
-_LaTeX_FROMWSB.xml_5.png=477562945adc8016ca3ea2a72d59c4f3
-_LaTeX_FROMWSB.xml_6.png=55eec060dcb110392536c63814ff45d4
+_LaTeX_FROMWSB.xml_5.png=12ceba0046931ee8cf25df2f71f06a57
+_LaTeX_FROMWSB.xml_6.png=edd38b21f4afb3b9bd3022d6594bc04d
 _LaTeX_GENSIN_f.xml_1.png=df7110d93d01f93f0b54d9aa298e9635
 _LaTeX_GENSQR_f.xml_1.png=746f663ac5f83b108763d9273b5f0e21
 _LaTeX_GENSQR_f.xml_2.png=aa318bdb2a27d84eca5689f9e78acaaf
@@ -607,8 +607,8 @@ _MathML_bvode.xml_9.png=3b57ed40251a3a9a66f84e960d45b517
 _MathML_bvode.xml_ru_RU_10.png=feaee80fc677920029dac0d5b539507a
 _MathML_bvode.xml_ru_RU_17.png=1f47e9a3a469e6f8e4fee9cefe7ccc38
 _MathML_bvode.xml_ru_RU_7.png=bf99445553185140244e57466f859bd5
-_MathML_convol.xml_1.png=3b1debed23e3457f489294cc74549833
-_MathML_cspect.xml_1.png=3f7ba8d110343602751677e185e63271
+_MathML_convol.xml_1.png=99ca156723e23394e879c2035745d736
+_MathML_cspect.xml_1.png=1219d0564561afe97ea367612399e26a
 _MathML_delip.xml_1.png=69d9a5b9453c4b10349d9c25e33f0a64
 _MathML_integrate.xml_1.png=905e696eacda4fe1df6c72b6bbb8a0d3
 _MathML_integrate.xml_2.png=e674adcfdb3435295438f0d040596095
@@ -730,8 +730,8 @@ cepstrum_1.png=455b8e394db80f8bb6fb8c656a069af3
 champ1_1.png=d2aacf45d80c8edf7c95a54af1533ce4
 champ1_2.png=bc00271f4944a350125eb5b3c40d48c1
 champ_1.png=c0e293f757cc87203308abb3d0bd5823
-champ_2.png=c0e293f757cc87203308abb3d0bd5823
-champ_3.png=83eb5af09a3e46812639bf482ce290e4
+champ_2.png=83eb5af09a3e46812639bf482ce290e4
+champ_3.png=e46cb90fcd5bcc2552ee046eb1a1f216
 champ_4.png=e46cb90fcd5bcc2552ee046eb1a1f216
 champ_properties_1.png=6409c708318038fda6b54aacc96937eb
 cheb1mag_1.png=3b26f5856ff8a2bcfbcf78e2d77cb5c1
@@ -751,7 +751,7 @@ colorbar_ru_RU_2.png=6dc5d0a74530277a5d477807cd103132
 colorbar_ru_RU_3.png=93a18371c5b92018a5c8ed392b75e772
 colormap_1.png=34ff30f6dc35ee879709c132e444cf23
 contour2d_1.png=ca9b620f09fbcc77799e2286b6730e2d
-contour2d_2.png=ca9b620f09fbcc77799e2286b6730e2d
+contour2d_2.png=e618038e4b44d84ce4b6ae2fe5420951
 contour2d_3.png=e618038e4b44d84ce4b6ae2fe5420951
 contour2d_en_US_3.png=b210ca5f70b33677912b389f9712db1a
 contour2d_fr_FR_3.png=b210ca5f70b33677912b389f9712db1a
@@ -1124,6 +1124,7 @@ replot_2.png=2bbd8e5516bcfba00fb343eff77b4736
 rotate_1.png=df252732000d1c17d23c04e038b1b0f3
 rpem_1.png=f1f661c0f1bc866f159ff8e328971f0f
 sca_1.png=26a128db93d82d857191be51313e1d87
+scifunc_block_m_1.png=a26368cd2a69c472967105b9d8deb5ed
 sec_1.png=4eff2516ae7932bb126b6e2fa133f046
 sech_1.png=62b827923764aaaf8ce355b0256bef3b
 sgrid_1.png=76950c3a78d543018ca046b7e5709d88
@@ -1160,7 +1161,7 @@ subplot_1.png=4178b6def9655a23b78ab238c2380d5f
 summercolormap_1.png=b6e693f0c3ddcfcb7271926e20457ebd
 surf_1.png=89b9bf883d751093a226a0dce8f3b7da
 surf_10.png=c18da91e3465c1e46c633a9a5b1c86b8
-surf_2.png=d0e66f30d3c02be0fa362606a5b9e6cd
+surf_2.png=9755ffe0e0ca214daeaf0f200c719ff2
 surf_3.png=b7fc5c92f7af023772f0635325506b40
 surf_4.png=b37a3913244ede26ae72985a07e28217
 surf_5.png=cd8d74dffc9ff1d21f1afbf98297c8ee
index d0d22c1..838499e 100644 (file)
Binary files a/scilab/modules/helptools/images/_LaTeX_FROMWSB.xml_5.png and b/scilab/modules/helptools/images/_LaTeX_FROMWSB.xml_5.png differ
index 1d030e4..4cc33f6 100644 (file)
Binary files a/scilab/modules/helptools/images/_LaTeX_FROMWSB.xml_6.png and b/scilab/modules/helptools/images/_LaTeX_FROMWSB.xml_6.png differ
index b675e05..14d9d3f 100644 (file)
Binary files a/scilab/modules/helptools/images/_MathML_convol.xml_1.png and b/scilab/modules/helptools/images/_MathML_convol.xml_1.png differ
index 8c0b3af..155b4bf 100644 (file)
Binary files a/scilab/modules/helptools/images/_MathML_cspect.xml_1.png and b/scilab/modules/helptools/images/_MathML_cspect.xml_1.png differ
index 0de5c3b..f6d126d 100644 (file)
Binary files a/scilab/modules/helptools/images/champ_2.png and b/scilab/modules/helptools/images/champ_2.png differ
index 5637288..2c3d211 100644 (file)
Binary files a/scilab/modules/helptools/images/champ_3.png and b/scilab/modules/helptools/images/champ_3.png differ
index 9438c7b..ef6c0e4 100644 (file)
Binary files a/scilab/modules/helptools/images/contour2d_2.png and b/scilab/modules/helptools/images/contour2d_2.png differ
diff --git a/scilab/modules/helptools/images/scifunc_block_m_1.png b/scilab/modules/helptools/images/scifunc_block_m_1.png
new file mode 100644 (file)
index 0000000..c68605e
Binary files /dev/null and b/scilab/modules/helptools/images/scifunc_block_m_1.png differ
diff --git a/scilab/modules/helptools/images/scifunc_block_m_en_US.zcos.png b/scilab/modules/helptools/images/scifunc_block_m_en_US.zcos.png
new file mode 100644 (file)
index 0000000..03cfdd7
Binary files /dev/null and b/scilab/modules/helptools/images/scifunc_block_m_en_US.zcos.png differ
index 26a7db0..45d468d 100644 (file)
Binary files a/scilab/modules/helptools/images/surf_2.png and b/scilab/modules/helptools/images/surf_2.png differ
diff --git a/scilab/modules/xcos/examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos b/scilab/modules/xcos/examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos
new file mode 100644 (file)
index 0000000..9150dc8
Binary files /dev/null and b/scilab/modules/xcos/examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos differ
index 5748081..d2a8780 100644 (file)
@@ -98,7 +98,6 @@
             language. During simulation, these instructions are interpreted by
             Scilab; the simulation of diagrams that include these types of blocks
             is slower. For more information see Scicos reference manual.
-            
         </para>
     </refsection>
     <refsection id="Dialogbox_scifunc_block_m">
             </listitem>
         </itemizedlist>
     </refsection>
+    <refsection id="Example_scifunc_block_m">
+        <title>Example</title>
+        <para>
+            <link type="scilab" linkend="scilab.xcos/xcos/examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos">
+                <inlinemediaobject>
+                    <imageobject>
+                        <imagedata fileref="../../../../examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos" align="center" valign="middle"/>
+                    </imageobject>
+                </inlinemediaobject>
+            </link>
+        </para>
+        <scilab:image><![CDATA[
+importXcosDiagram(SCI + "/modules/xcos/examples/userdefinedfunctions_pal/en_US/scifunc_block_m_en_US.zcos");
+xcos_simulate(scs_m, 4);
+]]></scilab:image>
+    </refsection>
     <refsection id="Interfacingfunction_scifunc_block_m">
         <title>Interfacing function</title>
         <itemizedlist>