Xcos: doc: update TKSCALE to SEP50

	add a simple example
	fix labels order in the simulation function

Change-Id: Ia62bf6853f55d8e4fad6643c91d056313d97aebb

diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index c1eb2df..bb6eeed 100644 (file)
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -70,6 +70,7 @@ Xcos:
   - Counter
   - RAMP
   - INTRPLBLK_f (english update only)
+  - TKSCALE (english update only)
   - DELAY_f
   - RFILE_f Read from input file
 

diff --git a/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci b/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci
index c5a295d..25eb70c 100644 (file)
--- a/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci
+++ b/scilab/modules/scicos_blocks/macros/Sources/tkscaleblk.sci
@@ -62,11 +62,11 @@ function block=tkscaleblk(block,flag)
       "Position", [0 0 20 200], "SliderStep", [block.rpar(3) 2*block.rpar(3)]);
     
     // labels
-    labels = string([bounds(1)                  ;..
-                     mean([bounds(1) initial])  ;..
-                     initial                    ;..
+    labels = string([bounds(2)                  ;..
                      mean([bounds(2) initial])  ;..
-                     bounds(2)]);
+                     initial                    ;..
+                     mean([bounds(1) initial])  ;..
+                     bounds(1)]);
     labels = strcat(labels, "<br /><br /><br />");
     uicontrol(f, "Style", "text", "String", labels(1), ..
               "Position", [30  0 50 200]);

diff --git a/scilab/modules/xcos/examples/sources_pal/en_US/TKSCALE_en_US.xcos b/scilab/modules/xcos/examples/sources_pal/en_US/TKSCALE_en_US.xcos
new file mode 100644 (file)
index 0000000..f79406b
Binary files /dev/null and b/scilab/modules/xcos/examples/sources_pal/en_US/TKSCALE_en_US.xcos differ

diff --git a/scilab/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml b/scilab/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml
index 9a7b225..f172d19 100644 (file)
--- a/scilab/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml
+++ b/scilab/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml
@@ -24,7 +24,7 @@
 <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" version="5.0-subset Scilab" xml:id="TKSCALE">
   <refnamediv>
     <refname>TKSCALE</refname>
-    <refpurpose>Adjust constant value with a tk widget</refpurpose>
+    <refpurpose>Adjust value with a graphical widget.</refpurpose>
   </refnamediv>
   <refsection>
     <title>Block Screenshot</title>
@@ -41,7 +41,7 @@
     <itemizedlist>
       <listitem>
         <para>
-          <link linkend="TKSCALE">Adjust constant value with a tk widget</link>
+          <link linkend="TKSCALE">Adjust value with a graphical widget.</link>
         </para>
       </listitem>
       <listitem>
@@ -68,12 +68,12 @@
           </listitem>
           <listitem>
             <para>
-              <xref linkend="Interfacingfunction_TKSCALE">Interfacing function</xref>
+              <xref linkend="Example_TKSCALE">Example</xref>
             </para>
           </listitem>
           <listitem>
             <para>
-              <xref linkend="Computationalfunction_TKSCALE">Computational function</xref>
+              <xref linkend="Interfacingfunction_TKSCALE">Interfacing function</xref>
             </para>
           </listitem>
           <listitem>
@@ -98,7 +98,7 @@
   <refsection id="Description_TKSCALE">
     <title>Description</title>
     <para>
-This source block generates a piecewise constant signal the value of which can be set interactively using a TK widget in the course of the simulation. The output value is the value set by the slider (an integer between Min value and Max value) divided by the Normalization factor. Increasing proportionaly all three block parameters does not change the output range, but it does increase precision.  
+This source block generates a piecewise constant signal the value of which can be set interactively using a widget in the course of the simulation. The output value is the value set by the slider (an integer between Min value and Max value) divided by the Normalization factor. Increasing proportionaly all three block parameters does not change the output range, but it does increase precision.
 </para>
     <para>
 </para>
@@ -108,7 +108,7 @@ This source block generates a piecewise constant signal the value of which can b
     <para>
       <inlinemediaobject>
         <imageobject>
-          <imagedata fileref="../../../../images/gui/TKSCALE_gui.gif" align="center" valign="middle"/>
+          <imagedata fileref="../../../gui/sources_pal/en_US/TKSCALE_gui.png" align="center" valign="middle"/>
         </imageobject>
       </inlinemediaobject>
     </para>
@@ -185,24 +185,33 @@ This source block generates a piecewise constant signal the value of which can b
       </listitem>
     </itemizedlist>
   </refsection>
+  <refsection id="Example_TKSCALE">
+    <title>Example</title>
+    <para>
+      <link type="scilab" linkend="scilab.xcos/xcos/examples/sources_pal/en_US/TKSCALE_en_US.xcos">
+          Open this example in Xcos
+        </link>
+    </para>
+    <para/>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="../../../examples/sources_pal/en_US/TKSCALE_diagram_en_US.png" align="center"/>
+      </imageobject>
+    </mediaobject>
+  </refsection>
   <refsection id="Interfacingfunction_TKSCALE">
     <title>Interfacing function</title>
     <itemizedlist>
       <listitem>
-        <para> SCI/modules/scicos_blocks/macros/Sources/TKSCALE.sci</para>
-      </listitem>
-    </itemizedlist>
-  </refsection>
-  <refsection id="Computationalfunction_TKSCALE">
-    <title>Computational function</title>
-    <itemizedlist>
-      <listitem>
-        <para> SCI/modules/scicos/macros/scicos_scicos/tkscaleblk.sci (Type 5)</para>
+        <para>
+          <link type="scilab" linkend="scilab.scinotes/scicos_blocks/macros/Sources/TKSCALE.sci">SCI/modules/scicos_blocks/macros/Sources/TKSCALE.sci</link>
+        </para>
       </listitem>
     </itemizedlist>
   </refsection>
   <refsection id="Authors_TKSCALE">
     <title>Authors</title>
     <para><emphasis role="bold">Ramine Nikoukhah</emphasis> - INRIA</para>
+    <para><emphasis role="bold">Clément DAVID</emphasis> - DIGITEO</para>
   </refsection>
 </refentry>

diff --git a/scilab/modules/xcos/help/examples/sources_pal/en_US/TKSCALE_diagram_en_US.png b/scilab/modules/xcos/help/examples/sources_pal/en_US/TKSCALE_diagram_en_US.png
new file mode 100644 (file)
index 0000000..d3b41ea
Binary files /dev/null and b/scilab/modules/xcos/help/examples/sources_pal/en_US/TKSCALE_diagram_en_US.png differ

diff --git a/scilab/modules/xcos/help/gui/sources_pal/en_US/TKSCALE_gui.png b/scilab/modules/xcos/help/gui/sources_pal/en_US/TKSCALE_gui.png
new file mode 100644 (file)
index 0000000..5e5eaff
Binary files /dev/null and b/scilab/modules/xcos/help/gui/sources_pal/en_US/TKSCALE_gui.png differ

diff --git a/scilab/modules/xcos/help/images/TKSCALE_gui.gif b/scilab/modules/xcos/help/images/TKSCALE_gui.gif
deleted file mode 100644 (file)
index 0c565a2..0000000
Binary files a/scilab/modules/xcos/help/images/TKSCALE_gui.gif and /dev/null differ

diff --git a/scilab/modules/xcos/images/gui/TKSCALE_gui.gif b/scilab/modules/xcos/images/gui/TKSCALE_gui.gif
deleted file mode 100644 (file)
index 0c565a2..0000000
Binary files a/scilab/modules/xcos/images/gui/TKSCALE_gui.gif and /dev/null differ