* Bug #9131 fixed - PULSE_SC has been added to the Source palette. 43/7543/3
Clément DAVID [Thu, 14 Jun 2012 09:11:56 +0000 (11:11 +0200)]
Change-Id: I590ee8ee8c69d19b50f7ecbfa72585436bc4b19d

scilab/CHANGES_5.4.X
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/etc/palettes.xml
scilab/modules/xcos/help/en_US/palettes/Sources_pal/PULSE_SC.xml [new file with mode: 0644]
scilab/modules/xcos/help/gui/sources_pal/en_US/PULSE_SC_gui.png [new file with mode: 0644]
scilab/modules/xcos/images/blocks/PULSE_SC.svg [new file with mode: 0644]
scilab/modules/xcos/images/blocks/STEP_FUNCTION.svg
scilab/modules/xcos/images/palettes/PULSE_SC.png [new file with mode: 0644]

index 651359b..ca75477 100644 (file)
@@ -344,6 +344,8 @@ Xcos
 * Bug #8744 fixed - Solving the initialization problem more than once crash
                     Scilab.
 
+* Bug #9131 fixed - PULSE_SC has been added to the Source palette.
+
 * Bug #10081 fixed - Palette configuration saving could produce an invalid
                      file.
 
index b807b62..38e5447 100644 (file)
@@ -157,6 +157,7 @@ images/blocks/PNP.svg \
 images/blocks/PotentialSensor.svg \
 images/blocks/PRODUCT.svg \
 images/blocks/PuitP.svg \
+images/blocks/PULSE_SC.svg \
 images/blocks/QUANT_f.svg \
 images/blocks/RAMP.svg \
 images/blocks/Resistor.svg \
@@ -224,8 +225,8 @@ images/palettes/CMATVIEW.png \
 images/palettes/CMSCOPE.png \
 images/palettes/ConstantVoltage.png \
 images/palettes/CONST_m.png \
-images/palettes/CONSTRAINT_c.png \
 images/palettes/CONSTRAINT2_c.png \
+images/palettes/CONSTRAINT_c.png \
 images/palettes/CONVERT.png \
 images/palettes/COSBLK_f.png \
 images/palettes/Counter.png \
@@ -346,6 +347,7 @@ images/palettes/POWBLK_f.png \
 images/palettes/PROD_f.png \
 images/palettes/PRODUCT.png \
 images/palettes/PuitsP.png \
+images/palettes/PULSE_SC.png \
 images/palettes/QUANT_f.png \
 images/palettes/RAMP.png \
 images/palettes/RAND_m.png \
@@ -363,6 +365,7 @@ images/palettes/SAMPHOLD_m.png \
 images/palettes/SampleCLK.png \
 images/palettes/SATURATION.png \
 images/palettes/SAWTOOTH_f.png \
+images/palettes/SCALAR2VECTOR.png \
 images/palettes/scifunc_block_m.png \
 images/palettes/SELECT_m.png \
 images/palettes/SELF_SWITCH_off.png \
@@ -396,6 +399,7 @@ images/palettes/TrigFun.png \
 images/palettes/VanneReglante.png \
 images/palettes/VARIABLE_DELAY.png \
 images/palettes/VariableResistor.png \
+images/palettes/VirtualCLK0.png \
 images/palettes/VoltageSensor.png \
 images/palettes/VsourceAC.png \
 images/palettes/VVsourceAC.png \
index 5a6032b..fbbf955 100644 (file)
@@ -568,6 +568,7 @@ images/blocks/PNP.svg \
 images/blocks/PotentialSensor.svg \
 images/blocks/PRODUCT.svg \
 images/blocks/PuitP.svg \
+images/blocks/PULSE_SC.svg \
 images/blocks/QUANT_f.svg \
 images/blocks/RAMP.svg \
 images/blocks/Resistor.svg \
@@ -635,8 +636,8 @@ images/palettes/CMATVIEW.png \
 images/palettes/CMSCOPE.png \
 images/palettes/ConstantVoltage.png \
 images/palettes/CONST_m.png \
-images/palettes/CONSTRAINT_c.png \
 images/palettes/CONSTRAINT2_c.png \
+images/palettes/CONSTRAINT_c.png \
 images/palettes/CONVERT.png \
 images/palettes/COSBLK_f.png \
 images/palettes/Counter.png \
@@ -757,6 +758,7 @@ images/palettes/POWBLK_f.png \
 images/palettes/PROD_f.png \
 images/palettes/PRODUCT.png \
 images/palettes/PuitsP.png \
+images/palettes/PULSE_SC.png \
 images/palettes/QUANT_f.png \
 images/palettes/RAMP.png \
 images/palettes/RAND_m.png \
@@ -774,6 +776,7 @@ images/palettes/SAMPHOLD_m.png \
 images/palettes/SampleCLK.png \
 images/palettes/SATURATION.png \
 images/palettes/SAWTOOTH_f.png \
+images/palettes/SCALAR2VECTOR.png \
 images/palettes/scifunc_block_m.png \
 images/palettes/SELECT_m.png \
 images/palettes/SELF_SWITCH_off.png \
@@ -807,6 +810,7 @@ images/palettes/TrigFun.png \
 images/palettes/VanneReglante.png \
 images/palettes/VARIABLE_DELAY.png \
 images/palettes/VariableResistor.png \
+images/palettes/VirtualCLK0.png \
 images/palettes/VoltageSensor.png \
 images/palettes/VsourceAC.png \
 images/palettes/VVsourceAC.png \
index 2b5ea82..67b8e92 100644 (file)
   <add as="STEP_FUNCTION" extend="Icon">
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/STEP_FUNCTION.svg"/>
   </add>
+  <add as="PULSE_SC" extend="Icon">
+    <add as="image" value="$SCILAB/modules/xcos/images/blocks/PULSE_SC.svg"/>
+  </add>
   <add as="CLOCK_c" extend="Icon">
     <add as="image" value="$SCILAB/modules/xcos/images/blocks/CLOCK_c.svg"/>
   </add>
index 8c4896e..c42a728 100644 (file)
       <block name="STEP_FUNCTION">
         <icon variable="SCI" path="/modules/xcos/images/palettes/STEP_FUNCTION.png"/>
       </block>
+      <block name="PULSE_SC">
+        <icon variable="SCI" path="/modules/xcos/images/palettes/PULSE_SC.png"/>
+      </block>
       <block name="SampleCLK">
         <icon variable="SCI" path="/modules/xcos/images/palettes/SampleCLK.png"/>
       </block>
diff --git a/scilab/modules/xcos/help/en_US/palettes/Sources_pal/PULSE_SC.xml b/scilab/modules/xcos/help/en_US/palettes/Sources_pal/PULSE_SC.xml
new file mode 100644 (file)
index 0000000..0e832bf
--- /dev/null
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Xcos
+ *
+ * Copyright (C) INRIA - METALAU Project <scicos@inria.fr> (HTML version)
+ * Copyright (C) DIGITEO - Scilab Consortium (XML Docbook version)
+ * Copyright (C) 2011 - Bernard DUJARDIN <bernard.dujardin@contrib.scilab.org>
+ *
+ * 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:ns5="http://www.w3.org/1999/xhtml" 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="PULSE_SC" xml:lang="en_US">
+  <refnamediv>
+    <refname>PULSE_SC</refname>
+    <refpurpose>Pulse Generator</refpurpose>
+  </refnamediv>
+  <refsection>
+    <title>Block Screenshot</title>
+    <para>
+      <inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="../../../../images/palettes/PULSE_SC.png" align="center" valign="middle"/>
+        </imageobject>
+      </inlinemediaobject>
+    </para>
+  </refsection>
+  <refsection id="Contents_PULSE_SC">
+    <title>Contents</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <link linkend="PULSE_SC">Pulse Generator</link>
+        </para>
+      </listitem>
+      <listitem>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <xref linkend="Palette_PULSE_SC">Palette</xref>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <xref linkend="Description_PULSE_SC">Description</xref>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <xref linkend="Dialogbox_PULSE_SC">Dialog box</xref>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <xref linkend="Defaultproperties_PULSE_SC">Default properties</xref>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <xref linkend="Interfacingfunction_PULSE_SC">Interfacing function</xref>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <xref linkend="Seealso_PULSE_SC">See also</xref>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+  </refsection>
+  <refsection id="Palette_PULSE_SC">
+    <title>Palette</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <link linkend="Sources_pal">Sources palette</link>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </refsection>
+  <refsection id="Description_PULSE_SC">
+    <title>Description</title>
+    <para>
+      This block is a Pulse Generator. It generates a pulse at a rate of 
+      <emphasis role="bold">1/P</emphasis> where <emphasis role="bold">P
+      </emphasis>
+      is the period of the signal. The <emphasis role="bold">Phase
+        delay
+      </emphasis>
+      gives the value (in time) of the first event. The 
+      <emphasis role="bold">Phase delay</emphasis> known also as <emphasis
+      role="bold">Offset</emphasis> must be less than the <literal>Frequency*(1-(Pulse_Width/100))</literal>.
+      The second parameter of the block gives the <emphasis role="bold">Pulse
+        width
+      </emphasis>
+      and the fourth parameter gives the <emphasis
+      role="bold">Pulse amplitude</emphasis>.
+    </para>
+  </refsection>
+  <refsection id="Dialogbox_PULSE_SC">
+    <title>Dialog box</title>
+    <para>
+      <inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="../../../gui/sources_pal/en_US/PULSE_SC_gui.png" align="center"/>
+        </imageobject>
+      </inlinemediaobject>
+    </para>
+    <para/>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <emphasis role="bold">Phase delay (secs)</emphasis>
+        </para>
+        <para>
+          The offset of the block. It must be less than <literal>Frequency*(1-(Pulse_width/100))</literal>.
+        </para>
+        <para>Type 'pol' of size -1.</para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">Pulse Width (% of period)</emphasis>
+        </para>
+        <para>
+          The pulse width. It can take values from 1 to 100. 
+        </para>
+        <para>Type 'pol' of size -1.</para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">Period (secs)</emphasis>
+        </para>
+        <para>
+          The Period of the signal.
+        </para>
+        <para>Properties : Type 'pol' of size -1.</para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">Amplitude</emphasis>
+        </para>
+        <para>
+          The amplitude of the pulse. It can support all scicos types.
+        </para>
+        <para>Properties : Type 'mat' of size [-1,-1].</para>
+      </listitem>
+    </itemizedlist>
+  </refsection>
+  <refsection id="Defaultproperties_PULSE_SC">
+    <title>Default properties</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <emphasis role="bold">always active:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">direct-feedthrough:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">zero-crossing:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">mode:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">regular outputs:</emphasis>
+        </para>
+        <para>
+          <emphasis role="bold">- port 1 : size [-1,-2] / type -1</emphasis>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">number/sizes of activation inputs:</emphasis> 0
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">number/sizes of activation outputs:</emphasis> 0
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">continuous-time state:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">discrete-time state:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">object discrete-time state:</emphasis> no
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <emphasis role="bold">name of computational function:</emphasis>
+          <emphasis role="italic">csuper</emphasis>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </refsection>
+  <refsection id="Interfacingfunction_PULSE_SC">
+    <title>Interfacing function</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <link type="scilab" linkend="scilab.scinotes/scicos_blocks/macros/Sources/PULSE_SC.sci">SCI/modules/scicos_blocks/macros/Sources/PULSE_SC.sci</link>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </refsection>
+  <refsection role="see also" id="Seealso_PULSE_SC">
+    <title>See also</title>
+    <itemizedlist>
+      <listitem>
+        <link linkend="STEP_FUNCTION">STEP_FUNCTION</link>
+      </listitem>
+      <listitem>
+        <link linkend="RAMP">RAMP</link>
+      </listitem>
+      <listitem>
+        <link linkend="CURV_f">CURV_f</link>
+      </listitem>
+      <listitem>
+        <link linkend="Sigbuilder">Sigbuilder</link>
+      </listitem>
+    </itemizedlist>
+  </refsection>
+</refentry>
diff --git a/scilab/modules/xcos/help/gui/sources_pal/en_US/PULSE_SC_gui.png b/scilab/modules/xcos/help/gui/sources_pal/en_US/PULSE_SC_gui.png
new file mode 100644 (file)
index 0000000..73fad86
Binary files /dev/null and b/scilab/modules/xcos/help/gui/sources_pal/en_US/PULSE_SC_gui.png differ
diff --git a/scilab/modules/xcos/images/blocks/PULSE_SC.svg b/scilab/modules/xcos/images/blocks/PULSE_SC.svg
new file mode 100644 (file)
index 0000000..4648b2c
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="40" xmlns="http://www.w3.org/2000/svg" version="1.1" height="40">
+ <g id="layer1">
+  <path stroke-width="2px" d="M0,30h10v-20h5v20h15v-20h5v20h5" stroke="#000" fill="none"/>
+ </g>
+</svg>
+
index dd074e0..464c385 100644 (file)
@@ -4,3 +4,4 @@
   <path stroke-width="2px" d="M0,30h20v-20h20" stroke="#000" fill="none"/>
  </g>
 </svg>
+
diff --git a/scilab/modules/xcos/images/palettes/PULSE_SC.png b/scilab/modules/xcos/images/palettes/PULSE_SC.png
new file mode 100644 (file)
index 0000000..ea76ef7
Binary files /dev/null and b/scilab/modules/xcos/images/palettes/PULSE_SC.png differ