[graphics] datatipGetStruct() datatipSetStruct() removal + cleaning 55/21055/6
Samuel GOUGEON [Thu, 25 Jul 2019 21:33:26 +0000 (23:33 +0200)]
 datatipRemoveNearest()  : called nowhere => macro removed
 datatipDeleteSelected() : called nowhere => macro removed
 datatipSetSelected()    : called nowhere => macro removed
 datatipsGUI()           : called nowhere => macro removed
 datatipSetGUI()         : called only in datatipsGUI() => macro removed
 datatipGetSelected()    : called only in datatipDeleteSelected() &
                           datatipSetSelected() => macro removed
 datatipRadioCallback()  : idem
 datatipMove.sci         : replaced with a builtin => macro removed
 datatipSetStyle.sci     : idem

 Hence:
 datatipSetStruct()      : called only in the above macros => removal OK
 datatipGetStruct()      : idem

 Datatips cleaning is not achieved, but this is a first step.

Change-Id: I26afca3825f8a07f8d0099e763dfbede6d3f6398

19 files changed:
scilab/modules/graphics/demos/datatips/datatip2.sce
scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml [deleted file]
scilab/modules/graphics/help/en_US/datatips/datatipSetStruct.xml [deleted file]
scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml [deleted file]
scilab/modules/graphics/help/ja_JP/datatips/datatipSetStruct.xml [deleted file]
scilab/modules/graphics/locales/fr_FR.po
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/datatips/datatipDeleteSelected.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipGetSelected.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipGetStruct.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipMove.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipRadioCallback.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipRemoveNearest.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipSetGUI.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipSetSelected.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipSetStruct.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipSetStyle.sci [deleted file]
scilab/modules/graphics/macros/datatips/datatipsGUI.sci [deleted file]
scilab/modules/helptools/data/configuration/scilab_macros.txt

index f450c6d..d8aca25 100644 (file)
@@ -18,36 +18,28 @@ function datatip2
 
     title(_("datatips on 3D curves"),"fontsize",3);
 
-
-    r=1;
-    k=tan(%pi/27);
-    t=linspace(-40,40,1000);
-    x=r*cos(t)./cosh(k*t);
-    y=r*sin(t)./cosh(k*t);
-    z=r*tanh(k*t);
-    param3d(x,y,z);c=gce();c.thickness=2;C.foreground=color("blue")
-
-    ax=gca();ax.rotation_angles=[70 50];ax.axes_visible="off";
+    r = 1;
+    k = tan(%pi/27);
+    t = linspace(-40,40,1000);
+    x = r * cos(t) ./ cosh(k*t);
+    y = r * sin(t) ./ cosh(k*t);
+    z = r * tanh(k*t);
+    param3d(x,y,z);
+    c = gce();
+    c.thickness = 2;
+    c.foreground = color("blue")
+
+    ax = gca();
+    ax.rotation_angles = [70 50];
+    ax.axes_visible = "off";
     drawnow()
 
     c.display_function_data = t;
     datatipSetStyle(c,2,%f) //directional arrow no box
 
-    function s=mydisp(curve,pt,index),
-        ud=datatipGetStruct(curve);
-        if index<>[] then
-            t=ud.t(index);
-        else //interpolated
-            [d,ptp,i,c]=orthProj(curve.data,pt);
-            t=ud.t(i)+(ud.t(i+1)-ud.t(i))*c;
-        end
-        s=msprintf("%.2g", t);
-    endfunction
-
-    for k=[350 400 450 500 520  550 600]
+    for k = [350 400 450 500 520  550 600]
         dt=datatipCreate(c,k);
     end
-    //datatipSetDisplay(c,mydisp) // Change the default datatip label
 
     datatipManagerMode(fig,"on") //activate the interactive editor
 
diff --git a/scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml b/scilab/modules/graphics/help/en_US/datatips/datatipGetStruct.xml
deleted file mode 100644 (file)
index 924f1ef..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
--->
-<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_US" xml:id="datatipGetStruct">
-    <refnamediv>
-        <refname>datatipGetStruct</refname>
-        <refpurpose>
-            Retrieve the datatips data structure from the polyline entity. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            datatips_struct=datatipGetStruct(curve_handle)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>curve_handle</term>
-                <listitem>
-                    <para>
-                        A handle on a polyline.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <variablelist>
-            <varlistentry>
-                <term>datatips_struct</term>
-                <listitem>
-                    <para>
-                        A tlist of type  <literal>datatips</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>datatipGetStruct</literal> extract the datatips data
-            structure out of the polyline  entity. It may be called
-            to retrieve properties of the datatips data structure to
-            customize the tip display.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-    x=linspace(0,1,100)';
-    y=x.^3;
-    clf()
-    plot(x,y);
-    e=gce();p=e.children(1);//get the handle on the polyline
-    datatipCreate(p,50);
-    datatipCreate(p,20);
-    datatips_struct=datatipGetStruct(p)
-    datatips_struct.display_function
-    ]]></programlisting>
-        <scilab:image>
-            x=linspace(0,1,100)';
-            y=x.^3;
-            plot(x,y);
-            e=gce();p=e.children(1);//get the handle on the polyline
-            datatipCreate(p,50);
-            datatipCreate(p,20);
-        </scilab:image>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revdescription>
-                    Function tagged obsolete. Will be removed in 5.5.1. Please use <link linkend="polyline_properties">"datatips" property</link> instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-            <member>
-                <link linkend="datatipSetDisplay">datatipSetDisplay</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/en_US/datatips/datatipSetStruct.xml b/scilab/modules/graphics/help/en_US/datatips/datatipSetStruct.xml
deleted file mode 100644 (file)
index 38f8fdd..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
--->
-<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_US" xml:id="datatipSetStruct">
-    <refnamediv>
-        <refname>datatipSetStruct</refname>
-        <refpurpose>
-            Stores the datatips data structure in the polyline entity. <emphasis role="bold">Obsolete function. </emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            ok=datatipSetStruct(curve_handle,datatips_struct)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>curve_handle</term>
-                <listitem>
-                    <para>
-                        A handle on a polyline.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>datatips_struct</term>
-                <listitem>
-                    <para>
-                        A tlist of type  <literal>datatips</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>ok</term>
-                <listitem>
-                    <para>
-                        A boolean flag set to %f if the operations fail.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>datatipSetStruct</literal> stores the datatips data structure in the polyline
-            entity. This is a subsidiary functions which is not to be called directly.
-        </para>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.4.1</revnumber>
-                <revdescription>
-                    Function tagged obsolete. Will be removed in 5.5.0.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-            <member>
-                <link linkend="datatipGetStruct">datatipGetStruct</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml b/scilab/modules/graphics/help/ja_JP/datatips/datatipGetStruct.xml
deleted file mode 100644 (file)
index aa3debf..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
-
- *
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
--->
-
-<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="datatipGetStruct">
-
-    <refnamediv>
-
-        <refname>datatipGetStruct</refname>
-
-        <refpurpose>
-
-            ポリラインエンティティからdatatipsデータ構造を展開する.
-
-            <emphasis role="bold">この関数は廃止されます.</emphasis>
-
-        </refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>
-
-            datatips_struct=datatipGetStruct(curve_handle)
-
-        </synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>引数</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>curve_handle</term>
-
-                <listitem>
-
-                    <para>
-
-                        ポリラインのハンドル.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>datatips_struct</term>
-
-                <listitem>
-
-                    <para>
-
-                        <literal>datatips</literal>型のtlist.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            <literal>datatipGetStruct</literal> は,
-
-            ポリラインエンティティからdatatipsデータ構造体を展開します.
-
-            tipの表示をカスタマイズするために
-
-            datatipsデータ構造体のプロパティを取得する際にコールすることができます.
-
-        </para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>例</title>
-
-        <programlisting role="example"><![CDATA[
-
-    x=linspace(0,1,100)';
-
-    y=x.^3;
-
-    clf()
-
-    plot(x,y);
-
-    e=gce();p=e.children(1);//ポリラインのハンドルを取得
-
-    datatipCreate(p,50);
-
-    datatipCreate(p,20);
-
-    datatips_struct=datatipGetStruct(p)
-
-    datatips_struct.display_function
-
-    ]]></programlisting>
-
-        <scilab:image>
-
-            x=linspace(0,1,100)';
-
-            y=x.^3;
-
-            plot(x,y);
-
-            e=gce();p=e.children(1);//get the handle on the polyline
-
-            datatipCreate(p,50);
-
-            datatipCreate(p,20);
-
-        </scilab:image>
-
-    </refsection>
-
-    <refsection>
-
-        <title>履歴</title>
-
-        <revhistory>
-
-            <revision>
-
-                <revnumber>5.5.0</revnumber>
-
-                <revdescription>
-
-                    関数が廃止対象となりました. 5.5.1で削除されます.
-
-                    代わりに<link linkend="polyline_properties">"datatips" プロパティ</link>を使用してください.
-
-                </revdescription>
-
-            </revision>
-
-        </revhistory>
-
-    </refsection>
-
-    <refsection role="see also">
-
-        <title>参照</title>
-
-        <simplelist type="inline">
-
-            <member>
-
-                <link linkend="datatips">datatips</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="datatipSetDisplay">datatipSetDisplay</link>
-
-            </member>
-
-        </simplelist>
-
-    </refsection>
-
-</refentry>
-
diff --git a/scilab/modules/graphics/help/ja_JP/datatips/datatipSetStruct.xml b/scilab/modules/graphics/help/ja_JP/datatips/datatipSetStruct.xml
deleted file mode 100644 (file)
index 49a2219..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
-
- *
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
--->
-
-<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="datatipSetStruct">
-
-    <refnamediv>
-
-        <refname>datatipSetStruct</refname>
-
-        <refpurpose>
-
-            ポリラインエンティティにdatatipsデータ構造体を保存する.
-
-            <emphasis role="bold">この関数は廃止されます.</emphasis>
-
-        </refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>
-
-            ok=datatipSetStruct(curve_handle,datatips_struct)
-
-        </synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>パラメータ</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>curve_handle</term>
-
-                <listitem>
-
-                    <para>
-
-                        ポリラインのハンドル.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>datatips_struct</term>
-
-                <listitem>
-
-                    <para>
-
-                        <literal>datatips</literal>型のtlist.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-            <varlistentry>
-
-                <term>ok</term>
-
-                <listitem>
-
-                    <para>
-
-                        操作が失敗した場合に論理値フラフが %f に設定されます.
-
-                    </para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-
-        <para>
-
-            <literal>datatipSetStruct</literal> は
-
-            ポリラインエンティティにdatatipsデータ構造体を保存します.
-
-            この関数は,ユーティリティ関数で直接コールされることはありません.
-
-        </para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>履歴</title>
-
-        <revhistory>
-
-            <revision>
-
-                <revnumber>5.4.1</revnumber>
-
-                <revdescription>
-
-                    関数が廃止対象となりました. 5.5.0で削除されます.
-
-                </revdescription>
-
-            </revision>
-
-        </revhistory>
-
-    </refsection>
-
-    <refsection role="see also">
-
-        <title>参照</title>
-
-        <simplelist type="inline">
-
-            <member>
-
-                <link linkend="datatips">datatips</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="datatipGetStruct">datatipGetStruct</link>
-
-            </member>
-
-        </simplelist>
-
-    </refsection>
-
-</refentry>
-
index 2ff2a59..591ae4a 100644 (file)
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: scilab\n"
 "Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
 "POT-Creation-Date: 2013-04-16 17:44+0100\n"
-"PO-Revision-Date: 2020-02-18 22:06+0000\n"
+"PO-Revision-Date: 2020-02-23 22:06+0000\n"
 "Last-Translator: Scilab.team <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1485,13 +1485,13 @@ msgid "Misc"
 msgstr "Divers"
 
 msgid "datatips on 2D curves"
-msgstr "Astuces sur les données pour les courbes 2D"
+msgstr "Etiquetage de courbes 2D"
 
 msgid "datatips on 3D curves"
-msgstr "Astuces sur les données pour les courbes 3D"
+msgstr "Etiquetage de courbes 3D"
 
 msgid "Datatips detached from curve"
-msgstr "Datatips détachés de la courbe"
+msgstr "Etiquettes détachées de la courbe"
 
 msgid "2D curves"
 msgstr "Courbes 2D"
index e0ef8fb..95e7ac4 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2020-02-18 16:36+0100\n"
+"Revision-Date: 2020-02-23 16:36+0100\n"
 
 # File: modules/graphics/sci_gateway/c/sci_Legend.c, line: 83
 # File: modules/graphics/sci_gateway/c/sci_Legend.c, line: 221
@@ -3494,7 +3494,6 @@ msgstr ""
 
 #
 # File: modules/graphics/macros/barh.sci, line: 133
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 46
 # File: modules/graphics/macros/setPlotProperty.sci, line: 104
 # File: modules/graphics/macros/setSurfProperty.sci, line: 291
 #, c-format
@@ -3647,7 +3646,6 @@ msgstr ""
 # File: modules/graphics/macros/colordef.sci, line: 109
 # File: modules/graphics/macros/createConstraints.sci, line: 103
 # File: modules/graphics/macros/createLayoutOptions.sci, line: 59
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 50
 # File: modules/graphics/macros/edit_curv.sci, line: 72
 # File: modules/graphics/macros/legend.sci, line: 56
 #, c-format
@@ -3707,8 +3705,6 @@ msgstr ""
 #
 # File: modules/graphics/macros/contour.sci, line: 47
 # File: modules/graphics/macros/contour2d.sci, line: 24
-# File: modules/graphics/macros/datatips/datatipMove.sci, line: 17
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 20
 # File: modules/graphics/macros/errbar.sci, line: 36
 # File: modules/graphics/macros/fgrayplot.sci, line: 38
 # File: modules/graphics/macros/fplot2d.sci, line: 30
@@ -3835,22 +3831,12 @@ msgstr ""
 
 #
 # File: modules/graphics/macros/datatips/datatipGetEntities.sci, line: 42
-# File: modules/graphics/macros/datatips/datatipMove.sci, line: 21
-# File: modules/graphics/macros/datatips/datatipMove.sci, line: 29
 # File: modules/graphics/macros/datatips/datatipSetOrientation.sci, line: 20
-# File: modules/graphics/macros/datatips/datatipSetStruct.sci, line: 19
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 27
 #, c-format
 msgid "%s: Wrong type for input argument #%d: A '%s' handle expected.\n"
 msgstr ""
 
 #
-# File: modules/graphics/macros/datatips/datatipGetStruct.sci, line: 15
-msgid "'datatips' property"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipGetStruct.sci, line: 18
 # File: modules/graphics/macros/twinkle.sci, line: 38
 #, c-format
 msgid "%s: Wrong type for input argument #%d: Graphic handle expected.\n"
@@ -3897,147 +3883,16 @@ msgid ""
 msgstr ""
 
 #
-# File: modules/graphics/macros/datatips/datatipSetStruct.sci, line: 37
-#, c-format
-msgid "%s: Wrong type for curve user_data field: a struct expected.\n"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 32
-msgid "Square mark, boxed label"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 33
-msgid "Square mark, simple label"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 34
-msgid "Square mark, no label"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 35
-msgid "Directional arrow, boxed label"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 36
-msgid "Directional arrow, simple label"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 37
-msgid "Directional arrow, no label"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 39
-msgid "Select tip style"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 54
-# File: modules/graphics/macros/datatips/datatipSetStyle.sci, line: 58
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A boolean scalar expected.\n"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 53
-# File: modules/graphics/macros/getcolor.sci, line: 86
-msgid "&File"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 54
-# File: modules/graphics/macros/getcolor.sci, line: 87
-msgid "&Tools"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 55
 # File: modules/graphics/macros/getcolor.sci, line: 88
 msgid "&Edit"
 msgstr ""
 
 #
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 56
 # File: modules/graphics/macros/getcolor.sci, line: 89
 msgid "&?"
 msgstr ""
 
 #
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 62
-msgid "Datatips style"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 82
-msgid "Marker style:"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 96
-msgid "Square"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 119
-msgid "Arrow"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 146
-msgid "Labeled?"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 160
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 225
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 353
-msgid "Yes"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 183
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 248
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 376
-msgid "No"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 211
-msgid "Boxed?"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 275
-msgid "Positionning?"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 289
-msgid "Knots"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 312
-msgid "Interpolated"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 339
-msgid "Allow multiple datatips?"
-msgstr ""
-
-#
-# File: modules/graphics/macros/datatips/datatipsGUI.sci, line: 404
-msgid "Edit label generator"
-msgstr ""
-
-#
 # File: modules/graphics/macros/edit_curv.sci, line: 116
 msgid "File"
 msgstr ""
diff --git a/scilab/modules/graphics/macros/datatips/datatipDeleteSelected.sci b/scilab/modules/graphics/macros/datatips/datatipDeleteSelected.sci
deleted file mode 100644 (file)
index 10513fe..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipDeleteSelected(curve_handles)
-    //datatip utility function
-    //set the selected datatip(s)
-
-    [curve,ind]=datatipGetSelected(curve_handles)
-    if ind<>[] then
-        datatipRemove(curve,ind)
-    end
-endfunction
-
diff --git a/scilab/modules/graphics/macros/datatips/datatipGetSelected.sci b/scilab/modules/graphics/macros/datatips/datatipGetSelected.sci
deleted file mode 100644 (file)
index 616e9c7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function [curve,ind]=datatipGetSelected(curve_handles)
-    //datatip utility function
-    //get the selected datatip(s)
-    ind=[]
-    for kc=1:size(curve_handles,"*")
-        curve=curve_handles(kc);
-        ud=datatipGetStruct(curve);
-        sel=ud.selected
-        if sel>0 then ind=sel,break,end
-    end
-    if ind==[] then curve=[],end
-endfunction
-
diff --git a/scilab/modules/graphics/macros/datatips/datatipGetStruct.sci b/scilab/modules/graphics/macros/datatips/datatipGetStruct.sci
deleted file mode 100644 (file)
index d64d946..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function t=datatipGetStruct(curve)
-
-    warnobsolete(_("''datatips'' property"), "5.5.1")
-
-    if type(curve)<>9|size(curve,"*")<>1 then
-        error(msprintf(_("%s: Wrong type for input argument #%d: Graphic handle expected.\n"),"datatipGetStruct",1))
-    end
-
-    t = curve.datatips;
-endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipMove.sci b/scilab/modules/graphics/macros/datatips/datatipMove.sci
deleted file mode 100644 (file)
index 8b50997..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipMove(tip_handle,ax)
-    //moves a datatip along the associated curve
-    // tip_handle : handle on the given datatip compound;
-    if argn(2)<1 then
-        error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),"datatipMove",1))
-    end
-
-    if type(tip_handle)<>9|size(tip_handle,"*")<>1|or(tip_handle.type<>"Datatip") then
-        error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipMove",1,"Datatip"))
-    end
-
-    if argn(2)==1 then
-        ax=tip_handle.parent
-        while ax.type<>"Axes" then ax=ax.parent,end
-    else
-        if type(ax)<>9|size(ax,"*")<>1|or(ax.type<>"Axes") then
-            error(msprintf(_( "%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),"datatipMove",2,"Axes"))
-        end
-    end
-    curve_handle=tip_handle.children(1).user_data(1)
-    data=curve_handle.data //the curve data points
-    ud=datatipGetStruct(curve_handle);
-
-    if ax.view=="3d"&curve_handle.type=="Polyline" then
-        [xx,yy]=geom3d(data(:,1),data(:,2),data(:,3))
-        data=[xx,yy]
-    end
-
-    rep=[0 0 -1];
-    if ~ud.interpolate then //position restricted to knots
-        np=size(data,1)
-        while rep(3)==-1
-            rep=xgetmouse([%t %t])
-            //find data point which is at minimum distance to the pointer
-            [m,k]=min(sum((data-ones(np,1).*.rep(1:2)).^2,2))
-            datatipSetTipPosition(ud,tip_handle,curve_handle.data(k,:),k)
-        end
-    else //interpolated position
-        while rep(3)==-1
-            rep=xgetmouse([%t %t])
-            //find data point which is at minimum distance to the pointer
-            [d,pt,k,c]=orthProj(data,rep(1:2))
-            if pt<>[] then
-                if ax.view=="3d"&curve_handle.type=="Polyline" then
-                    pt=curve_handle.data(k,:)+c*(curve_handle.data(k+1,:)-curve_handle.data(k,:))
-                end
-                datatipSetTipPosition(ud,tip_handle,pt,k)
-            end
-        end
-    end
-endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipRadioCallback.sci b/scilab/modules/graphics/macros/datatips/datatipRadioCallback.sci
deleted file mode 100644 (file)
index b90e22e..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipRadioCallback(key,v)
-    global datatipGUIHandles datatipGUICurve
-    Keys=["sty" "lab" "box" "pos" "mul"]
-    i=find(key==Keys)
-    if v then
-        datatipGUIHandles(i,1).value=1
-        datatipGUIHandles(i,2).value=0
-    else
-        datatipGUIHandles(i,1).value=0
-        datatipGUIHandles(i,2).value=1
-    end
-    if i<=3 then
-        ud=datatipGetStruct(datatipGUICurve)
-        style=ud.style
-    end
-    select key
-    case "sty"
-        style(1)=bool2s(~v)+1
-    case "lab"
-        style(3)=bool2s(v)
-    case "box"
-        style(2)=bool2s(v)
-    case "pos"
-        datatipSetInterp(datatipGUICurve,~v);
-    case "mul"
-        datatipSetReplaceMode(datatipGUICurve,~v);
-    end
-
-    if i<=3 then
-        ud.style=style
-        datatipSetStruct(datatipGUICurve,ud)
-        fig=datatipGUICurve.parent
-        while fig.type<>"Figure" then fig=fig.parent,end
-        id=fig.immediate_drawing;
-        fig.immediate_drawing="off"
-        for i=1:size(ud.tips.children,"*")
-            datatipSetTipStyle(ud.tips.children(i),style)
-        end
-        fig.immediate_drawing=id
-    end
-endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipRemoveNearest.sci b/scilab/modules/graphics/macros/datatips/datatipRemoveNearest.sci
deleted file mode 100644 (file)
index e453805..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipRemoveNearest(curve,pt)
-    //datatip utility function
-    ud=datatipGetStruct(curve)
-    if typeof(ud)=="datatips" then
-        tips=ud.tips.children
-        dmin=%inf;l=[];
-        pt=pt(:);
-        for tip_index=1:size(tips,"*")
-            d=norm(tips(tip_index).children(1).data(1:2)-pt(1:2))
-            if d<dmin then
-                l=tip_index;dmin=d;
-            end
-        end
-        if l<>[] then
-            datatipRemove(curve,l);
-        end
-    end
-endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetGUI.sci b/scilab/modules/graphics/macros/datatips/datatipSetGUI.sci
deleted file mode 100644 (file)
index 3eb403a..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-function datatipSetGUI()
-    global datatipGUIwin
-    if datatipGUIwin==[] then return,end
-    global datatipGUIHandles datatipGUICurve
-    ud=datatipGetStruct(datatipGUICurve)
-    if typeof(ud)<>"datatips" then
-        //no datatips structure yet, initialize it
-        ud=datatipGetStruct(curve)
-    end
-    style=ud.style
-    if style(1)==1 then
-        datatipGUIHandles(1,1).value=1
-        datatipGUIHandles(1,2).value=0
-    else
-        datatipGUIHandles(1,1).value=0
-        datatipGUIHandles(1,2).value=1
-    end
-    if style(3)==1 then
-        datatipGUIHandles(2,1).value=1
-        datatipGUIHandles(2,2).value=0
-    else
-        datatipGUIHandles(2,1).value=0
-        datatipGUIHandles(2,2).value=1
-    end
-    if style(2)==1 then
-        datatipGUIHandles(3,1).value=1
-        datatipGUIHandles(3,2).value=0
-    else
-        datatipGUIHandles(3,1).value=0
-        datatipGUIHandles(3,2).value=1
-    end
-    if ~ud.interpolate then
-        datatipGUIHandles(4,1).value=1
-        datatipGUIHandles(4,2).value=0
-    else
-        datatipGUIHandles(4,1).value=0
-        datatipGUIHandles(4,2).value=1
-    end
-    if ~ud.replace then
-        datatipGUIHandles(5,1).value=1
-        datatipGUIHandles(5,2).value=0
-    else
-        datatipGUIHandles(5,1).value=0
-        datatipGUIHandles(5,2).value=1
-    end
-endfunction
-
-
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetSelected.sci b/scilab/modules/graphics/macros/datatips/datatipSetSelected.sci
deleted file mode 100644 (file)
index 11e8e89..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipSetSelected(curve_handles,tip_indices)
-    //datatip utility function
-    //set the selected datatip(s)
-
-    [curve,ind]=datatipGetSelected(curve_handles)
-    //unselect the current datatip if any
-    if ind<>[] then
-        ud=datatipGetStruct(curve);
-        tips=ud.tips.children
-        tip_handle=tips(ind);
-        datatipHilite(tip_handle) //unhilite
-        ud.selected=0
-        datatipSetStruct(curve,ud);
-    end
-
-    //select the new one
-    if tip_indices<>[] then
-        k=tip_indices(1);
-        l=tip_indices(2);
-        curve=curve_handles(k);
-        ud=datatipGetStruct(curve);
-        tips=ud.tips.children
-        tip_handle=tips(l);
-        datatipHilite(tip_handle)  //hilite
-        ud.selected=l
-        datatipSetStruct(curve,ud);
-    end
-endfunction
-
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetStruct.sci b/scilab/modules/graphics/macros/datatips/datatipSetStruct.sci
deleted file mode 100644 (file)
index 63c88b9..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function ok=datatipSetStruct(curve,t)
-    if argn(2)<>2 then
-        error(msprintf(_("%s: Wrong number of input argument(s): %d expected.\n"),...
-        "datatipSetStruct",2))
-    end
-    if type(curve)<>9|size(curve,"*")<>1|or(curve.type<>"Polyline") then
-        error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
-        "datatipSetType",1,"Polyline"))
-    end
-
-    ok=%t
-    %datatips_i_s=generic_i_s
-    %datatips_i_st=generic_i_st
-    u_d=get(curve,"user_data")
-    if u_d==[] then
-        u_d.datatips=t
-    else
-        if typeof(u_d)=="st"  then
-            u_d.datatips=t
-        elseif typeof(u_d)=="datatips" //for compatibilty
-            u.datatips=u_d
-            u_d=u
-        else
-            ok=%f
-            warning(msprintf(_("%s: Wrong type for curve user_data field: a struct expected.\n"),...
-            "datatipSetStruct"))
-        end
-    end
-    set(curve,"user_data",u_d)
-endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipSetStyle.sci b/scilab/modules/graphics/macros/datatips/datatipSetStyle.sci
deleted file mode 100644 (file)
index b8822ff..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2011 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipSetStyle(curve_handle,t,boxed,labeled)
-    //changes the tips interpolation modes for a given curve
-    // curve_handle : a handle on a polyline
-    // t            : 1 "square mark" or 2 "Directional arrow"
-    // boxed        : a boolean
-    // labeled      : a boolean
-    if argn(2)<1 then
-        error(msprintf(_("%s: Wrong number of input argument(s): At least %d expected.\n"),...
-        "datatipSetType",1))
-    end
-    if argn(2)<4 then labeled=%t,end
-    if argn(2)<3 then boxed=%t,end
-
-    if type(curve_handle)<>9|size(curve_handle,"*")<>1|or(curve_handle.type<>"Polyline") then
-        error(msprintf(_("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"),...
-        "datatipSetType",1,"Polyline"))
-    end
-
-    if argn(2)==1 then
-        items=[_("Square mark, boxed label")
-        _("Square mark, simple label")
-        _("Square mark, no label")
-        _("Directional arrow, boxed label")
-        _("Directional arrow, simple label")
-        _("Directional arrow, no label")
-        ];
-        sel=x_choose(items,_("Select tip style"))
-        if sel==0 then return,end
-        t=floor(sel/3)+1
-        boxed=(modulo(sel,3)==1)
-        labeled=~(modulo(sel,3)==0)
-    else
-        if type(t)<>1|size(t,"*")<>1 then
-            error(msprintf(_("%s: Wrong type for input argument #%d: A scalar expected.\n"),...
-            "datatipSetType",2))
-        end
-        if and(t<>[1 2]) then
-            error(msprintf(_("%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"),...
-            "datatipSetType",2,"1,2"))
-        end
-        if type(boxed)<>4 |size(t,"*")<>1 then
-            error(msprintf(_("%s: Wrong type for input argument #%d: A boolean scalar expected.\n"),...
-            "datatipSetType",3))
-        end
-        if type(labeled)<>4 |size(labeled,"*")<>1 then
-            error(msprintf(_("%s: Wrong type for input argument #%d: A boolean scalar expected.\n"),...
-            "datatipSetType",4))
-        end
-
-    end
-    style=[t bool2s(boxed) bool2s(labeled)]
-
-    ud=datatipGetStruct(curve_handle)
-    if typeof(ud)<>"datatips" then;
-        ud=datatipGetStruct(curve_handle)
-    end
-    if or(ud.style<>style) then
-
-        fig=curve_handle.parent
-        while fig.type<>"Figure" then fig=fig.parent,end
-        id=fig.immediate_drawing;
-        fig.immediate_drawing="off"
-        tips=ud.tips.children
-        for i=1:size(tips,"*")
-            datatipSetTipStyle(tips(i),style)
-        end
-        fig.immediate_drawing=id
-        ud.style=style
-        datatipSetStruct(curve_handle,ud)
-    end
-
-endfunction
diff --git a/scilab/modules/graphics/macros/datatips/datatipsGUI.sci b/scilab/modules/graphics/macros/datatips/datatipsGUI.sci
deleted file mode 100644 (file)
index 8e42699..0000000
+++ /dev/null
@@ -1,416 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// This file is hereby licensed under the terms of the GNU GPL v2.0,
-// pursuant to article 5.3.4 of the CeCILL v.2.1.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function datatipsGUI(curve_handle)
-    global datatipGUIwin
-    if datatipGUIwin<>[]&or(datatipGUIwin==winsid()) then //the gui window is already opened
-        global  datatipGUICurve
-        datatipGUICurve= curve_handle
-        datatipSetGUI()
-        return
-    end
-
-
-    global datatipGUIHandles datatipGUICurve datatipGUIwin
-    margin_x     = 5;      // Horizontal margin between each elements
-    margin_y     = 5;      // Vertical margin between each elements
-    button_w     = 150;
-    button_h     = 25;
-    label_h      = 20;
-    label_w      = 160;
-    slabel_w     = 80;
-    editor_h     = 120;
-    axes_w       = 3*margin_x+label_w+2*(slabel_w+4*margin_x+label_h);
-    editor_w     = axes_w-2*margin_x;
-    axes_h       = 4*margin_y+6*(label_h+margin_y)+ button_h;
-    defaultfont  = "arial"; // Default Font
-    datatipGUICurve= curve_handle
-    ud=datatipGetStruct(datatipGUICurve)
-    if typeof(ud)<>"datatips" then
-        //no datatips structure yet, initialize it
-        ud=datatipGetStruct(curve)
-    end
-    style=ud.style
-
-    datatipGUIwin=max(winsid())+1
-
-    fig_id=datatipGUIwin
-    fig = scf(fig_id)
-    fig.event_handler="datatipGUIEventHandler"
-    fig.event_handler_enable="on"
-
-    // Remove Scilab graphics menus & toolbar
-    //  drawlater (bug)
-    delmenu(fig.figure_id, gettext("&File"));
-    delmenu(fig.figure_id, gettext("&Tools"));
-    delmenu(fig.figure_id, gettext("&Edit"));
-    delmenu(fig.figure_id, gettext("&?"));
-    toolbar(fig.figure_id, "off");
-    fig.axes_size       = [axes_w axes_h];
-
-
-    fig.background      = addcolor([0.8 0.8 0.8]);
-    fig.figure_name     = _("Datatips style");
-    ax=fig.children;
-    ax.background= fig.background ;
-    gui=uicontrol( ..
-    "parent"              , fig,...
-    "style"               , "frame", ..
-    "units"               , "pixels", ..
-    "position"            , [0 0 axes_w axes_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-
-    yo=axes_h-margin_y-label_h;
-    xo=margin_x;
-    H=[]
-    //Datatips positionning
-    x=xo;
-    y=yo;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Marker style:"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "fontweight"          , "bold", ..
-    "horizontalalignment" , "left", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+label_w+margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Square"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "HorizontalAlignment" , "right", ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+slabel_w+margin_x
-    r1=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 1, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""sty"",%t)", ..
-    "visible"             , "on");
-    x=x+label_h+4*margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Arrow"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "HorizontalAlignment" , "right", ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-
-    x=x+slabel_w+margin_x;
-    r2=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 0, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""sty"",%f)", ..
-    "visible"             , "on");
-    H=[H;r1 r2]
-    //Datatips Label
-    x=xo;
-    y=y-margin_y-label_h;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Labeled?"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "fontweight"          , "bold", ..
-    "horizontalalignment" , "left", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+label_w+margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Yes"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+slabel_w+margin_x
-    r1=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 1, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""lab"",%t)", ..
-    "visible"             , "on");
-    x=x+label_h+4*margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("No"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-
-    x=x+slabel_w+margin_x;
-    r2=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 0, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""lab"",%f)", ..
-    "visible"             , "on");
-    H=[H;r1 r2]
-
-    //Datatips box
-    x=xo;
-    y=y-margin_y-label_h;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Boxed?"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "fontweight"          , "bold", ..
-    "horizontalalignment" , "left", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+label_w+margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Yes"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+slabel_w+margin_x;
-    r1=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 1, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""box"",%t)", ..
-    "visible"             , "on");
-    x=x+label_h+4*margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("No"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-
-    x=x+slabel_w+margin_x;
-    r2=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 0, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""box"",%f)", ..
-    "visible"             , "on");
-    H=[H;r1 r2]
-    //marker position
-    x=xo;
-    y=y-margin_y-label_h;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Positionning?"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "fontweight"          , "bold", ..
-    "horizontalalignment" , "left", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+label_w+margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Knots"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+slabel_w+margin_x;
-    r1=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 1, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""pos"",%t)", ..
-    "visible"             , "on");
-    x=x+label_h+4*margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Interpolated"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-
-    x=x+slabel_w+margin_x;
-    r2=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 0, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""pos"",%f)", ..
-    "visible"             , "on");
-    H=[H;r1 r2]
-    //Multiple datatips
-    x=xo;
-    y=y-margin_y-label_h;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Allow multiple datatips?"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "fontweight"          , "bold", ..
-    "horizontalalignment" , "left", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+label_w+margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("Yes"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-    x=x+slabel_w+margin_x;
-    r1=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 1, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""mul"",%t)", ..
-    "visible"             , "on");
-    x=x+label_h+4*margin_x;
-    uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "text", ..
-    "string"              , _("No"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y slabel_w label_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "horizontalalignment" , "right", ..
-    "background"          , [1 1 1]*0.8, ..
-    "visible"             , "on");
-
-    x=x+slabel_w+margin_x;
-    r2=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "radiobutton", ..
-    "value"               , 0, ..
-    "units"               , "pixels", ..
-    "position"            , [x y label_h label_h], ..
-    "background"          , [1 1 1]*0.8, ..
-    "callback"            , "datatipRadioCallback(""mul"",%f)", ..
-    "visible"             , "on");
-    H=[H;r1 r2]
-    //label edition function
-    x=xo;
-    y=y-2*margin_y-button_h;
-
-    E=  uicontrol( ...
-    "parent"              , gui, ..
-    "style"               , "pushbutton", ..
-    "string"              , _("Edit label generator"), ..
-    "units"               , "pixels", ..
-    "position"            , [x y button_w button_h], ..
-    "fontname"            , defaultfont, ..
-    "fontunits"           , "points", ..
-    "fontsize"            , 12, ..
-    "callback"            , "global  datatipGUICurve;datatipSetDisplay(datatipGUICurve)", ..
-    "visible"             , "on");
-
-
-    datatipGUIHandles=H
-    datatipSetGUI()
-endfunction
index d499507..9ca869e 100644 (file)
@@ -1737,22 +1737,13 @@ zlabel
 %datatips_p
 datatipCreatePopupMenu
 datatipDefaultDisplay
-datatipDeleteSelected
 datatipGUIEventHandler
 datatipGetEntities
-datatipGetSelected
-datatipGetStruct
 datatipHilite
-datatipRadioCallback
 datatipRemoveAll
-datatipRemoveNearest
-datatipSetGUI
 datatipSetOrientation
-datatipSetSelected
-datatipSetStruct
 datatipSetTipPosition
 datatipSetTipStyle
-datatipsGUI
 orthProj
 pixDist
 setStringPosition