relocate_handle removed. 09/15909/4
Anais AUBERT [Wed, 4 Feb 2015 15:01:26 +0000 (16:01 +0100)]
Change-Id: I2211b166a460335adc3bb02c9ea56d53086c142c

20 files changed:
scilab/CHANGES_5.5.X
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/help/en_US/handle/relocate_handle.xml [deleted file]
scilab/modules/graphics/help/en_US/handle/swap_handles.xml
scilab/modules/graphics/help/fr_FR/handle/relocate_handle.xml [deleted file]
scilab/modules/graphics/help/fr_FR/handle/swap_handles.xml
scilab/modules/graphics/help/ja_JP/handle/relocate_handle.xml [deleted file]
scilab/modules/graphics/help/ja_JP/handle/swap_handles.xml
scilab/modules/graphics/help/pt_BR/handle/relocate_handle.xml [deleted file]
scilab/modules/graphics/help/pt_BR/handle/swap_handles.xml
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c [deleted file]
scilab/modules/graphics/sci_gateway/graphics_gateway.xml
scilab/modules/graphics/tests/unit_tests/relocate_handle.dia.ref [deleted file]
scilab/modules/graphics/tests/unit_tests/relocate_handle.tst [deleted file]
scilab/modules/helptools/data/configuration/scilab_primitives.txt

index 9ee1690..575dc1a 100644 (file)
@@ -20,6 +20,9 @@ Removed Functions
 
 * milk_drop removed.
 
+* relocate_handle removed.
+
+
 Scilab Bug Fixes
 ================
 
index 3f71928..85ea757 100644 (file)
@@ -429,7 +429,6 @@ sci_gateway/c/sci_xarrows.c \
 sci_gateway/c/sci_plot3d.c \
 sci_gateway/c/sci_move.c \
 sci_gateway/c/sci_copy.c \
-sci_gateway/c/sci_relocate_handle.c \
 sci_gateway/c/sci_get.c \
 sci_gateway/c/sci_xarcs.c \
 sci_gateway/c/sci_xfpoly.c \
index 2fc3596..eb67cbf 100644 (file)
@@ -588,7 +588,6 @@ am__objects_2 = sci_gateway/c/libscigraphics_la-sci_swap_handles.lo \
        sci_gateway/c/libscigraphics_la-sci_plot3d.lo \
        sci_gateway/c/libscigraphics_la-sci_move.lo \
        sci_gateway/c/libscigraphics_la-sci_copy.lo \
-       sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo \
        sci_gateway/c/libscigraphics_la-sci_get.lo \
        sci_gateway/c/libscigraphics_la-sci_xarcs.lo \
        sci_gateway/c/libscigraphics_la-sci_xfpoly.lo \
@@ -1384,7 +1383,6 @@ sci_gateway/c/sci_xarrows.c \
 sci_gateway/c/sci_plot3d.c \
 sci_gateway/c/sci_move.c \
 sci_gateway/c/sci_copy.c \
-sci_gateway/c/sci_relocate_handle.c \
 sci_gateway/c/sci_get.c \
 sci_gateway/c/sci_xarcs.c \
 sci_gateway/c/sci_xfpoly.c \
@@ -2865,9 +2863,6 @@ sci_gateway/c/libscigraphics_la-sci_move.lo:  \
 sci_gateway/c/libscigraphics_la-sci_copy.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigraphics_la-sci_get.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -3006,7 +3001,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_plot2d.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_plot2d1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_plot3d.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_relocate_handle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_rotate_axes.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_rubberbox.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_set.Plo@am__quote@
@@ -6264,13 +6258,6 @@ sci_gateway/c/libscigraphics_la-sci_copy.lo: sci_gateway/c/sci_copy.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigraphics_la-sci_copy.lo `test -f 'sci_gateway/c/sci_copy.c' || echo '$(srcdir)/'`sci_gateway/c/sci_copy.c
 
-sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo: sci_gateway/c/sci_relocate_handle.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_relocate_handle.Tpo -c -o sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo `test -f 'sci_gateway/c/sci_relocate_handle.c' || echo '$(srcdir)/'`sci_gateway/c/sci_relocate_handle.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_relocate_handle.Tpo sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_relocate_handle.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_relocate_handle.c' object='sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigraphics_la-sci_relocate_handle.lo `test -f 'sci_gateway/c/sci_relocate_handle.c' || echo '$(srcdir)/'`sci_gateway/c/sci_relocate_handle.c
-
 sci_gateway/c/libscigraphics_la-sci_get.lo: sci_gateway/c/sci_get.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigraphics_la-sci_get.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_get.Tpo -c -o sci_gateway/c/libscigraphics_la-sci_get.lo `test -f 'sci_gateway/c/sci_get.c' || echo '$(srcdir)/'`sci_gateway/c/sci_get.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_get.Tpo sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_get.Plo
index 6abb47b..b553ebb 100644 (file)
@@ -457,7 +457,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="sci_gateway\c\sci_plot2d.c" />
     <ClCompile Include="sci_gateway\c\sci_plot2d1.c" />
     <ClCompile Include="sci_gateway\c\sci_plot3d.c" />
-    <ClCompile Include="sci_gateway\c\sci_relocate_handle.c" />
     <ClCompile Include="sci_gateway\c\sci_rotate_axes.c" />
     <ClCompile Include="sci_gateway\c\sci_rubberbox.c" />
     <ClCompile Include="sci_gateway\c\sci_set.c" />
@@ -750,4 +749,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 8300d98..ff15c59 100644 (file)
     <ClCompile Include="sci_gateway\c\sci_plot3d.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_relocate_handle.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_rotate_axes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/scilab/modules/graphics/help/en_US/handle/relocate_handle.xml b/scilab/modules/graphics/help/en_US/handle/relocate_handle.xml
deleted file mode 100644 (file)
index c20386f..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Jean-Baptiste Silvy
- * 
- * 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="relocate_handle">
-    <refnamediv>
-        <refname>relocate_handle</refname>
-        <refpurpose>Move handles inside the graphic
-            hierarchy. <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>relocate_handle( movedHandles, parent )</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>movedHandles</term>
-                <listitem>
-                    <para>Vector of relocated handles.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>parent</term>
-                <listitem>
-                    <para>New parent of the handles.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>The relocate_handle function allows to move handles from their current
-            locations in the graphical hierarchy to another. All the moved entities
-            are relocated under the same parent handle specified with the
-            <emphasis role="bold">parent</emphasis> parameter.
-        </para>
-        <para>Since not every handles are compatible with each others, some
-            restrictions exist when relocationg handles. For examples, it is not
-            allowed to move an axes handle under a polyline. More information about
-            compatibility can be found in the <link linkend="graphics_entities">graphics_entities</link> page.
-        </para>
-        <para>This routine is particularly useful to move an object from an axes
-            entity to an other or to move axes from figures handles.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-x = 0:10 ;
-
-// plot a first polyline
-plot(x,x^2) ;
-axes1 = gca() ;
-poly1 = gce() ;
-
-// plot a second in an other window
-scf() ;
-plot( x,x )  ;
-axes2 = gca() ;
-poly2 = gce()  ;
-poly2bis = copy( poly2 ) ; // make a copy of the polyline
-
-// put both polyline in the same window
-relocate_handle( poly2bis, axes1 ) ;
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="graphics_entities">graphics_entities</link>
-            </member>
-            <member>
-                <link linkend="copy">copy</link>
-            </member>
-            <member>
-                <link linkend="delete">delete</link>
-            </member>
-            <member>
-                <link linkend="swap_handles">swap_handles</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.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index a91dd82..d7cbf51 100644 (file)
@@ -112,9 +112,6 @@ swap_handles( axes1, axes2 ) ;
             <member>
                 <link linkend="delete">delete</link>
             </member>
-            <member>
-                <link linkend="relocate_handle">relocate_handle</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
diff --git a/scilab/modules/graphics/help/fr_FR/handle/relocate_handle.xml b/scilab/modules/graphics/help/fr_FR/handle/relocate_handle.xml
deleted file mode 100644 (file)
index 4781020..0000000
+++ /dev/null
@@ -1,86 +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="relocate_handle">
-    <refnamediv>
-        <refname>relocate_handle</refname>
-        <refpurpose>Déplace un handle à  
-            l'intérieur de la hiérarchie graphique.
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>relocate_handle( movedHandles, parent )</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>movedHandles</term>
-                <listitem>
-                    <para>Vecteur contenant les handles déplacés.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>parent</term>
-                <listitem>
-                    <para>Nouveau parent des handles.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            La routine <emphasis role="bold">relocate_handle</emphasis> permet de déplacer des handles
-            graphiques à   partir de leurs emplacements actuels vers un autre dans
-            la hierarchie graphique. Les entités déplacées sont relogées sous le
-            handle <emphasis role="bold">parent</emphasis> spécifié.
-        </para>
-        <para>Comme tous les handles graphiques ne sont pas compatibles entre eux, il
-            existe des restrictions quant à   l'utilisation de la routine . Il est
-            par exemple impossible de déplacer une handle axes comme enfant d'une
-            polyline. Pour plus d'information à   ce sujet, on peut se reporter
-            à   la page <link linkend="graphics_entities">graphics_entities</link>.
-        </para>
-        <para>Cette routine est particulièrement utile pour déplacer un objet d'un
-            axe à   un autre ou pour déplacer des axes entre fenêtre.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[ 
-x = 0:10 ;
-
-// construction d'une première polyline
-plot(x,x^2) ;
-axes1 = gca() ;
-poly1 = gce() ;
-
-// puis d'une seconde
-scf() ;
-plot( x,x )  ;
-axes2 = gca() ;
-poly2 = gce()  ;
-poly2bis = copy( poly2 ) ; // copie de la polyline pour la déplacer ensuite
-
-// les deux polylines se retrouvent dans le même axe.
-relocate_handle( poly2bis, axes1 ) ;
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Voir aussi</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="graphics_entities">graphics_entities</link>
-            </member>
-            <member>
-                <link linkend="copy">copy</link>
-            </member>
-            <member>
-                <link linkend="delete">delete</link>
-            </member>
-            <member>
-                <link linkend="swap_handles">swap_handles</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 3e1f40c..544ea94 100644 (file)
@@ -105,9 +105,6 @@ swap_handles( axes1, axes2 ) ;
             <member>
                 <link linkend="delete">delete</link>
             </member>
-            <member>
-                <link linkend="relocate_handle">relocate_handle</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/handle/relocate_handle.xml b/scilab/modules/graphics/help/ja_JP/handle/relocate_handle.xml
deleted file mode 100644 (file)
index 2dbd698..0000000
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) INRIA - Jean-Baptiste Silvy
-
- * 
-
- * 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="relocate_handle">
-    
-    
-    
-    <refnamediv>
-        
-        
-        
-        <refname>relocate_handle</refname>
-        
-        
-        
-        <refpurpose>
-            
-            
-            
-            グラフィック階層内でハンドルを移動する.
-            
-            
-            
-            <emphasis role="bold">この関数は廃止されます.</emphasis>
-            
-            
-            
-        </refpurpose>
-        
-        
-        
-    </refnamediv>
-    
-    
-    
-    <refsynopsisdiv>
-        
-        
-        
-        <title>呼び出し手順</title>
-        
-        
-        
-        <synopsis>relocate_handle( movedHandles, parent )</synopsis>
-        
-        
-        
-    </refsynopsisdiv>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>パラメータ</title>
-        
-        
-        
-        <variablelist>
-            
-            
-            
-            <varlistentry>
-                
-                
-                
-                <term>movedHandles</term>
-                
-                
-                
-                <listitem>
-                    
-                    
-                    
-                    <para>再配置されたハンドルのベクトル.</para>
-                    
-                    
-                    
-                </listitem>
-                
-                
-                
-            </varlistentry>
-            
-            
-            
-            <varlistentry>
-                
-                
-                
-                <term>parent</term>
-                
-                
-                
-                <listitem>
-                    
-                    
-                    
-                    <para>ハンドルの新しい親.</para>
-                    
-                    
-                    
-                </listitem>
-                
-                
-                
-            </varlistentry>
-            
-            
-            
-        </variablelist>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>説明</title>
-        
-        
-        
-        <para>relocate_handle 関数によりグラフィック階層のカレントの位置から
-            
-            
-            
-            ハンドルを他の場所に移動することが可能です.
-            
-            
-            
-            移動されたエントリは全て<emphasis role="bold">parent</emphasis>
-            
-            
-            
-            パラメータで指定された同じ親のハンドルの元で再配置されます. 
-            
-            
-            
-        </para>
-        
-        
-        
-        <para>
-            
-            
-            
-            全てのハンドルが他のハンドルと互換性があるわけでないので,
-            
-            
-            
-            ハンドルの再配置にはいくつかの制約があります.
-            
-            
-            
-            例えば,axesハンドラをpolylineの下に移動することはできません.
-            
-            
-            
-            互換性に関する詳細については,
-            
-            
-            
-            <link linkend="graphics_entities">graphics_entities</link>のページを
-            
-            
-            
-            参照ください.
-            
-            
-            
-        </para>
-        
-        
-        
-        <para>このルーチンはあるaxesエンティティから他のエンティティに
-            
-            
-            
-            オブジェクトを移動したり, figureハンドルから axes を移動する際に
-            
-            
-            
-            特に有用です.
-            
-            
-            
-        </para>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>例</title>
-        
-        
-        
-        <programlisting role="example"><![CDATA[ 
-
-x = 0:10 ;
-
-
-
-// 最初のポリラインをプロット
-
-plot(x,x^2) ;
-
-axes1 = gca() ;
-
-poly1 = gce() ;
-
-
-
-// 2番目のポリラインを他のウインドウにプロット
-
-scf() ;
-
-plot( x,x )  ;
-
-axes2 = gca() ;
-
-poly2 = gce()  ;
-
-poly2bis = copy( poly2 ) ; // ポリラインのコピーを作成
-
-
-
-// 両方のポリラインを同じウインドウに配置
-
-relocate_handle( poly2bis, axes1 ) ;
-
- ]]></programlisting>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection role="see also">
-        
-        
-        
-        <title>参照</title>
-        
-        
-        
-        <simplelist type="inline">
-            
-            
-            
-            <member>
-                
-                
-                
-                <link linkend="graphics_entities">graphics_entities</link>
-                
-                
-                
-            </member>
-            
-            
-            
-            <member>
-                
-                
-                
-                <link linkend="copy">copy</link>
-                
-                
-                
-            </member>
-            
-            
-            
-            <member>
-                
-                
-                
-                <link linkend="delete">delete</link>
-                
-                
-                
-            </member>
-            
-            
-            
-            <member>
-                
-                
-                
-                <link linkend="swap_handles">swap_handles</link>
-                
-                
-                
-            </member>
-            
-            
-            
-        </simplelist>
-        
-        
-        
-    </refsection>
-    
-    
-    
-    <refsection>
-        
-        
-        
-        <title>履歴</title>
-        
-        
-        
-        <revhistory>
-            
-            
-            
-            <revision>
-                
-                
-                
-                <revnumber>5.5.0</revnumber>
-                
-                
-                
-                <revdescription>
-                    
-                    
-                    
-                    関数が廃止対象となりました. 5.5.1で削除されます.
-                    
-                    
-                    
-                </revdescription>
-                
-                
-                
-            </revision>
-            
-            
-            
-        </revhistory>
-        
-        
-        
-    </refsection>
-    
-    
-    
-</refentry>
-
-
-
index 010ac47..655d9b4 100644 (file)
@@ -226,12 +226,6 @@ swap_handles( axes1, axes2 ) ;
                 
             </member>
             
-            <member>
-                
-                <link linkend="relocate_handle">relocate_handle</link>
-                
-            </member>
-            
         </simplelist>
         
     </refsection>
diff --git a/scilab/modules/graphics/help/pt_BR/handle/relocate_handle.xml b/scilab/modules/graphics/help/pt_BR/handle/relocate_handle.xml
deleted file mode 100644 (file)
index 1e8c257..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Jean-Baptiste Silvy
- * 
- * 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:ns5="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="relocate_handle" xml:lang="en">
-    <refnamediv>
-        <refname>relocate_handle</refname>
-        <refpurpose>Movimentação de manipuladores dentro da hierarquia
-            gráfica
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>relocate_handle( movedHandles, parent )</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>movedHandles</term>
-                <listitem>
-                    <para>vetor de manipuladores realocados</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>parent</term>
-                <listitem>
-                    <para>nova raiz dos manipuladores</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>A função relocate_handle permite mover manipuladores das suas
-            localizações em uma hierarquia gráfica para outra localização. Todas as
-            entidades são realocadas sob o mesmo manipulador raiz especificado pelo
-            parâmetro <emphasis role="bold">parent</emphasis>.
-        </para>
-        <para>Já que não são todos os manipuladores que são compatíveis com todos
-            os outros, existem algumas restrições ao se realocar manipuladores. Por
-            exemplo, não é permitido mover um manipulador Axes sob um manipulador
-            Polyline. Para mais informações sobre compatibilidade veja a página <link linkend="graphics_entities">graphics_entities</link>.
-        </para>
-        <para>Esta rotina é particularmente útil para se mover um objeto de uma
-            entidade Axes para outra, ou para se move objetos Axes de uma entidade
-            Figure para outra.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-x = 0:10 ;
-
-// esboçando uma primeira poligonal
-plot(x,x^2) ;
-axes1 = gca() ;
-poly1 = gce() ;
-
-// esboçando uma segunda em outra janela
-scf() ;
-plot( x,x )  ;
-axes2 = gca() ;
-poly2 = gce()  ;
-poly2bis = copy( poly2 ) ; // criando uma cópia da poligonal
-
-// pondo ambas as poligonais na mesma janela
-relocate_handle( poly2bis, axes1 ) ;
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="graphics_entities">graphics_entities</link>
-            </member>
-            <member>
-                <link linkend="copy">copy</link>
-            </member>
-            <member>
-                <link linkend="delete">delete</link>
-            </member>
-            <member>
-                <link linkend="swap_handles">swap_handles</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index e5cd86f..0bfc2fb 100644 (file)
@@ -116,9 +116,6 @@ swap_handles( axes1, axes2 ) ;
             <member>
                 <link linkend="delete">delete</link>
             </member>
-            <member>
-                <link linkend="relocate_handle">relocate_handle</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
index e713740..0b22d9b 100644 (file)
@@ -61,7 +61,6 @@ GRAPHICS_IMPEXP int sci_show_window(char *fname, unsigned long fname_len);
 GRAPHICS_IMPEXP int sci_set(char *fname, unsigned long fname_len);
 GRAPHICS_IMPEXP int sci_rubberbox(char *fname, unsigned long fname_len);
 GRAPHICS_IMPEXP int sci_rotate_axes(char *fname, unsigned long fname_len);
-GRAPHICS_IMPEXP int sci_relocate_handle(char *fname, unsigned long fname_len);
 GRAPHICS_IMPEXP int sci_plot3d(char *fname, unsigned long fname_len);
 GRAPHICS_IMPEXP int sci_plot2d1(char *fname, unsigned long fname_len);
 GRAPHICS_IMPEXP int sci_plot2d1_1(char *fname, unsigned long fname_len);
index 3b4f4ce..400dfa6 100644 (file)
@@ -86,7 +86,6 @@ static gw_generic_table Tab[] =
     {sci_get, "get"},
     {sci_set, "set"},
     {sci_newaxes, "newaxes"},
-    {sci_relocate_handle, "relocate_handle"},
     {sci_swap_handles, "swap_handles"},
     {sci_rubberbox, "rubberbox"},
     {sci_rotate_axes, "rotate_axes"},
diff --git a/scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c b/scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
deleted file mode 100644 (file)
index 5de52ed..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
- * Copyright (C) 2012 - scilab-Enterprises - Cedric DELAMARRE
- *
- * 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
- *
- */
-
-/*------------------------------------------------------------------------*/
-/* file: sci_relocate_handle.h                                            */
-/* desc : interface for relocate_handle routine                           */
-/*------------------------------------------------------------------------*/
-
-#include "gw_graphics.h"
-#include "setGraphicObjectProperty.h"
-#include "api_scilab.h"
-#include "MALLOC.h"
-#include "HandleManagement.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "sciprint.h"
-#include "warningmode.h"
-/*--------------------------------------------------------------------------*/
-
-int sci_relocate_handle(char * fname, unsigned long fname_len)
-{
-    SciErr sciErr;
-
-    int* piAddrhandleStkIndex = NULL;
-    long long* handleStkIndex = NULL;
-    int* piAddrparentStkIndex = NULL;
-    long long* parentStkIndex = NULL;
-    long long* outIndex = NULL;
-
-    int handleCol  = 0;
-    int handleRow = 0;
-    int nbHandle = 0;
-    int parentCol = 0;
-    int parentRow = 0;
-    int i = 0;
-
-    long children = 0;
-    int iCchildrenID = 0;
-    long parent = 0;
-    int iParentID = 0;
-
-    if (getWarningMode())
-    {
-        sciprint(_("%s: Function %s is obsolete.\n"), _("Warning"), fname);
-        sciprint(_("%s: Please see documentation for more details.\n"), _("Warning"));
-        sciprint(_("%s: This function will be permanently removed in Scilab %s\n\n"), _("Warning"), "5.5.1");
-    }
-
-    /* the function should be called with relocate_handle(handle, parent_handle) */
-    CheckInputArgument(pvApiCtx, 2, 2);
-    CheckOutputArgument(pvApiCtx, 0, 1);
-
-
-    sciErr = getVarAddressFromPosition(pvApiCtx,  1, &piAddrhandleStkIndex);
-    if (sciErr.iErr)
-    {
-        printError(&sciErr, 0);
-        return 1;
-    }
-
-    // Retrieve a matrix of handle at position  1.
-    sciErr = getMatrixOfHandle(pvApiCtx, piAddrhandleStkIndex, &handleRow, &handleCol, &handleStkIndex);
-    if (sciErr.iErr)
-    {
-        printError(&sciErr, 0);
-        Scierror(202, _("%s: Wrong type for input argument #%d: Handle matrix expected.\n"), fname,  1);
-        return 1;
-    }
-
-    nbHandle = handleRow * handleCol;
-    sciErr = getVarAddressFromPosition(pvApiCtx,  2, &piAddrparentStkIndex);
-    if (sciErr.iErr)
-    {
-        printError(&sciErr, 0);
-        return 1;
-    }
-
-    // Retrieve a matrix of handle at position  2.
-    sciErr = getMatrixOfHandle(pvApiCtx, piAddrparentStkIndex, &parentRow, &parentCol, &parentStkIndex);
-    if (sciErr.iErr)
-    {
-        printError(&sciErr, 0);
-        Scierror(202, _("%s: Wrong type for input argument #%d: Handle matrix expected.\n"), fname,  2);
-        return 1;
-    }
-
-
-    if (parentCol * parentRow != 1)
-    {
-        Scierror(999, _("%s: Handles must be relocated under a single parent.\n"), fname);
-        return 0;
-    }
-
-    parent = (long) * (parentStkIndex);
-    iParentID = getObjectFromHandle(parent);
-
-    for (i = 0; i < nbHandle; i++)
-    {
-        children = (long)handleStkIndex[i];
-        iCchildrenID = getObjectFromHandle(children);
-        setGraphicObjectRelationship(iParentID, iCchildrenID);
-    }
-
-    sciErr = allocMatrixOfHandle(pvApiCtx,  nbInputArgument(pvApiCtx) + 1, handleCol, handleRow, &outIndex);
-    if (sciErr.iErr)
-    {
-        printError(&sciErr, 0);
-        Scierror(999, _("%s: Memory allocation error.\n"), fname);
-        return 1;
-    }
-
-    *(outIndex) = *(handleStkIndex);
-    AssignOutputVariable(pvApiCtx, 1) = nbInputArgument(pvApiCtx) + 1;
-    ReturnArguments(pvApiCtx);
-    return 0;
-
-}
-/*--------------------------------------------------------------------------*/
index 83aa42e..3382f0f 100644 (file)
     <PRIMITIVE gatewayId="7" primitiveId="57" primitiveName="get"/>
     <PRIMITIVE gatewayId="7" primitiveId="58" primitiveName="set"/>
     <PRIMITIVE gatewayId="7" primitiveId="59" primitiveName="newaxes"/>
-    <PRIMITIVE gatewayId="7" primitiveId="60" primitiveName="relocate_handle"/>
-    <PRIMITIVE gatewayId="7" primitiveId="61" primitiveName="swap_handles"/>
-    <PRIMITIVE gatewayId="7" primitiveId="62" primitiveName="rubberbox"/>
-    <PRIMITIVE gatewayId="7" primitiveId="63" primitiveName="rotate_axes"/>
-    <PRIMITIVE gatewayId="7" primitiveId="64" primitiveName="is_handle_valid"/>
-    <PRIMITIVE gatewayId="7" primitiveId="65" primitiveName="captions"/>
-    <PRIMITIVE gatewayId="7" primitiveId="66" primitiveName="light"/>
-    <PRIMITIVE gatewayId="7" primitiveId="67" primitiveName="addcolor"/>
-    <PRIMITIVE gatewayId="7" primitiveId="68" primitiveName="name2rgb"/>
-    <PRIMITIVE gatewayId="7" primitiveId="69" primitiveName="color"/>
+    <PRIMITIVE gatewayId="7" primitiveId="60" primitiveName="swap_handles"/>
+    <PRIMITIVE gatewayId="7" primitiveId="61" primitiveName="rubberbox"/>
+    <PRIMITIVE gatewayId="7" primitiveId="62" primitiveName="rotate_axes"/>
+    <PRIMITIVE gatewayId="7" primitiveId="63" primitiveName="is_handle_valid"/>
+    <PRIMITIVE gatewayId="7" primitiveId="64" primitiveName="captions"/>
+    <PRIMITIVE gatewayId="7" primitiveId="65" primitiveName="light"/>
+    <PRIMITIVE gatewayId="7" primitiveId="66" primitiveName="addcolor"/>
+    <PRIMITIVE gatewayId="7" primitiveId="67" primitiveName="name2rgb"/>
+    <PRIMITIVE gatewayId="7" primitiveId="68" primitiveName="color"/>
 </GATEWAY>
diff --git a/scilab/modules/graphics/tests/unit_tests/relocate_handle.dia.ref b/scilab/modules/graphics/tests/unit_tests/relocate_handle.dia.ref
deleted file mode 100644 (file)
index 09ef79e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2012 - Scilab-Enterprises - Cedric DELAMARRE
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-// <-- TEST WITH GRAPHIC -->
-// <-- ENGLISH IMPOSED -->
-plot3d();
-f1 = gcf();
-a1 = gca();
-f2 = scf(10);
-relocate_handle(a1, f2);
-Warning: Function relocate_handle is obsolete.
-Warning: Please see documentation for more details.
-Warning: This function will be permanently removed in Scilab 5.5.1
-
-a2 = f2.children(1);
-assert_checkequal(a2.children(1).type, "Plot3d");
diff --git a/scilab/modules/graphics/tests/unit_tests/relocate_handle.tst b/scilab/modules/graphics/tests/unit_tests/relocate_handle.tst
deleted file mode 100644 (file)
index 694e159..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2012 - Scilab-Enterprises - Cedric DELAMARRE
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-// <-- TEST WITH GRAPHIC -->
-// <-- ENGLISH IMPOSED -->
-
-plot3d();
-
-f1 = gcf();
-a1 = gca();
-f2 = scf(10);
-
-relocate_handle(a1, f2);
-
-a2 = f2.children(1);
-assert_checkequal(a2.children(1).type, "Plot3d");
-
-