removed chart 09/16009/8
Anais AUBERT [Mon, 23 Feb 2015 14:46:12 +0000 (15:46 +0100)]
Change-Id: Ia03540f18401a5317510c7db53be13db3f179e5c

19 files changed:
scilab/CHANGES_5.5.X
scilab/modules/cacsd/help/en_US/plot_display/chart.xml [deleted file]
scilab/modules/cacsd/help/fr_FR/plot_display/chart.xml [deleted file]
scilab/modules/cacsd/help/ja_JP/g_margin.xml
scilab/modules/cacsd/help/ja_JP/p_margin.xml
scilab/modules/cacsd/help/ja_JP/plot_display/black.xml
scilab/modules/cacsd/help/ja_JP/plot_display/chart.xml [deleted file]
scilab/modules/cacsd/help/ja_JP/plot_display/m_circle.xml
scilab/modules/cacsd/help/pt_BR/plot_display/black.xml
scilab/modules/cacsd/help/pt_BR/plot_display/chart.xml [deleted file]
scilab/modules/cacsd/help/pt_BR/plot_display/m_circle.xml
scilab/modules/cacsd/macros/chart.sci [deleted file]
scilab/modules/graphics/help/fr_FR/Graphics.xml
scilab/modules/graphics/help/ja_JP/Graphics.xml
scilab/modules/graphics/help/pt_BR/Graphics.xml
scilab/modules/graphics/help/ru_RU/Graphics.xml
scilab/modules/graphics/tests/nonreg_tests/bug_2682.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_2682.tst
scilab/modules/helptools/data/configuration/scilab_macros.txt

index 9b3b851..95ce8e0 100644 (file)
@@ -22,6 +22,8 @@ Removed Functions
 
 * relocate_handle removed.
 
+* chart removed. Please use nicholschart instead.
+
 
 Compilation
 ===========
diff --git a/scilab/modules/cacsd/help/en_US/plot_display/chart.xml b/scilab/modules/cacsd/help/en_US/plot_display/chart.xml
deleted file mode 100644 (file)
index 3bf2126..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.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:lang="en" xml:id="chart">
-    <refnamediv>
-        <refname>chart</refname>
-        <refpurpose>
-            Nichols chart. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>chart([flags])
-            chart(gain [,flags])
-            chart(gain,phase [,flags])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>gain</term>
-                <listitem>
-                    <para>real vector ( gains (in DB))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phase</term>
-                <listitem>
-                    <para>real vector (phases (in degree))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flags</term>
-                <listitem>
-                    <para>a list of at most 4 flags list(sup [,leg [,cm [,cphi]]])</para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>sup</term>
-                            <listitem>
-                                <para>1 indicates superposition on the previous plot   0 no superposition is done</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>leg</term>
-                            <listitem>
-                                <para>1 indicates that legends are drawn, o: no legends</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cm</term>
-                            <listitem>
-                                <para>color index for gain curves</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cphi</term>
-                            <listitem>
-                                <para> color index for phase curves</para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para> plot the Nichols'chart: iso-gain and iso-phase contour of
-            y/(1+y) in phase/gain plane
-        </para>
-        <para>
-            <literal>chart</literal> may be used in cunjunction with
-            <link linkend="black">black</link>. 
-        </para>
-        <para>
-            The default values for <literal>gain</literal> and
-            <literal>phase</literal> are respectively :
-        </para>
-        <para>
-            <literal>[-12 -8 -6 -5 -4 -3 -2 -1.4 -1 -.5 0.25 0.5 0.7 1 1.4 2 2.3 3 4 5 6 8 12]</literal>
-        </para>
-        <para>
-            <literal>[-(1:10) , -(20:10:160)]</literal>
-        </para>
-        <para>
-            <warning>This function is obsolete.</warning>
-            It is better to use <link linkend="nicholschart">nicholschart</link> instead of <literal>chart</literal>.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-s=poly(0,'s')
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-black(h,0.01,100)
-chart(list(1,0,2,3));
-
-clf()
-h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-black([h1;h],0.01,100,['h1';'h'])
-set(gca(),'data_bounds',[-180 -30;180 30]) //enlarge the frame
-chart(list(1,0));
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nicholschart">nicholschart</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revdescription>
-                    Function tagged as obsolete. Will be removed in 5.5.1. Please use <link linkend="nicholschart">nicholschart</link> instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
-
diff --git a/scilab/modules/cacsd/help/fr_FR/plot_display/chart.xml b/scilab/modules/cacsd/help/fr_FR/plot_display/chart.xml
deleted file mode 100644 (file)
index f4c3ea1..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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:lang="fr" xml:id="chart">
-    <refnamediv>
-        <refname>chart</refname>
-        <refpurpose>diagramme de Nichols  </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>chart([flags])
-            chart(gain [,flags])
-            chart(gain,phase [,flags])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>gain  </term>
-                <listitem>
-                    <para>valeurs réelles ( gains (en DB))
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phase  </term>
-                <listitem>
-                    <para>valeurs réelles (phases (en degrés))
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flags  </term>
-                <listitem>
-                    <para>une liste de 4 termes list(sup [,leg [,cm [,cphi]]])
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>sup  </term>
-                            <listitem>
-                                <para>1 -&gt; superposition sur le dessin précédent   0 -&gt; pas de superposition
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>leg  </term>
-                            <listitem>
-                                <para>1 indique que les légendes sont dessinées, 0 : pas de légendes
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cm  </term>
-                            <listitem>
-                                <para>numéro de couleur  pour les courbes de gain
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cphi  </term>
-                            <listitem>
-                                <para>numéro de couleur  pour les courbes de phase
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>Dessine un diagramme de Nichols: c'est à dire les contours
-            iso-gain et iso-phase contour de y/(1+y) dans le plan phase/gain.
-        </para>
-        <para>
-            <literal>chart</literal> peut être utilisé avec
-            <link linkend="black">black</link> 
-        </para>
-        <para>
-            Les valeurs par défaut pour <literal>gain</literal> et
-            <literal>phase</literal> sont respectivement : 
-        </para>
-        <para>
-            <literal>[-12 -8 -6 -5 -4 -3 -2 -1.4 -1 -.5 0.25 0.5 0.7 1 1.4 2 2.3 3 4 5 6 8 12]</literal>
-        </para>
-        <para>
-            <literal>[-(1:10) , -(20:10:160)]</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-s=poly(0,'s')
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-black(h,0.01,100)
-chart(list(1,0,2,3));
-
-// Un autre exemple :
-clf()
-h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-black([h1;h],0.01,100,['h1';'h'])
-set(gca(),'data_bounds',[-180 -30;180 30]) // extension du cadre
-chart(list(1,0));
- ]]></programlisting>
-    </refsection>
-</refentry>
index 930fefe..9754150 100644 (file)
@@ -115,7 +115,7 @@ show_margins(h)
                 <link linkend="bode">bode</link>
             </member>
             <member>
-                <link linkend="chart">chart</link>
+                <link linkend="nicholschart">nicholschart</link>
             </member>
             <member>
                 <link linkend="nyquist">nyquist</link>
index b60274e..41b3bcd 100644 (file)
@@ -114,7 +114,7 @@ show_margins(h,'nyquist')
                 <link linkend="bode">bode</link>
             </member>
             <member>
-                <link linkend="chart">chart</link>
+                <link linkend="nicholschart">nicholschart</link>
             </member>
             <member>
                 <link linkend="nyquist">nyquist</link>
index b36e8e8..a297de5 100644 (file)
         <para>
             <literal>y/(1+y)</literal>の
             等ゲイン,等位相のグリッドをプロットするには,
-            <link linkend="chart">chart()</link>を使用してください.
+            <link linkend="nicholschart">nicholschart()</link>を使用してください.
         </para>
         <para>
             <literal>fmin</literal> および<literal>fmax</literal> のデフォルト値は,
                 <link linkend="nyquist">nyquist</link>
             </member>
             <member>
-                <link linkend="chart">chart</link>
+                <link linkend="nicholschart">nicholschart</link>
             </member>
             <member>
                 <link linkend="freq">freq</link>
diff --git a/scilab/modules/cacsd/help/ja_JP/plot_display/chart.xml b/scilab/modules/cacsd/help/ja_JP/plot_display/chart.xml
deleted file mode 100644 (file)
index 784c881..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.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:lang="ja" xml:id="chart">
-    <refnamediv>
-        <refname>chart</refname>
-        <refpurpose>
-            ニコルス線図.
-            <emphasis role="bold">この関数は廃止されます.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>chart([flags])
-            chart(gain [,flags])
-            chart(gain,phase [,flags])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>引数</title>
-        <variablelist>
-            <varlistentry>
-                <term>gain</term>
-                <listitem>
-                    <para>実数ベクトル ( ゲイン (単位:DB))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phase</term>
-                <listitem>
-                    <para>実数ベクトル (位相 (単位:度 ))</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flags</term>
-                <listitem>
-                    <para>最大4個のフラグのリスト(sup [,leg [,cm [,cphi]]])</para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>sup</term>
-                            <listitem>
-                                <para>1は前のプロットへ重ね合わせを行うこと,
-                                    0 は重ね合わせを行わないことを示します.
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>leg</term>
-                            <listitem>
-                                <para>1 は凡例を描画する, 0 は凡例を描画しないことを示します</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cm</term>
-                            <listitem>
-                                <para>ゲイン曲線の色の添え字</para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cphi</term>
-                            <listitem>
-                                <para>位相曲線の色の添え字</para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>ニコルス線図,つまり,
-            位相/ゲイン平面におけるy/(1+y)の等ゲイン,等位相の等高線
-            をプロットします.
-        </para>
-        <para>
-            <literal>chart</literal> は
-            <link linkend="black">black</link>と組み合わせて
-            使用することができます.
-        </para>
-        <para>
-            <literal>gain</literal> および
-            <literal>phase</literal> のデフォルト値はそれぞれ以下のようになっています :
-        </para>
-        <para>
-            <literal>[-12 -8 -6 -5 -4 -3 -2 -1.4 -1 -.5 0.25 0.5 0.7 1 1.4 2 2.3 3 4 5 6 8 12]</literal>
-        </para>
-        <para>
-            <literal>[-(1:10) , -(20:10:160)]</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-s=poly(0,'s')
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-black(h,0.01,100)
-chart(list(1,0,2,3));
-clf()
-h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-black([h1;h],0.01,100,['h1';'h'])
-set(gca(),'data_bounds',[-180 -30;180 30]) //enlarge the frame
-chart(list(1,0));
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-            <member>
-                <link linkend="nicholschart">nicholschart</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revdescription>
-                    関数が廃止予定となりました. 5.5.1で削除されます. 
-                    代わりに <link linkend="nicholschart">nicholschart</link> を使用してください.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index de0f2d7..050a357 100644 (file)
@@ -98,7 +98,7 @@ m_circle([-8 -6 -4]);
                 <link linkend="nyquist">nyquist</link>
             </member>
             <member>
-                <link linkend="chart">chart</link>
+                <link linkend="nicholschart">nicholschart</link>
             </member>
             <member>
                 <link linkend="black">black</link>
index b820280..936292f 100644 (file)
             cada resposta.
         </para>
         <para>Para esboçar o grid de iso-ganho e iso-fase de
-            <literal>y/(1+y)</literal> use <link linkend="chart">chart()</link>.
+            <literal>y/(1+y)</literal> use <link linkend="nicholschart">nicholschart()</link>.
         </para>
         <para>
             Valores padrões para <literal>fmin</literal> e
                 <link linkend="nyquist">nyquist</link>
             </member>
             <member>
-                <link linkend="chart">chart</link>
+                <link linkend="nicholschart">nicholschart</link>
             </member>
             <member>
                 <link linkend="freq">freq</link>
diff --git a/scilab/modules/cacsd/help/pt_BR/plot_display/chart.xml b/scilab/modules/cacsd/help/pt_BR/plot_display/chart.xml
deleted file mode 100644 (file)
index f32880d..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.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:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="chart" xml:lang="en">
-    <refnamediv>
-        <refname>chart</refname>
-        <refpurpose>carta de Nichols</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>chart([flags])
-            chart(gain [,flags])
-            chart(gain,phase [,flags])
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>gain</term>
-                <listitem>
-                    <para>vetor de reais ( ganhos (em DB, decibel)) </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>phase</term>
-                <listitem>
-                    <para>vetor de reais (fases (em graus)) </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>flags</term>
-                <listitem>
-                    <para>uma lista de no máximo quatro flags (sup [,leg [,cm
-                        [,cphi]]])
-                    </para>
-                    <variablelist>
-                        <varlistentry>
-                            <term>sup</term>
-                            <listitem>
-                                <para>1 indica superposição sobre o esboço anterior e 0 indica
-                                    que nenhuma superposição é feita 
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>leg</term>
-                            <listitem>
-                                <para>1 indica que as legendas são impressas, 0 indica sem
-                                    legendas 
-                                </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cm</term>
-                            <listitem>
-                                <para>número da cor para curvas de ganho </para>
-                            </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                            <term>cphi</term>
-                            <listitem>
-                                <para>número da cor para curvas de fase</para>
-                            </listitem>
-                        </varlistentry>
-                    </variablelist>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Esboça a carta de Nichols: curvas de nível de iso-ganho e iso-fase
-            dey/(1+y) no plano de fase/ganho.
-        </para>
-        <para>
-            <literal>chart</literal> pode ser utilizado em conjunção a <link linkend="black">black</link>.
-        </para>
-        <para>
-            Os valore padrões para <literal>gain</literal> e
-            <literal>phase</literal> são respectivamente:
-        </para>
-        <para>
-            <literal>[-12 -8 -6 -5 -4 -3 -2 -1.4 -1 -.5 0.25 0.5 0.7 1 1.4 2 2.3
-                3 4 5 6 8 12]
-            </literal>
-        </para>
-        <para>
-            <literal>[-(1:10) , -(20:10:160)]</literal>
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-s=poly(0,'s')
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-black(h,0.01,100)
-chart(list(1,0,2,3));
-
-clf()
-h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-black([h1;h],0.01,100,['h1';'h'])
-set(gca(),'data_bounds',[-180 -30;180 30]) //aumentando a moldura
-chart(list(1,0));
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="nyquist">nyquist</link>
-            </member>
-            <member>
-                <link linkend="black">black</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 936c69b..130b9dc 100644 (file)
@@ -104,7 +104,7 @@ m_circle([-8 -6 -4]);
                 <link linkend="nyquist">nyquist</link>
             </member>
             <member>
-                <link linkend="chart">chart</link>
+                <link linkend="nicholschart">nicholschart</link>
             </member>
             <member>
                 <link linkend="black">black</link>
diff --git a/scilab/modules/cacsd/macros/chart.sci b/scilab/modules/cacsd/macros/chart.sci
deleted file mode 100644 (file)
index 2717a51..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA Serge Steer
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-
-function chart(attenu,angl,flags)
-
-    warnobsolete("nicholschart", "5.5.1");
-    titre=_("Amplitude and phase contours of y/(1+y)")
-    l10=log(10);
-    ratio=%pi/180;
-    defaultAngles = [1:10,20:10:160];
-    //
-    [lhs,rhs]=argn(0)
-
-    select rhs
-
-    case 3 then
-
-    case 2 then,
-        if type(angl)==15 then
-            // angl actually stands for flags
-            flags=angl
-            angl = defaultAngles;
-        else
-            // angl is the phase
-            flags=[]
-        end
-
-    case 1 then
-        if type(attenu)==15 then
-            flags=attenu
-            attenu=[-12 -8 -6 -5 -4 -3 -2 -1.4 -1 -.5 ,..
-            0.25 0.5 0.7 1 1.4 2 2.3 3 4 5 6 8 12];
-        else
-            flags=list()
-        end
-        angl = defaultAngles;
-    else
-        flags=list()
-        attenu=[-12 -8 -6 -5 -4 -3 -2 -1.4 -1 -.5 ,..
-        0.25 0.5 0.7 1 1.4 2 2.3 3 4 5 6 8 12];
-        angl = defaultAngles;
-    end
-
-    // convert angles to radian
-    angl = -angl * ratio;
-
-    c1=color("lightgrey");c2=c1
-    select size(flags)
-    case 0 then
-        flags=list(0,-1,c1,c2)
-    case 1 then
-        flags=list(flags(1),-1,c1,c2)
-    case 2 then
-        flags=list(flags(1),flags(2),c1,c2)
-    case 3 then
-        flags(4)=c2
-    end
-    //
-
-
-    if ~flags(1) then
-        clf()
-        ax=gca();
-        ax.data_bounds=[-360,-50;0,40];
-        ax.axes_visible="on";
-        ax.box="on";
-        ax.tight_limits="on"
-    else
-        ax=gca();
-    end
-    ax.clip_state="clipgrf"
-    //  ax.data_bounds=[0,-50;360,40];
-
-    phi_min=ax.data_bounds(1,1)
-    phi_max=ax.data_bounds(2,1)
-    k1=floor(phi_min/180)
-    k2=ceil(phi_max/180)
-    //
-
-    fig=gcf();
-    immediate_drawing=fig.immediate_drawing;
-    fig.immediate_drawing="off";
-
-    if flags(2) then xtitle(titre,_("phase(y) (degree)"),_("magnitude(y) (Db)")),end
-    llrect=xstringl(0,0,"1")
-
-    //isogain curves
-    lambda=exp(l10*attenu/20)
-    rayon=lambda./(lambda.*lambda-ones(lambda))
-    centre=-lambda.*rayon
-    //
-    if attenu<>[]
-        for i = 1:prod(size(attenu)),
-            att=attenu(i);
-            if att<0 then
-                w=%eps:0.03:%pi;
-            else
-                w=-%pi:0.03:0;
-            end;
-            n=prod(size(w))
-            rf=centre(i)*ones(w)+rayon(i)*exp(%i*w);
-            phi=atan(imag(rf),real(rf))/ratio; //phi is in [-180 0]
-            module=20*log(abs(rf))/l10;
-
-            //use symetry and period to extend the curve on [k1*180 k2*180]
-            p=[];m=[];
-            S=[]
-            for k=k1:k2-1
-                if pmodulo(k,2)==0 then
-                    p=[p %nan k*180-phi($:-1:1)]
-                    m=[m %nan module($:-1:1)]
-                    if att>0 then
-                        xstring(p($),m($),string(att),0,0),
-                        e=gce();
-                        if ~flags(1) then e.clip_state="off";end
-                        S=[e S]
-                    end
-                else
-                    p=[p %nan ((k+1)*180)+phi]
-                    m=[m %nan module]
-                    if att<0 then
-                        xstring(p($),m($),string(att),0,0),
-                        e=gce();
-                        if ~flags(1) then e.clip_state="off";end
-                        S=[e S]
-                    end
-                end
-
-            end
-            xpoly(p,m)
-            e=gce();e.foreground=flags(3);//e.line_style=3,
-            if size(S,"*")>1 then S=glue(S),end
-            S=glue([S,e]);S.user_data=att;
-        end;
-        glue(ax.children(size(attenu,"*"):-1:1))
-    end
-    //isophase curves
-    if angl<>[] then
-        eps=100*%eps;
-        for teta=angl,
-            if teta < -%pi/2 then
-                last=teta-eps,
-            else
-                last=teta+eps,
-            end;
-            w=[-170*ratio:0.03:last last]
-            n=prod(size(w));
-            module=real(20*log((sin(w)*cos(teta)/sin(teta)-cos(w)))/l10)
-            w=w/ratio
-            p=[];m=[];
-            for k=k1:k2-1
-                if pmodulo(k,2)==0 then
-                    p=[p %nan k*180-w($:-1:1)]
-                    m=[m %nan module($:-1:1)]
-                else
-                    p=[p %nan ((k+1)*180)+w]
-                    m=[m %nan module]
-                end
-            end
-            xpoly(p,m)
-            e=gce();e.foreground=flags(3);//e.line_style=3,
-            e.user_data=teta
-        end;
-        glue(ax.children(size(angl,"*"):-1:1))
-    end
-    fig.immediate_drawing=immediate_drawing;
-endfunction
index d83bde7..d9ba9c7 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="chart">nicholschart</link>
+                    <link linkend="nicholschart">nicholschart</link>
                 </term>
                 <listitem>
                     <para>abaque de Nichols</para>
index fba8f65..754eb85 100644 (file)
                 
                 <term>
                     
-                    <link linkend="chart">nicholschart</link>
+                    <link linkend="nicholschart">nicholschart</link>
                     
                 </term>
                 
index e4d294f..1b5128b 100644 (file)
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>chart</term>
+                <term>nicholschart</term>
                 <listitem>
                     <para>carta de Nichols</para>
                 </listitem>
index 6cc932c..16d838e 100644 (file)
             </varlistentry>
             <varlistentry>
                 <term>
-                    <link linkend="chart">nicholschart</link>
+                    <link linkend="nicholschart">nicholschart</link>
                 </term>
                 <listitem>
                     <para>Диаграмма Никольса</para>
index 3196626..809721f 100644 (file)
 //
 // <-- Short Description -->
 // chart() is inconsistent in the second argument, angle. It might be treated as degrees or radian.
-// 
-s=poly(0,'s');
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
+// Obsolete chart() replaced by nicholschart() to check the bug is still fixed.
+s=poly(0,"s");
+h=syslin("c",(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
 f0 = scf(0);
-black(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)');
-chart([-8 -6 -4],[80 120]);
-WARNING: Feature chart is obsolete.
-         Please use nicholschart instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
+black(h,0.01,100,"(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)");
+nicholschart([-8 -6 -4],[80 120]);
 c0 = gce();
 f1 = scf(1);
-black(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)');
-chart([-8 -6 -4],[80 120],list(0,0));
-WARNING: Feature chart is obsolete.
-         Please use nicholschart instead.
-         This feature will be permanently removed in Scilab 5.5.1
-
+black(h,0.01,100,"(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)");
+nicholschart([-8 -6 -4],[80 120],color("light gray"));
 c1 = gce();
-// The two above figure should be identical
+// The two above figure should be identical except colors
 // the current entities are compounds containing two polylines
 if (c0.children(1).data <> c1.children(1).data) then bugmes();quit;end
 if (c0.children(2).data <> c1.children(2).data) then bugmes();quit;end
index 30a2169..15d7a2c 100644 (file)
 //
 // <-- Short Description -->
 // chart() is inconsistent in the second argument, angle. It might be treated as degrees or radian.
-// 
+// Obsolete chart() replaced by nicholschart() to check the bug is still fixed.
 
-s=poly(0,'s');
-h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
+s=poly(0,"s");
+h=syslin("c",(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01));
 
 
 f0 = scf(0);
-black(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)');
-chart([-8 -6 -4],[80 120]);
+black(h,0.01,100,"(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)");
+nicholschart([-8 -6 -4],[80 120]);
 c0 = gce();
 
 f1 = scf(1);
-black(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)');
-chart([-8 -6 -4],[80 120],list(0,0));
+black(h,0.01,100,"(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)");
+nicholschart([-8 -6 -4],[80 120],color("light gray"));
 c1 = gce();
 
-// The two above figure should be identical
+// The two above figure should be identical except colors
 // the current entities are compounds containing two polylines
 if (c0.children(1).data <> c1.children(1).data) then pause; end
 if (c0.children(2).data <> c1.children(2).data) then pause; end