* Bug #13032 fixed - Xcos help: fix CMATVIEW example 49/13049/3
Paul BIGNIER [Thu, 31 Oct 2013 09:08:26 +0000 (10:08 +0100)]
Moved CMATVIEW example to CMAT3D and gave CMATVIEW a new one.

Change-Id: I4650d663e5763691d300d6e000559480f0cb722e

scilab/CHANGES_5.5.X
scilab/modules/helptools/images/CMAT3D_img3_eng.gif [deleted file]
scilab/modules/helptools/images/CMATVIEW_img3_eng.gif [deleted file]
scilab/modules/xcos/examples/sinks_pal/CMAT3D_Example.zcos [new file with mode: 0644]
scilab/modules/xcos/examples/sinks_pal/CMATVIEW_Example.zcos
scilab/modules/xcos/help/en_US/palettes/Sinks_pal/CMAT3D.xml
scilab/modules/xcos/help/en_US/palettes/Sinks_pal/CMATVIEW.xml

index 2628fda..ce896ff 100644 (file)
@@ -97,6 +97,8 @@ Scilab Bug Fixes
 
 * Bug #13015 fixed - Computation of Efficiency innver variable improved in optim_ga.
 
+* Bug #13032 fixed - Fixed CMATVIEW help example and created one for CMAT3D.
+
 
 Xcos Bug Fixes
 ==============
diff --git a/scilab/modules/helptools/images/CMAT3D_img3_eng.gif b/scilab/modules/helptools/images/CMAT3D_img3_eng.gif
deleted file mode 100644 (file)
index b7683ec..0000000
Binary files a/scilab/modules/helptools/images/CMAT3D_img3_eng.gif and /dev/null differ
diff --git a/scilab/modules/helptools/images/CMATVIEW_img3_eng.gif b/scilab/modules/helptools/images/CMATVIEW_img3_eng.gif
deleted file mode 100644 (file)
index b7683ec..0000000
Binary files a/scilab/modules/helptools/images/CMATVIEW_img3_eng.gif and /dev/null differ
diff --git a/scilab/modules/xcos/examples/sinks_pal/CMAT3D_Example.zcos b/scilab/modules/xcos/examples/sinks_pal/CMAT3D_Example.zcos
new file mode 100644 (file)
index 0000000..b1ef8d6
Binary files /dev/null and b/scilab/modules/xcos/examples/sinks_pal/CMAT3D_Example.zcos differ
index db3b4f9..b4bc23d 100644 (file)
Binary files a/scilab/modules/xcos/examples/sinks_pal/CMATVIEW_Example.zcos and b/scilab/modules/xcos/examples/sinks_pal/CMATVIEW_Example.zcos differ
index 54b0384..736747f 100644 (file)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scicos
- * 
+ *
  * Copyright (C) INRIA - METALAU Project <scicos@inria.fr> (HTML version)
  * Copyright (C) DIGITEO - Scilab Consortium (XML Docbook version)
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * See the file ./license.txt
  -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="CMAT3D">
@@ -98,7 +98,7 @@
     <refsection id="Description_CMAT3D">
         <title>Description</title>
         <para>
-            CMAT3D is a scope that shows matrix values as z values on a xy grid.  
+            CMAT3D is a scope that shows matrix values as z values on a xy grid.
         </para>
         <para>
         </para>
                     <emphasis role="bold">Bounds Vector X (-1 for standard)</emphasis>
                 </para>
                 <para> If you let -1 the x ticks would be between 0 and 1 else you can put your own vector.</para>
-                <para> Properties : Type 'vec' of size -1. </para>
+                <para> Properties: Type 'vec' of size -1. </para>
             </listitem>
             <listitem>
                 <para>
                     <emphasis role="bold">Bounds Vector Y (-1 for standard)</emphasis>
                 </para>
                 <para> If you let -1 the x ticks would be between 0 and 1 else you can put your own vector.</para>
-                <para> Properties : Type 'vec' of size -1. </para>
+                <para> Properties: Type 'vec' of size -1. </para>
             </listitem>
             <listitem>
                 <para>
                 </para>
                 <para> The colormap is a range color linked to the window output of the scope. You can put a jetcolormap or hotcolormap or graycolormap or your own (see colormap help).</para>
                 <para>
-                    Properties : Must be a mx3 matrix and m ≥ 3 
+                    Properties: Must be a mx3 matrix and m ≥ 3
                 </para>
             </listitem>
             <listitem>
                     <emphasis role="bold">Zmin</emphasis>
                 </para>
                 <para> Minimum value in Z values</para>
-                <para> Properties : Type 'vec' of size 1. </para>
+                <para> Properties: Type 'vec' of size 1. </para>
             </listitem>
             <listitem>
                 <para>
                     <emphasis role="bold">Zmax</emphasis>
                 </para>
                 <para> Maximum values in Z values</para>
-                <para> Properties : Type 'vec' of size 1.</para>
+                <para> Properties: Type 'vec' of size 1.</para>
             </listitem>
         </itemizedlist>
     </refsection>
                     <emphasis role="bold">regular inputs:</emphasis>
                 </para>
                 <para>
-                    <emphasis role="bold">- port 1 : size [-1,-2] / type 1</emphasis>
+                    <emphasis role="bold">- port 1: size [-1,-2] / type 1</emphasis>
                 </para>
             </listitem>
             <listitem>
             </listitem>
         </itemizedlist>
     </refsection>
+    <refsection id="Example_CMAT3D">
+        <title>Example</title>
+        <para>
+            <link type="scilab" linkend="scilab.xcos/xcos/examples/sinks_pal/CMAT3D_Example.zcos">
+                <inlinemediaobject>
+                    <imageobject>
+                        <imagedata align="center" fileref="../../../../examples/sinks_pal/CMAT3D_Example.zcos" valign="middle"/>
+                    </imageobject>
+                </inlinemediaobject>
+            </link>
+        </para>
+    </refsection>
     <refsection id="Seealso_CMAT3D">
         <title>See also</title>
         <itemizedlist>
index 7a76c5f..46f1e8b 100644 (file)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scicos
- * 
+ *
  * Copyright (C) INRIA - METALAU Project <scicos@inria.fr> (HTML version)
  * Copyright (C) DIGITEO - Scilab Consortium (XML Docbook version)
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * See the file ./license.txt
  -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="CMATVIEW">
     <refsection id="Description_CMATVIEW">
         <title>Description</title>
         <para>
-            CMATVIEW is a scope that shows matrix values on a colormapped grid.  
+            CMATVIEW is a scope that shows matrix values on a colormapped grid.
         </para>
         <para>
         </para>
                 </para>
                 <para> The colormap is a range color linked to the window output of the scope. You can put a jetcolormap or hotcolormap or graycolormap or your own (see colormap help).</para>
                 <para>
-                    Properties : Must be a mx3 matrix and m ≥ 3 
+                    Properties: Must be a mx3 matrix and m ≥ 3
                 </para>
             </listitem>
             <listitem>
                     <emphasis role="bold">Minimum level range</emphasis>
                 </para>
                 <para> The minimum level range is the minimum value who comes in the regular input port. It would be linked to the 'cold value' of the colormap.</para>
-                <para> Properties : A scalar </para>
+                <para> Properties: A scalar </para>
             </listitem>
             <listitem>
                 <para>
                     <emphasis role="bold">Maximum level range</emphasis>
                 </para>
                 <para> The maximum level range is the maximum value who comes in the regular input port. It would be linked to the 'hot value' of the colormap.</para>
-                <para> Properties : A scalar</para>
+                <para> Properties: A scalar</para>
             </listitem>
         </itemizedlist>
     </refsection>
                     <emphasis role="bold">regular inputs:</emphasis>
                 </para>
                 <para>
-                    <emphasis role="bold">- port 1 : size [-1,-2] / type 1</emphasis>
+                    <emphasis role="bold">- port 1: size [-1,-2] / type 1</emphasis>
                 </para>
             </listitem>
             <listitem>