* Bug #13114 fixed - removed the traces of clear_pixmap 38/13238/2
Paul Bignier [Tue, 26 Nov 2013 14:44:53 +0000 (15:44 +0100)]
clear_pixmap: deprecated in 5.4.0 for removal from 5.4.1.

Change-Id: Ibdf9df0e5fdd0d7026f34df489ade30feaeb4a1a

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/clear_pixmap.xml [deleted file]
scilab/modules/graphics/help/en_US/figure_operations/figure_properties.xml
scilab/modules/graphics/help/ja_JP/clear_pixmap.xml [deleted file]
scilab/modules/graphics/help/ja_JP/figure_operations/figure_properties.xml
scilab/modules/graphics/help/pt_BR/clear_pixmap.xml [deleted file]
scilab/modules/graphics/sci_gateway/c/sci_clear_pixmap.c [deleted file]

index d571c91..9954719 100644 (file)
@@ -29,6 +29,8 @@ Obsolete & Removed Functions
 
 * milk_drop tagged as obsolete. Will be removed in Scilab 5.5.1.
 
+* clear_pixmap removed, please use drawlater/drawnow instead.
+
 
 Scilab Bug Fixes
 ================
@@ -256,6 +258,8 @@ Scilab Bug Fixes
 
 * Bug #13109 fixed - pll2str now supports polynomials with complex coefficients and hypermatrices.
 
+* Bug #13114 fixed - clear_pixmap should have been removed in Scilab 5.4.1.
+
 * Bug #13116 fixed - qpsolve now respects upper-bounds constraints.
 
 
index 37ac9c1..adaaa34 100644 (file)
@@ -365,7 +365,6 @@ sci_gateway/c/sci_geom3d.c \
 sci_gateway/c/sci_xset.c \
 sci_gateway/c/sci_unzoom.c \
 sci_gateway/c/sci_xsegs.c \
-sci_gateway/c/sci_clear_pixmap.c \
 sci_gateway/c/sci_glue.c \
 sci_gateway/c/sci_xarc.c \
 sci_gateway/c/sci_xpolys.c \
index 21d4294..58afa23 100644 (file)
@@ -518,7 +518,6 @@ am__objects_2 = libscigraphics_la-sci_swap_handles.lo \
        libscigraphics_la-sci_xgrid.lo libscigraphics_la-sci_xclick.lo \
        libscigraphics_la-sci_geom3d.lo libscigraphics_la-sci_xset.lo \
        libscigraphics_la-sci_unzoom.lo libscigraphics_la-sci_xsegs.lo \
-       libscigraphics_la-sci_clear_pixmap.lo \
        libscigraphics_la-sci_glue.lo libscigraphics_la-sci_xarc.lo \
        libscigraphics_la-sci_xpolys.lo \
        libscigraphics_la-sci_xstring.lo \
@@ -1251,7 +1250,6 @@ sci_gateway/c/sci_geom3d.c \
 sci_gateway/c/sci_xset.c \
 sci_gateway/c/sci_unzoom.c \
 sci_gateway/c/sci_xsegs.c \
-sci_gateway/c/sci_clear_pixmap.c \
 sci_gateway/c/sci_glue.c \
 sci_gateway/c/sci_xarc.c \
 sci_gateway/c/sci_xpolys.c \
@@ -1889,7 +1887,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_Legend.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_StringBox.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_champ.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_clear_pixmap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_contour2di.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_copy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_delete.Plo@am__quote@
@@ -4343,13 +4340,6 @@ libscigraphics_la-sci_xsegs.lo: sci_gateway/c/sci_xsegs.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 libscigraphics_la-sci_xsegs.lo `test -f 'sci_gateway/c/sci_xsegs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_xsegs.c
 
-libscigraphics_la-sci_clear_pixmap.lo: sci_gateway/c/sci_clear_pixmap.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 libscigraphics_la-sci_clear_pixmap.lo -MD -MP -MF $(DEPDIR)/libscigraphics_la-sci_clear_pixmap.Tpo -c -o libscigraphics_la-sci_clear_pixmap.lo `test -f 'sci_gateway/c/sci_clear_pixmap.c' || echo '$(srcdir)/'`sci_gateway/c/sci_clear_pixmap.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_la-sci_clear_pixmap.Tpo $(DEPDIR)/libscigraphics_la-sci_clear_pixmap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_clear_pixmap.c' object='libscigraphics_la-sci_clear_pixmap.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 libscigraphics_la-sci_clear_pixmap.lo `test -f 'sci_gateway/c/sci_clear_pixmap.c' || echo '$(srcdir)/'`sci_gateway/c/sci_clear_pixmap.c
-
 libscigraphics_la-sci_glue.lo: sci_gateway/c/sci_glue.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 libscigraphics_la-sci_glue.lo -MD -MP -MF $(DEPDIR)/libscigraphics_la-sci_glue.Tpo -c -o libscigraphics_la-sci_glue.lo `test -f 'sci_gateway/c/sci_glue.c' || echo '$(srcdir)/'`sci_gateway/c/sci_glue.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigraphics_la-sci_glue.Tpo $(DEPDIR)/libscigraphics_la-sci_glue.Plo
index f597ca0..24f5554 100644 (file)
@@ -387,7 +387,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\Plo2dEch.c" />
     <ClCompile Include="src\c\Plo2dn.c" />
     <ClCompile Include="sci_gateway\c\sci_champ.c" />
-    <ClCompile Include="sci_gateway\c\sci_clear_pixmap.c" />
     <ClCompile Include="sci_gateway\c\sci_contour2di.c" />
     <ClCompile Include="sci_gateway\c\sci_copy.c" />
     <ClCompile Include="sci_gateway\c\sci_delete.c" />
@@ -694,4 +693,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 5cbb8a1..55b277c 100644 (file)
     <ClCompile Include="sci_gateway\c\sci_champ.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_clear_pixmap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_contour2di.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/clear_pixmap.xml b/scilab/modules/graphics/help/en_US/clear_pixmap.xml
deleted file mode 100644 (file)
index cd1e818..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Serge Steer
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<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="clear_pixmap">
-    <refnamediv>
-        <refname>clear_pixmap</refname>
-        <refpurpose>erase the pixmap
-            buffer <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>clear_pixmap()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Description</title>
-        <para>
-            If a graphic window <literal>pixmap</literal> property is <literal>"on"</literal>
-            the drawings are send to a pixmap memory instead of the screen display.
-        </para>
-        <para/>
-        <para>
-            The <literal>clear_pixmap()</literal> instruction erase the pixmap, but not
-            the screen.
-        </para>
-        <para/>
-        <para>The pixmap mode can be used to obtain smooth animations.</para>
-        <para>
-            WARNING: This function is obsolete from Scilab 5.4.0 and is going to be removed with Scilab 5.4.1. Please use <link linkend="drawlater">drawlater</link>/<link linkend="drawnow">drawnow</link> instead.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="figure_properties">figure_properties</link>
-            </member>
-            <member>
-                <link linkend="drawlater">drawlater</link>
-            </member>
-            <member>
-                <link linkend="drawnow">drawnow</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.4.0</revnumber>
-                <revremark>Function clear_pixmap is obsolete.</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 1c4a329..1976902 100644 (file)
@@ -357,9 +357,6 @@ plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
             <member>
                 <link linkend="axes_properties">axes_properties</link>
             </member>
-            <member>
-                <link linkend="clear_pixmap">clear_pixmap</link>
-            </member>
             <member/>
             <member>
                 <link linkend="hotcolormap">hotcolormap</link>
diff --git a/scilab/modules/graphics/help/ja_JP/clear_pixmap.xml b/scilab/modules/graphics/help/ja_JP/clear_pixmap.xml
deleted file mode 100644 (file)
index f056de1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Serge Steer
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<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="clear_pixmap">
-    <refnamediv>
-        <refname>clear_pixmap</refname>
-        <refpurpose>pixmapバッファを消去する</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>clear_pixmap()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>説明</title>
-        <para>
-            グラフィックウインドウ <literal>pixmap</literal> プロパティが <literal>"on"</literal>
-            の場合, 描画内容はスクリーン画面ではなくピクセルマップメモリに送信されます.
-        </para>
-        <para/>
-        <para>
-            <literal>clear_pixmap()</literal> 命令はこのピクセルマップを消去しますが,
-            画面は消去しません.
-        </para>
-        <para/>
-        <para>滑らかなアニメーションを得るためにpixmapモードを使用することができます.</para>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="figure_properties">figure_properties</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 32a0822..eec4960 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Djalel Abdemouche
- * 
+ *
  * 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
                             <listitem>
                                 <para>このプロパティは図の表示を制御します.
                                     この値は
-                                    <literal>"on"</literal> (デフォルトモード) または <literal>"off"</literal>です. 
+                                    <literal>"on"</literal> (デフォルトモード) または <literal>"off"</literal>です.
                                     (複数の描画や再描画を適用することにより)グラフィックスコマンドが大量に連続する場合に,
                                     表示を遅延させるために使用されます.
-                                    
+
                                     Note that, when using
                                     <literal>drawlater</literal> または <literal>drawnow</literal> コマンドを
                                     使用した場合, カレントの図のプロパティの値を変更することに注意してください
                         <varlistentry>
                             <term>background: </term>
                             <listitem>
-                                <para>このプロパティは図の背景を制御します. 
+                                <para>このプロパティは図の背景を制御します.
                                     カレントのカラーマップに関連する添え字を値として指定します.
                                 </para>
                             </listitem>
                         <varlistentry>
                             <term>rotation_style: </term>
                             <listitem>
-                                <para>このフィールドは "3D Rot"(3次元回転) ボタンに関係します. 
+                                <para>このフィールドは "3D Rot"(3次元回転) ボタンに関係します.
                                     デフォルトは,選択された3次元プロットのみが回転することを意味する
                                     <literal>unary</literal>となっています.
                                     この値は,全ての3次元プロットが回転することを意味する <literal>multiple</literal>
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-lines(0) // disables vertical paging 
+        <programlisting role="example"><![CDATA[
+lines(0) // disables vertical paging
 
 //Example 1
-f=get("current_figure") //get the handle of the current figure : 
+f=get("current_figure") //get the handle of the current figure :
                         //if none exists, create a figure and return the corresponding handle
 f.figure_position
 f.figure_size=[200,200]
@@ -373,9 +373,6 @@ plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
             <member>
                 <link linkend="axes_properties">axes_properties</link>
             </member>
-            <member>
-                <link linkend="clear_pixmap">clear_pixmap</link>
-            </member>
             <member/>
             <member>
                 <link linkend="hotcolormap">hotcolormap</link>
diff --git a/scilab/modules/graphics/help/pt_BR/clear_pixmap.xml b/scilab/modules/graphics/help/pt_BR/clear_pixmap.xml
deleted file mode 100644 (file)
index 85b784d..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Serge Steer
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="clear_pixmap" xml:lang="en">
-    <refnamediv>
-        <refname>clear_pixmap</refname>
-        <refpurpose>Apaga o buffer de pixmap ("mapa de píxeis")</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>clear_pixmap()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Se a propriedade de uma janela de gráficos <literal>pixmap</literal>
-            for <literal>"on"</literal> as gravuras são enviadas para uma memória
-            pixmap, ao invés de serem exibidas na tela. 
-        </para>
-        <para/>
-        <para>
-            A instrução <literal>clear_pixmap()</literal> apaga o pixmap, mas
-            não a tela.
-        </para>
-        <para/>
-        <para>O modo pixmap pode ser usado para se obter animações suaves.</para>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="figure_properties">figure_properties</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/sci_gateway/c/sci_clear_pixmap.c b/scilab/modules/graphics/sci_gateway/c/sci_clear_pixmap.c
deleted file mode 100644 (file)
index c5e54a6..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2008 - 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
-*
-*/
-
-/*------------------------------------------------------------------------*/
-/* file: sci_clear_pixmap.c                                               */
-/* desc : interface for clear_pixmap routine                              */
-/*------------------------------------------------------------------------*/
-
-#include "gw_graphics.h"
-#include "api_scilab.h"
-#include "warningmode.h"
-#include "sciprint.h"
-#include "localization.h"
-/*--------------------------------------------------------------------------*/
-//
-// FIXME: Remove GW after Scilab 5.4.0
-//
-int sci_clear_pixmap(char *fname, unsigned long fname_len)
-{
-    CheckInputArgument(pvApiCtx, 0, 0);
-    CheckOutputArgument(pvApiCtx, 0, 1);
-
-    if (getWarningMode())
-    {
-        sciprint(_("%s: Function %s is obsolete.\n"), _("Warning"), fname);
-        sciprint(_("%s: Please use %s instead.\n"), _("Warning"), "drawlater/drawnow");
-        sciprint(_("%s: This function will be permanently removed in Scilab %s\n\n"), _("Warning"), "5.4.1");
-    }
-
-    AssignOutputVariable(pvApiCtx, 1) = 0;
-    ReturnArguments(pvApiCtx);
-    return 0;
-}
-/*--------------------------------------------------------------------------*/