* datatipRedraw removed 61/14261/2
Paul Bignier [Tue, 1 Apr 2014 07:52:13 +0000 (09:52 +0200)]
Change-Id: Iaf11373697edec55622f22b602c48bc5e7419ad9

scilab/CHANGES_5.5.X
scilab/modules/graphics/help/en_US/datatips/datatipRedraw.xml [deleted file]
scilab/modules/graphics/help/ja_JP/datatips/datatipRedraw.xml [deleted file]
scilab/modules/graphics/macros/datatips/datatipContextMenu.sci
scilab/modules/graphics/macros/datatips/datatipEventhandler.sci
scilab/modules/graphics/macros/datatips/datatipRedraw.sci [deleted file]
scilab/modules/helptools/data/configuration/scilab_macros.txt

index 22d6d4b..2698acf 100644 (file)
@@ -204,7 +204,7 @@ Obsolete & Removed Functions
 
 * winclose removed. Please use close instead.
 
-* datatipInitStruct removed.
+* datatipInitStruct and datatipRedraw removed.
 
 * regress tagged as obsolete. Will be removed in Scilab 5.5.1.
   Please use reglin instead.
diff --git a/scilab/modules/graphics/help/en_US/datatips/datatipRedraw.xml b/scilab/modules/graphics/help/en_US/datatips/datatipRedraw.xml
deleted file mode 100644 (file)
index be95221..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
- * 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_US" xml:id="datatipRedraw">
-    <refnamediv>
-        <refname>datatipRedraw</refname>
-        <refpurpose>
-            Redraw all datatips  after a 3D rotation to adjust their positions. <emphasis role="bold">Obsolete function. </emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>
-            datatipRedraw()
-            datatipRedraw(axes_handle)
-            datatipRedraw(curve_handles)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>axes_handle</term>
-                <listitem>
-                    <para>
-                        The handle on an axes entity.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>curve_handles</term>
-                <listitem>
-                    <para>
-                        An array of handle on entities supporting the datatips
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            Due to graphic system limitations it is not possible to adjust
-            the datatip textbox positions during a rotation. Calling this
-            function recomputes the positions for a clean rendering.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-    clf();
-    param3d()
-    p=gce();//get the handle on the polyline
-    datatipCreate(p,30);
-    datatipCreate(p,100);
-    datatipCreate(p,50);
-    ax=gca();
-    ax.rotation_angles=[35 45];// first plot below
-    sleep(2)
-    datatipRedraw() //second plot below
-    ]]></programlisting>
-        <scilab:image>
-            param3d()
-            p=gce();//get the handle on the polyline
-            datatipCreate(p,30);
-            datatipCreate(p,100);
-            datatipCreate(p,50);
-        </scilab:image>
-        <scilab:image>
-            ax=gca();
-            ax.rotation_angles=[35 45];// first plot below
-            datatipRedraw() //second plot below
-        </scilab:image>
-    </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>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/datatips/datatipRedraw.xml b/scilab/modules/graphics/help/ja_JP/datatips/datatipRedraw.xml
deleted file mode 100644 (file)
index 0f2ac14..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) INRIA -  Serge Steer Serge.Steer@inria.fr
- * 
- * 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="datatipRedraw">
-    <refnamediv>
-        <refname>datatipRedraw</refname>
-        <refpurpose>3次元回転の後,datatpテキストボックスの位置を調整する</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>
-            datatipRedraw()
-            datatipRedraw(axes_handle)
-            datatipRedraw(curve_handles)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>パラメータ</title>
-        <variablelist>
-            <varlistentry>
-                <term>axes_handle</term>
-                <listitem>
-                    <para>
-                        軸エンティティのハンドル.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>curve_handles</term>
-                <listitem>
-                    <para>
-                        datatipsをサポートするエンティティのハンドルの配列
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>説明</title>
-        <para>
-            グラフィックシステムの制限により,回転の間,datatipテキストボックスの位置を
-            調整することはできません.
-            この関数をコールすると,レンダリングを調整するために位置が再計算されます.
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[
-    param3d()
-    p=gce();//ポリラインのハンドルを取得
-    datatipCreate(p,30);
-    datatipCreate(p,100);
-    datatipCreate(p,50);
-    ax=gca();ax.rotation_angles=[35 45];// first plot below
-    datatipRedraw() //second plot below
-    ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="datatips">datatips</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 6640b8e..42d0eac 100644 (file)
@@ -23,8 +23,7 @@ function  datatipContextMenu(ax)
         _("Redraw all datatips")];
     else
         items=[_("Delete all datatips");
-        _("Delete selected datatip")
-        _("Redraw all datatips")];
+        _("Delete selected datatip")];
     end
     sel=x_choose(items,"");
     if sel>0 then
@@ -55,8 +54,6 @@ function  datatipContextMenu(ax)
             datatipSetReplaceMode(curve,%F);
         case _("Unique datatip mode") then
             datatipSetReplaceMode(curve,%t);
-        case _("Redraw all datatips") then
-            datatipRedraw(curve_handles);
         case _("Open curve tip style editor")  then
             datatipsGUI(curve)
             scf(f);
index 535a805..442552d 100644 (file)
@@ -22,7 +22,6 @@ function datatipEventhandler(win,x,y,ibut)
         end
         //     ax=getAxes([x,y],fig);
         //     if or(datatipAngles<>ax.rotation_angles)|or(zoom_box<>ax.zoom_box) then
-        //       datatipRedraw();
         //       datatipAngles=ax.rotation_angles;
         //       zoom_box=ax.zoom_box;
         //     end
@@ -74,7 +73,6 @@ function datatipEventhandler(win,x,y,ibut)
             zoom_box=ax.zoom_box;
         else
             if or(datatipAngles<>ax.rotation_angles)|or(zoom_box<>ax.zoom_box) then
-                datatipRedraw(curve_handles);
                 datatipAngles=ax.rotation_angles;
                 zoom_box=ax.zoom_box;
             end
diff --git a/scilab/modules/graphics/macros/datatips/datatipRedraw.sci b/scilab/modules/graphics/macros/datatips/datatipRedraw.sci
deleted file mode 100644 (file)
index b1579a8..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2010 - INRIA - Serge Steer <serge.steer@inria.fr>
-//
-// 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 datatipRedraw(curve_handles)
-    //Recomputes the datatip text box position after a rotation
-
-    //These coordinates must be expressed in user coordinates units but their
-    //computation takes into account the pixel dimensions of the text boxes
-    //when they are not located in the upper right position. So during
-    //rotation or zoom the  text box positions has to be recomputed.
-
-
-    if argn(2)<>1 then //search for curves in the current axes
-        ax=gca()
-        curve_handles=datatipGetEntities(ax)
-    elseif type(curve_handles)<>9 then
-        error(msprintf(_("%s: Wrong type for input argument #%d: an array of graphic handle expected.\n"),"datatipRedraw",1))
-    elseif size(curve_handles,"*")==1&curve_handles.type=="Axes" then
-        //the argument is a handle on an axes, search for curves in it
-        ax=curve_handles
-        curve_handles=datatipGetEntities(ax)
-    elseif and(curve_handles<>"Figure") then
-        //check for a common axes entity for parent
-        ax=[]
-        for k=1:size(curve_handles,"*")
-            a=curve_handles(k)
-            while a.type<>"Axes" then a=a.parent,end
-            if ax<>[]&a<>ax then
-                error(msprintf(_("%s: Wrong value for input argument #%d: the handles must have the same parent.\n"),"datatipRedraw",1))
-            end
-            ax=a
-        end
-    else
-        error(msprintf(_("%s: Wrong type for input argument #%d: handle on axes or axes children expected.\n"),"datatipRedraw",1))
-    end
-
-    fig=ax.parent
-    id=fig.immediate_drawing;
-    fig.immediate_drawing="off"
-
-    for k=1:size(curve_handles,"*")
-        ud=datatipGetStruct(curve_handles(k))
-        if  typeof(ud)=="datatips" then
-            for l=1:size(ud.tips.children,"*")
-                tip_handle=ud.tips.children(l)
-                point_handle=tip_handle.children(1)
-                setStringPosition(tip_handle,point_handle.data)
-            end
-        end
-    end
-    fig.immediate_drawing=id
-endfunction
index 4dd1a93..3ebbe82 100644 (file)
@@ -1921,7 +1921,6 @@ datatipHilite
 datatipManagerMode
 datatipMove
 datatipRadioCallback
-datatipRedraw
 datatipRemoveAll
 datatipRemoveNearest
 datatipSetGUI