*Bug #12433 fixed- show_pixmap() has been removed in Scilab files. 68/11868/3
Adeline CARNIS [Tue, 2 Jul 2013 10:57:57 +0000 (12:57 +0200)]
Change-Id: Ie2a4aa06996462be519f30dd2b79d4f9f460303d

35 files changed:
scilab/CHANGES_5.5.X
scilab/modules/differential_equations/demos/bike/macros/velodp.sci
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
scilab/modules/graphics/help/en_US/figure_operations/figure_properties.xml
scilab/modules/graphics/help/en_US/show_pixmap.xml [deleted file]
scilab/modules/graphics/help/ja_JP/2d_plot/Matplot1.xml
scilab/modules/graphics/help/ja_JP/2d_plot/Sgrayplot.xml
scilab/modules/graphics/help/ja_JP/clear_pixmap.xml
scilab/modules/graphics/help/ja_JP/color_management/hsv2rgb.xml
scilab/modules/graphics/help/ja_JP/figure_operations/figure_properties.xml
scilab/modules/graphics/help/ja_JP/show_pixmap.xml [deleted file]
scilab/modules/graphics/help/pt_BR/2d_plot/Matplot1.xml
scilab/modules/graphics/help/pt_BR/2d_plot/Sgrayplot.xml
scilab/modules/graphics/help/pt_BR/clear_pixmap.xml
scilab/modules/graphics/help/pt_BR/color_management/hsv2rgb.xml
scilab/modules/graphics/help/pt_BR/show_pixmap.xml [deleted file]
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/edit_curv.sci
scilab/modules/graphics/macros/ged.sci
scilab/modules/graphics/macros/ged_insert.sci
scilab/modules/graphics/macros/getlinestyle.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_show_pixmap.c [deleted file]
scilab/modules/graphics/tests/nonreg_tests/bug_2200.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_2200.tst
scilab/modules/graphics/tests/nonreg_tests/bug_2458.tst [deleted file]
scilab/modules/graphics/tests/nonreg_tests/bug_2749.dia.ref
scilab/modules/graphics/tests/nonreg_tests/bug_2749.tst
scilab/modules/scicos_blocks/macros/Misc/anim_pen.sci
scilab/modules/scicos_blocks/macros/NonLinear/LOOKUP_c.sci
scilab/modules/scicos_blocks/macros/Sources/CURVE_c.sci

index f94dc33..aa16d6b 100644 (file)
@@ -371,6 +371,8 @@ Bug fixes
 
 * Bug #12426 fixed - By using addErrorMessage, random string error could be displayed.
 
+* Bug #12433 fixed - show_pixmap function has been removed in Scilab files.
+
 * Bug #12443 fixed - Document behavior of mopen() in text file mode
                      on Windows.
 
index c9eec1d..fcba79c 100644 (file)
@@ -7,8 +7,6 @@
 
 function []=velodp(i)
     //------------ generation of the rear wheel
-
-    curFig.pixmap = "on";
     nnn=12
     i1=(i-1)*nstep+1
     ang=xx(6,i1)*i1/n2
@@ -36,12 +34,9 @@ function []=velodp(i)
     [nn2,nn1]=size(xnr);
     xx1=[xnf(1:nn2/2)';xnf((nn2/2+1):nn2)'];
     yy1=[ynf(1:nn2/2)';ynf((nn2/2+1):nn2)'];
-    xsegs(xx1,yy1);show_pixmap();
+    xsegs(xx1,yy1);
     xx1=[xnr(1:nn2/2)';xnr((nn2/2+1):nn2)'];
     yy1=[ynr(1:nn2/2)';ynr((nn2/2+1):nn2)'];
-    xsegs(xx1,yy1);show_pixmap();
+    xsegs(xx1,yy1);
 endfunction
 
-
-
-
index bf09774..7fb6b51 100644 (file)
@@ -390,7 +390,6 @@ sci_gateway/c/sci_fec.c \
 sci_gateway/c/sci_rubberbox.c \
 sci_gateway/c/sci_rotate_axes.c \
 sci_gateway/c/sci_is_handle_valid.c \
-sci_gateway/c/sci_show_pixmap.c \
 sci_gateway/c/sci_Legend.c
 
 libscigraphics_la_CPPFLAGS = \
index 73fa141..679cdad 100644 (file)
@@ -504,7 +504,6 @@ am__objects_2 = libscigraphics_la-sci_swap_handles.lo \
        libscigraphics_la-sci_rubberbox.lo \
        libscigraphics_la-sci_rotate_axes.lo \
        libscigraphics_la-sci_is_handle_valid.lo \
-       libscigraphics_la-sci_show_pixmap.lo \
        libscigraphics_la-sci_Legend.lo
 am_libscigraphics_la_OBJECTS = $(am__objects_2)
 libscigraphics_la_OBJECTS = $(am_libscigraphics_la_OBJECTS)
@@ -1176,7 +1175,6 @@ sci_gateway/c/sci_fec.c \
 sci_gateway/c/sci_rubberbox.c \
 sci_gateway/c/sci_rotate_axes.c \
 sci_gateway/c/sci_is_handle_valid.c \
-sci_gateway/c/sci_show_pixmap.c \
 sci_gateway/c/sci_Legend.c
 
 libscigraphics_la_CPPFLAGS = \
@@ -1766,7 +1764,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_rotate_axes.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_rubberbox.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_set.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_show_pixmap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_show_window.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_swap_handles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphics_la-sci_unglue.Plo@am__quote@
@@ -4374,13 +4371,6 @@ libscigraphics_la-sci_is_handle_valid.lo: sci_gateway/c/sci_is_handle_valid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_la-sci_is_handle_valid.lo `test -f 'sci_gateway/c/sci_is_handle_valid.c' || echo '$(srcdir)/'`sci_gateway/c/sci_is_handle_valid.c
 
-libscigraphics_la-sci_show_pixmap.lo: sci_gateway/c/sci_show_pixmap.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_la-sci_show_pixmap.lo -MD -MP -MF $(DEPDIR)/libscigraphics_la-sci_show_pixmap.Tpo -c -o libscigraphics_la-sci_show_pixmap.lo `test -f 'sci_gateway/c/sci_show_pixmap.c' || echo '$(srcdir)/'`sci_gateway/c/sci_show_pixmap.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphics_la-sci_show_pixmap.Tpo $(DEPDIR)/libscigraphics_la-sci_show_pixmap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_show_pixmap.c' object='libscigraphics_la-sci_show_pixmap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigraphics_la-sci_show_pixmap.lo `test -f 'sci_gateway/c/sci_show_pixmap.c' || echo '$(srcdir)/'`sci_gateway/c/sci_show_pixmap.c
-
 libscigraphics_la-sci_Legend.lo: sci_gateway/c/sci_Legend.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigraphics_la-sci_Legend.lo -MD -MP -MF $(DEPDIR)/libscigraphics_la-sci_Legend.Tpo -c -o libscigraphics_la-sci_Legend.lo `test -f 'sci_gateway/c/sci_Legend.c' || echo '$(srcdir)/'`sci_gateway/c/sci_Legend.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigraphics_la-sci_Legend.Tpo $(DEPDIR)/libscigraphics_la-sci_Legend.Plo
index 407398a..5538c27 100644 (file)
@@ -392,7 +392,6 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <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" />
-    <ClCompile Include="sci_gateway\c\sci_show_pixmap.c" />
     <ClCompile Include="sci_gateway\c\sci_show_window.c" />
     <ClCompile Include="sci_gateway\c\sci_StringBox.c" />
     <ClCompile Include="sci_gateway\c\sci_swap_handles.c" />
index c1bf4c1..b9ef47e 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="sci_gateway\c\sci_set.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_show_pixmap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\c\sci_show_window.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 4c9cd1d..d40386c 100644 (file)
@@ -45,9 +45,6 @@
                 <link linkend="figure_properties">figure_properties</link>
             </member>
             <member>
-                <link linkend="show_pixmap">show_pixmap</link>
-            </member>
-            <member>
                 <link linkend="drawlater">drawlater</link>
             </member>
             <member>
index cc964c5..a3a9e3a 100644 (file)
                             <term>pixmap: </term>
                             <listitem>
                                 <para>This property controls the pixmap status of a Graphic Window.
-                                    If this property value is <literal>"off"</literal> the graphics are
-                                    directly displayed on the screen. If it is <literal>"on"</literal> the
-                                    graphics are done on a pixmap and are sent to the graphics window
-                                    with the command <literal>show_pixmap()</literal>.
+                                    This property is obsolete.
                                 </para>
                             </listitem>
                         </varlistentry>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example">
+            <![CDATA[ 
 lines(0) // disables vertical paging 
 
 //Example 1
@@ -311,9 +309,9 @@ f.background=2
 f.children  // man can see that an Axes entity already exists
 delete(f);
 f=gcf(); // macro shortcut <=> f=get("current_figure")
-f.pixmap = "on" // set pixmap status to on
+f.immediate_drawing = "off";
 plot2d() // nothing happens on the screen...
-show_pixmap() // ...display the pixmap on screen
+f.immediate_drawing = "on";
 
 //Example 2 : default_figure settings
 df=get("default_figure") // get the default values (shortcut is gdf() )
@@ -326,7 +324,8 @@ plot2d()
 scf(214);
 t=-%pi:0.3:%pi;
 plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
- ]]></programlisting>
+ ]]>
+        </programlisting>
     </refsection>
     <refsection role="see also">
         <title>See Also</title>
@@ -359,9 +358,6 @@ plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
                 <link linkend="axes_properties">axes_properties</link>
             </member>
             <member>
-                <link linkend="show_pixmap">show_pixmap</link>
-            </member>
-            <member>
                 <link linkend="clear_pixmap">clear_pixmap</link>
             </member>
             <member/>
diff --git a/scilab/modules/graphics/help/en_US/show_pixmap.xml b/scilab/modules/graphics/help/en_US/show_pixmap.xml
deleted file mode 100644 (file)
index 97b60e7..0000000
+++ /dev/null
@@ -1,94 +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-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="show_pixmap">
-    <refnamediv>
-        <refname>show_pixmap</refname>
-        <refpurpose>send the pixmap buffer to the
-            screen <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>show_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>
-            The <literal>show_pixmap()</literal> instruction send the pixmap to the
-            screen.
-        </para>
-        <para>The pixmap mode can be used to obtain smooth animations. This property
-            can be found among the figure entity fields (see
-            <link linkend="figure_properties">figure_properties</link>).
-        </para>
-        <para>
-            WARNING: Obsolete function.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>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-f=gcf();
-f.pixmap='on'; //set the pixmap mode
-a=gca();
-a.data_bounds=[0 0; 10 10];
-//construct two rectangles
-xrects([0;10;1;1],5);
-r1=gce();
-r1=r1.children;
-xrects([0;1;1;1],13);
-r2=gce();
-r2=r2.children;
-//animation loop
-for k=1:1000
-  //draw the rectangles in the pixmap buffer
-  move(r1,[0.01,-0.01]);
-  move(r2,[0.01,0.01])
-  //show the pixmap buffer
-  show_pixmap()
-  xpause(10000)
-end
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="figure_properties">figure_properties</link>
-            </member>
-            <member>
-                <link linkend="clear_pixmap">clear_pixmap</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 show_pixmap is obsolete.</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 35a7a6d..e52d746 100644 (file)
@@ -84,11 +84,9 @@ n=100;
 
 clf();
 f=gcf();//カレントの図のハンドルを取得
-f.pixmap='on';//ダブルバッファモード
 ax=gca();//カレントの軸のハンドルを取得
 ax.data_bounds=[0,0;10,10];//data_boundsを設定
 ax.box='on'; //ボックスを描画 
-show_pixmap()
 for k=-n:n,
   a=ones(n,n);
   a= 3*tril(a,k)+ 2*a;
@@ -96,10 +94,8 @@ for k=-n:n,
   k1= 3*(k+100)/200;
   if k>-n then delete(gce()),end
   Matplot1(a,[k1,2,k1+7,9])
-  show_pixmap() //ダブルバッファを画面に送信
   sleep(8);
 end
-f.pixmap='off';
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 64bed7c..de6dea7 100644 (file)
@@ -305,16 +305,13 @@ t = linspace(0,4*%pi,nt);
 show_window(); clf()
 f=gcf();
 f.color_map=jetcolormap(64);
-f.pixmap='on';
 colorbar(-1,1)
 Sgrayplot(x,y,cos(t(1))*z, strf="042", zminmax=[-1,1])
 c=gce(),e=c.children
 xtitle("Kaa''s eyes")
 for i = 1:nt
   e.data(:,3)=matrix(cos(t(i))*z,-1,1);
-  show_pixmap()
 end
-f.pixmap='off';
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index c1c7315..a88748d 100644 (file)
@@ -39,9 +39,6 @@
             <member>
                 <link linkend="figure_properties">figure_properties</link>
             </member>
-            <member>
-                <link linkend="show_pixmap">show_pixmap</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
index a59c90d..63079ec 100644 (file)
         <programlisting role="example"><![CDATA[ 
 t=[0:0.3:2*%pi]'; z=sin(t)*cos(t'); 
 plot3d1(t,t,z) 
-f=gcf();f.pixmap='on';
+f=gcf();
 for h=0:0.1:1
   hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
   f.color_map=hsv2rgb(hsv);
-  show_pixmap()
   xpause(10000)
 end
 for v=0:0.1:1
   hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
   f.color_map=hsv2rgb(hsv);
-  show_pixmap()
   xpause(10000)
 end
  ]]></programlisting>
index 1ef7e90..d5eaf89 100644 (file)
@@ -374,9 +374,6 @@ plot3d(t,t,sin(t)'*cos(t),35,45,'X@Y@Z',[15,2,4]);
                 <link linkend="axes_properties">axes_properties</link>
             </member>
             <member>
-                <link linkend="show_pixmap">show_pixmap</link>
-            </member>
-            <member>
                 <link linkend="clear_pixmap">clear_pixmap</link>
             </member>
             <member/>
diff --git a/scilab/modules/graphics/help/ja_JP/show_pixmap.xml b/scilab/modules/graphics/help/ja_JP/show_pixmap.xml
deleted file mode 100644 (file)
index 4717614..0000000
+++ /dev/null
@@ -1,65 +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-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="show_pixmap">
-    <refnamediv>
-        <refname>show_pixmap</refname>
-        <refpurpose>pixmapバッファを画面に送信する</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>呼び出し手順</title>
-        <synopsis>show_pixmap()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>説明</title>
-        <para>
-            グラフィックウインドウの <literal>pixmap</literal> プロパティが <literal>"on"</literal>の場合,
-            描画データは画面ではなく,pixmapメモリに送信されます.
-        </para>
-        <para>
-            <literal>show_pixmap()</literal>命令はpixmapを画面に送信します.
-        </para>
-        <para>pixmapモードは滑らかなアニメーションを得るために使用されます.
-            このプロパティはfigureエンティティフィールドの中にあります
-            (
-            <link linkend="figure_properties">figure_properties</link>参照).
-        </para>
-    </refsection>
-    <refsection>
-        <title>例</title>
-        <programlisting role="example"><![CDATA[ 
-f=gcf();f.pixmap='on'; //pixmapモードを設定
-a=gca();a.data_bounds=[0 0; 10 10];
-//2つの矩形を構築
-xrects([0;10;1;1],5);r1=gce();r1=r1.children;
-xrects([0;1;1;1],13);r2=gce();r2=r2.children;
-//アニメーションループ
-for k=1:1000
-  //pixmapバッファに矩形を描画
-  move(r1,[0.01,-0.01]);move(r2,[0.01,0.01]) 
-  //pixmapバッファを表示
-  show_pixmap()
-end
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>参照</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="figure_properties">figure_properties</link>
-            </member>
-            <member>
-                <link linkend="clear_pixmap">clear_pixmap</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index 153a26c..ec4265a 100644 (file)
@@ -69,11 +69,9 @@ n=100;
 
 clf();
 f=gcf();//obtendo o manipulador da figura corrente
-f.pixmap='on';//modo de buffer duplo
 ax=gca();//obtendo o manipulador dos eixos corrente
 ax.data_bounds=[0,0;10,10];//ajustando the data_bounds
 ax.box='on'; //desenhando uma caixa
-show_pixmap()
 for k=-n:n,
   a=ones(n,n);
   a= 3*tril(a,k)+ 2*a;
@@ -81,10 +79,8 @@ for k=-n:n,
   k1= 3*(k+100)/200;
   if k>-n then delete(gce()),end
   Matplot1(a,[k1,2,k1+7,9])
-  show_pixmap() //enviando o buffer duplo para a tela
   sleep(8);
 end
-f.pixmap='off';
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 21c65fe..77abd3a 100644 (file)
@@ -314,16 +314,13 @@ t = linspace(0,4*%pi,nt);
 show_window(); clf()
 f=gcf();
 f.color_map=jetcolormap(64);
-f.pixmap='on';
 colorbar(-1,1)
 Sgrayplot(x,y,cos(t(1))*z, strf="042", zminmax=[-1,1])
 c=gce(),e=c.children
 xtitle("Olhos de Kaa")
 for i = 1:nt
   e.data(:,3)=matrix(cos(t(i))*z,-1,1);
-  show_pixmap()
 end
-f.pixmap='off';
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index 244b983..4586125 100644 (file)
@@ -40,9 +40,6 @@
             <member>
                 <link linkend="figure_properties">figure_properties</link>
             </member>
-            <member>
-                <link linkend="show_pixmap">show_pixmap</link>
-            </member>
         </simplelist>
     </refsection>
 </refentry>
index 9b4dd38..c2c10d9 100644 (file)
         <programlisting role="example"><![CDATA[ 
 t=[0:0.3:2*%pi]'; z=sin(t)*cos(t'); 
 plot3d1(t,t,z) 
-f=gcf();f.pixmap='on';
+f=gcf();
 for h=0:0.1:1
   hsv=[h*ones(32,1) linspace(0,1,32)' 0.7*ones(32,1)];
   f.color_map=hsv2rgb(hsv);
-  show_pixmap()
   xpause(10000)
 end
 for v=0:0.1:1
   hsv=[ones(32,1) linspace(0,1,32)' v*ones(32,1)];
   f.color_map=hsv2rgb(hsv);
-  show_pixmap()
   xpause(10000)
 end
  ]]></programlisting>
diff --git a/scilab/modules/graphics/help/pt_BR/show_pixmap.xml b/scilab/modules/graphics/help/pt_BR/show_pixmap.xml
deleted file mode 100644 (file)
index f304ffe..0000000
+++ /dev/null
@@ -1,66 +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-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="show_pixmap" xml:lang="en">
-    <refnamediv>
-        <refname>show_pixmap</refname>
-        <refpurpose>Envia o buffer de pixmap à tela</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>show_pixmap()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Descrição</title>
-        <para>
-            Se a propriedade <literal>pixmap</literal> de uma janela gráfica é
-            <literal>"on"</literal> os desenhos são enviados à memória pixmap ao invés
-            da tela de exibição
-        </para>
-        <para>
-            A instrução <literal>show_pixmap()</literal> envia o pixmap à
-            tela.
-        </para>
-        <para>O modo pixmap pode ser usado para se obter animações suaves. Esta
-            propriedade pode ser encontrada entre os campos de entidades da figura
-            (ver <link linkend="figure_properties">figure_properties</link>).
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[ 
-f=gcf();f.pixmap='on'; //ajustando o modo pixmap
-a=gca();a.data_bounds=[0 0; 10 10];
-//construindo dois retângulos
-xrects([0;10;1;1],5);r1=gce();r1=r1.children;
-xrects([0;1;1;1],13);r2=gce();r2=r2.children;
-//laço de animação
-for k=1:1000
-  //desenhando os retângulos no buffer pixmap
-  move(r1,[0.01,-0.01]);move(r2,[0.01,0.01]) 
-  //exibindo o buffer pixmap
-  show_pixmap()
-end
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="figure_properties">figure_properties</link>
-            </member>
-            <member>
-                <link linkend="clear_pixmap">clear_pixmap</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
index cb76f12..a0b52be 100644 (file)
@@ -445,7 +445,6 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_clear_pixmap.c, line: 34
 # File: sci_gateway/c/sci_draw.c, line: 35
-# File: sci_gateway/c/sci_show_pixmap.c, line: 36
 #, c-format
 msgid "%s: Function %s is obsolete.\n"
 msgstr ""
@@ -457,15 +456,11 @@ msgstr ""
 # File: sci_gateway/c/sci_draw.c, line: 35
 # File: sci_gateway/c/sci_draw.c, line: 36
 # File: sci_gateway/c/sci_draw.c, line: 37
-# File: sci_gateway/c/sci_show_pixmap.c, line: 36
-# File: sci_gateway/c/sci_show_pixmap.c, line: 37
-# File: sci_gateway/c/sci_show_pixmap.c, line: 38
 msgid "Warning"
 msgstr ""
 
 #
 # File: sci_gateway/c/sci_clear_pixmap.c, line: 35
-# File: sci_gateway/c/sci_show_pixmap.c, line: 37
 #, c-format
 msgid "%s: Please use %s instead.\n"
 msgstr ""
@@ -473,7 +468,6 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_clear_pixmap.c, line: 36
 # File: sci_gateway/c/sci_draw.c, line: 37
-# File: sci_gateway/c/sci_show_pixmap.c, line: 38
 #, c-format
 msgid ""
 "%s: This function will be permanently removed in Scilab %s\n"
index 227c098..ff87539 100644 (file)
@@ -174,9 +174,9 @@ function [x,y,ok,gc]=edit_curv(x,y,job,tit,gc)
             return
 
         case "Undo" then
-            if hdl<>[] then draw(hdl),end //erase
+            if hdl<>[] then hdl.visible = "on";end //erase
             x=xs;y=ys
-            if x<>[] then hdl.data=[x y];draw(hdl);end
+            if x<>[] then hdl.data=[x y];hdl.visible = "on";end
 
         case "Size" then
             while %t
@@ -246,7 +246,7 @@ function [x,y,ok,gc]=edit_curv(x,y,job,tit,gc)
         case "edit" then
             npt=prod(size(x))
             if npt<>0 then
-                dist=((x-ones(npt,1)*c1(1))/dx)^2+((y-ones(npt,1)*c1(2))/dy)^2
+                dist=((x-ones(npt,1)*c1(1))/dx).^2+((y-ones(npt,1)*c1(2))/dy).^2
                 [m,k]=min(dist);m=sqrt(m)
             else
                 m=3*eps
@@ -336,7 +336,7 @@ function [x,y] = addpt(c1,x,y)
                 pp=pp(:,i)
                 x=x([1:k k:npt]);x(k+1)=pp(1);
                 y=y([1:k k:npt]);y(k+1)=pp(2);
-                hdl;drawlater();hdl.data=[x y];draw(hdl)
+                hdl;drawlater();hdl.data=[x y];hdl.visible = "on"; drawnow();
                 return
             end
         end
@@ -352,13 +352,12 @@ function [x,y] = addpt(c1,x,y)
         x(npt+1)=c1(1)
         y(npt+1)=c1(2)
     end
-    hdl;drawlater();hdl.data=[x y];draw(hdl)
+    hdl;drawlater();hdl.data=[x y];hdl.visible = "on"; drawnow();
 endfunction
 
 function [x,y]=movept(x,y)
     //on bouge un point existant
     hdl;
-    //** f;f.pixmap='on';
     rep(3)=-1
     while rep(3)==-1 do
         rep = xgetmouse();
@@ -367,10 +366,8 @@ function [x,y]=movept(x,y)
         if mody==0 then c2(2)=y(k);end
         x(k)=c2(1);y(k)=c2(2)
         hdl.data=[x,y];
-        //** show_pixmap();
         drawnow()
     end
-    //** f.pixmap='off';
 endfunction
 
 
index 03b30b1..e2d5c99 100644 (file)
@@ -1508,7 +1508,6 @@ function ged_eventhandler(win,x,y,ibut)
     global ged_handle;ged_handle=[]
     ged_handle=ged_getobject([x,y])
 
-
     if ged_handle~=[] then
         if  or(ibut==[0 3 10]) then //left button --> edit properties
             tkged()
@@ -1518,9 +1517,7 @@ function ged_eventhandler(win,x,y,ibut)
             while %t then
                 rep=xgetmouse([%t %t])
                 if rep(3)>0 then break,end
-
                 move(ged_handle,rep(1:2)-pos)
-                show_pixmap()
                 pos=rep(1:2)
             end
         end
@@ -2409,7 +2406,7 @@ function ged_move_entity()
     cur_ax=gca(),sca(ax)
     [xc,yc]=xchange(xc,yc,"i2f");pos=[xc,yc]
     if r==[] return,end
-    f=gcf();pix=f.pixmap;f.pixmap="on"
+    drawlater();
     rep(3)=-1
     select r.type
     case "Rectangle" then
@@ -2417,35 +2414,35 @@ function ged_move_entity()
             rep=xgetmouse([%t %t])
             r.data(1:2)= r.data(1:2)+(rep(1:2)-pos)
             pos=rep(1:2)
-            show_pixmap()
+            drawnow();
         end
     case "Segs" then //Segment
         while rep(3)==-1 do
             rep=xgetmouse([%t %t])
             r.data=r.data+ones(2,1)*(rep(1:2)-pos)
             pos=rep(1:2)
-            show_pixmap()
+            drawnow();
         end
     case "Polyline" then //Polyline
         while rep(3)==-1 do
             rep=xgetmouse([%t %t])
             r.data(:,1:2)=r.data(:,1:2)+ones(r.data(:,1))*(rep(1:2)-pos)
             pos=rep(1:2)
-            show_pixmap()
+            drawnow();
         end
     case "Arc" then //Circle
         while rep(3)==-1 do
             rep=xgetmouse([%t %t])
             r.data(1:2)= r.data(1:2)+(rep(1:2)-pos)
             pos=rep(1:2)
-            show_pixmap()
+            drawnow();
         end
     case "Text" then
         while rep(3)==-1 do
             rep=xgetmouse([%t %t])
             r.data(1:2)= r.data(1:2)+(rep(1:2)-pos)
             pos=rep(1:2)
-            show_pixmap()
+            drawnow();
         end
     case "Label" then
         while rep(3)==-1 do
@@ -2453,12 +2450,11 @@ function ged_move_entity()
             r.position= r.position+(rep(1:2)-pos)
             r.auto_position = "off"
             pos=rep(1:2)
-            show_pixmap()
+            drawnow();
         end
 
     end
     sca(cur_ax)
-    f.pixmap=stripblanks(pix)
 endfunction
 
 function ged_copy_entity()
index 5668b0c..e2317cd 100644 (file)
@@ -39,7 +39,7 @@ function ged_insert(k,win)
 
     [k,xc,yc]=ged_click()
 
-    pix=f.pixmap; f.pixmap="on"
+    drawlater();
     default_axes = gca(); // get the default axes where we start
     rep(3)=-1
     select k
@@ -51,14 +51,13 @@ function ged_insert(k,win)
         sca(axes);  // I change axes and therefore change the scale
         [xc,yc] = xchange(xc,yc,"i2f"); // in the new scale I recompute the corresponding pixel values
         xpoly([xc;xc],[yc;yc])
-        show_pixmap()
+        drawnow();
         r=gce();r.foreground=-1;
         r.clip_state="off";
         xinfo(mess2)
         while rep(3)==-1 do
             rep=xgetmouse(0,[%t %t])
             r.data=[xc,yc;rep(1),rep(2)]
-            show_pixmap()
             xinfo(mess2)
         end
     case 2 then //Polyline (stroken line)
@@ -67,7 +66,7 @@ function ged_insert(k,win)
         sca(axes);
         [xc,yc] = xchange(xc,yc,"i2f");
         xpoly([xc;xc],[yc;yc])
-        show_pixmap()
+        drawnow();
         r=gce();r.foreground=-1;
         r.data(:,3)=0.;
         r.clip_state="off";
@@ -77,7 +76,6 @@ function ged_insert(k,win)
             while rep(3)==-1 do
                 rep=xgetmouse(0)
                 r.data($,:)= [rep(1),rep(2),0]
-                show_pixmap()
                 xinfo(mess1)
             end
             if or(rep(3)==[2 5 -100]) then break,end
@@ -89,7 +87,7 @@ function ged_insert(k,win)
         sca(axes);
         [xc,yc] = xchange(xc,yc,"i2f");
         xpoly([xc;xc],[yc;yc])
-        show_pixmap()
+        drawnow();
         r=gce();r.foreground=-1;
         r.data(:,3)=0.;
         r.polyline_style = 4;
@@ -100,7 +98,6 @@ function ged_insert(k,win)
         while rep(3)==-1 do
             rep=xgetmouse(0,[%t %t])
             r.data($,:)= [rep(1),rep(2),0]
-            show_pixmap()
             xinfo(mess2)
         end
         //   case 4 // Double Arrow
@@ -125,14 +122,12 @@ function ged_insert(k,win)
         //     r2.clip_state='off';
         //
         //     xinfo(mess2)
-        //     show_pixmap()
         //     while rep(3)==-1 do
         //       rep=xgetmouse(0,[%t %t])
         //       drawlater();
         //       r1.data($,:)= [rep(1),rep(2),0]
         //       r2.data(1,:)= [rep(1),rep(2),0]
         //       drawnow();
-        //       show_pixmap()
         //       xinfo(mess2)
         //     end
 
@@ -144,21 +139,20 @@ function ged_insert(k,win)
             // get the position of the text
             xstring( xc, yc, text ) ;
         end
-        show_pixmap() ;
+        drawnow();
     case 5 then //Rectangle
         axes = get_insertion_axes(job,f,default_axes,xc,yc)
         [xc,yc] = xchange(xc,yc,"f2i");
         sca(axes);
         [xc,yc] = xchange(xc,yc,"i2f");
         xrect(xc,yc,0,0)
-        show_pixmap()
+        drawnow();
         r=gce();r.foreground=-1;
         r.clip_state="off";
         xinfo(mess2)
         while rep(3)==-1 do
             rep=xgetmouse(0,[%t %t])
             r.data=[min(xc,rep(1)),max(yc,rep(2)),abs(xc-rep(1)),abs(yc-rep(2))]
-            show_pixmap()
             xinfo(mess2)
         end
     case 6 then //Circle
@@ -167,14 +161,13 @@ function ged_insert(k,win)
         sca(axes);
         [xc,yc] = xchange(xc,yc,"i2f");
         xarc(xc,yc,0,0,0,64*360)
-        show_pixmap()
+        drawnow();
         r=gce();r.foreground=-1;
         r.clip_state="off";
         xinfo(mess2)
         while rep(3)==-1 do
             rep=xgetmouse(0,[%t %t])
             r.data=[min(xc,rep(1)),max(yc,rep(2)),abs(xc-rep(1)),abs(yc-rep(2)),0,64*360]
-            show_pixmap()
             xinfo(mess2)
         end
     end
index e16ac76..8356932 100644 (file)
@@ -67,23 +67,19 @@ function k=getlinestyle()
     addmenu(win,"Ok",list(2,"menu_ok"));
     addmenu(win,"Cancel",list(2,"menu_cancel"));
 
-    f.pixmap="on";
-
     k1=[]; //default
 
-    // to be sure that it is shown before the loop
-    show_pixmap();
-
     while %t
         select done
         case 0 then //click somehere
             cx = pos(1);
             cy = pos(2);
             k1 = ceil(cy/2);k1=min(k1,6);k1=max(1,k1);
+            drawlater();
             R(ksel).thickness=1;
             R(k1).thickness=3;
             ksel=k1
-            show_pixmap()
+            drawnow();
         case 1 then  // ok button clicked
             k=k1;break,
         case 2 then   // cancel button clicked
index c0d2536..26e5ffa 100644 (file)
@@ -51,7 +51,6 @@ static gw_generic_table Tab[] =
     {sci_xarrows, "xarrows"},
     {sci_drawaxis, "drawaxis"},
     {sci_xchange, "xchange"},
-    {NULL, ""},//show_pixmap
     {sci_xclick, "xclick"},
     {sci_xdel, "xdel"},
     {sci_xarc, "xfarc"},
diff --git a/scilab/modules/graphics/sci_gateway/c/sci_show_pixmap.c b/scilab/modules/graphics/sci_gateway/c/sci_show_pixmap.c
deleted file mode 100644 (file)
index 3fdf613..0000000
+++ /dev/null
@@ -1,45 +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-en.txt
- *
- */
-
-/*------------------------------------------------------------------------*/
-/* file: sci_show_pixmap.c                                                */
-/* desc : interface for show_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_show_pixmap(char *fname, unsigned long fname_len)
-{
-    /* call show_pixmap */
-
-    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;
-}
-/*--------------------------------------------------------------------------*/
index 7325f04..e7d1b96 100644 (file)
@@ -14,8 +14,8 @@
 // When figure has property pixmap='on' then the window is cleared when resized.
 warning("off");
 f=gcf();
-f.pixmap="on";
+drawlater();
 xrect([0.2 0.7 0.5 0.5]);
-show_pixmap();
+drawnow();
 warning("on");
 // Resize the figure, it should not be cleared...
index 8d2469c..57d93c0 100644 (file)
@@ -16,9 +16,9 @@
 // When figure has property pixmap='on' then the window is cleared when resized.
 warning("off");
 f=gcf();
-f.pixmap="on";
+drawlater();
 xrect([0.2 0.7 0.5 0.5]);
-show_pixmap();
+drawnow();
 warning("on");
 // Resize the figure, it should not be cleared...
 
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2458.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_2458.tst
deleted file mode 100644 (file)
index 0f4493b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008-2008 - INRIA - Jean-Baptiste Silvy
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-// <-- TEST WITH GRAPHIC -->
-// <-- INTERACTIVE TEST -->
-
-// <-- Non-regression test for bug 2458 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=2458
-//
-// <-- Short Description -->
-//Under linux Suse 10.2, with build4, official build of 4.1.1
-// and 4.1 there is a memory leak relative to show_pixmap()
-// memory result (ram dependency)
-nbComputation = 2000;
-
-plot2d();
-f=gcf();f.pixmap='on';
-show_pixmap(); // show it once for memory allocation
-
-freeMemoryInit = getmemory();
-for k=1:nbComputation, show_pixmap(); end 
-
-// compute used memory during compuations
-usedMemory = freeMemoryInit - getmemory();
-
-// 5 mega
-if (usedMemory > 5000) then pause; end
-
index baae8b3..7eb77d9 100644 (file)
@@ -40,7 +40,6 @@ realtimeinit(0.05);//set time step (0.05 seconds)  and date reference
 for i=1:size(A,'*')
   realtime(i); //wait till date 0.05*i seconds
   curAxe.rotation_angles = [45,A(i)];
-  show_pixmap(); //send  buffer to screen
 end
 // check memory consumption
 // user complained that it use to use 20Mb of memory
index 75df62e..3a30b18 100644 (file)
@@ -20,9 +20,6 @@
 // set double buffer mode to avoid blinking animation
 //---------------------------------------------------
 curFig = gcf();clf();  // erase window
-pix = curFig.pixmap; //preserve old setting
-curFig.pixmap = "on";
-
 
 //The surface definition 
 //----------------------
@@ -50,7 +47,6 @@ realtimeinit(0.05);//set time step (0.05 seconds)  and date reference
 for i=1:size(A,'*')
   realtime(i); //wait till date 0.05*i seconds
   curAxe.rotation_angles = [45,A(i)];
-  show_pixmap(); //send  buffer to screen
 end
 
 // check memory consumption
index 135976b..5ed68c1 100644 (file)
@@ -32,7 +32,6 @@ function [blocks] = anim_pen(blocks,flag)
         set("figure_style","new")
         H=scf(win)
         clf(H)
-        H.pixmap="on"
         Axe=H.children
         Axe.data_bounds=rpar(4:7)
         Axe.isoview="on"
@@ -59,6 +58,7 @@ function [blocks] = anim_pen(blocks,flag)
         Axe=H.children
         x=blocks.inptr(1)(1)
         theta=blocks.inptr(2)(1)
+        drawlater();
         XY=Axe.children(4).data'+ [cos(phi)*(x-xold);sin(phi)*(x-xold)]*ones(1,5)
         Axe.children(4).data=XY'
 
@@ -70,7 +70,7 @@ function [blocks] = anim_pen(blocks,flag)
         x1=x*cos(phi);y1=x*sin(phi)
         XY=[x1,x1+plen*sin(theta);y1,y1+plen*cos(theta)]
         Axe.children(1).data=XY'
+        drawnow();
         blocks.z=x
-        show_pixmap()
     end
 endfunction ///\withPrompt{}
index b7534d0..cb0ab47 100644 (file)
@@ -395,7 +395,7 @@ function [rpar,ipar,ok]=poke_point(ixy,iparin,rparin)
                     a.data_bounds=[xmn1,ymn1;xmx1,ymx1];
                 end
             end
-            //drawnow();//show_pixmap();
+            //drawnow();
             //-------------------------------------------------------------------
         case "Autoscale" then
             [rpar,ipar]=AutoScale(a,xy,ipar,rpar)
@@ -617,24 +617,18 @@ function [rpar,ipar,ok]=poke_point(ixy,iparin,rparin)
             if (~HIT)&(btn==0 | btn==3) then    // add point
                 xy=[xy;xc,yc];
                 [xtt,k2]=gsort(xy(:,1),"r","i");xy=xy(k2,:)
-                f.pixmap="on";
                 drawlater();
                 points.data=xy;
                 [rpar,ipar]=drawSplin(a,xy,ipar,rpar);
-                show_pixmap();
                 drawnow()
-                f.pixmap="off";
             end
 
             if (HIT)&(btn==2 | btn==5) then  //   remove point
-                f.pixmap="on";
                 xy(k,:)=[];
                 drawlater();
                 points.data=xy;
                 [rpar,ipar]=drawSplin(a,xy,ipar,rpar);
-                show_pixmap();
                 drawnow()
-                f.pixmap="off";
             end
 
             if (HIT)&(btn==0) then             // move point
@@ -649,13 +643,10 @@ function [rpar,ipar,ok]=poke_point(ixy,iparin,rparin)
                 if mok then
                     xy(k,:)=[xt,yt];
                     [xy]=cleandata(xy)
-                    f.pixmap="on";
                     drawlater();
                     points.data=xy;
                     [rpar,ipar]=AutoScale(a,xy,ipar,rpar)
-                    show_pixmap();
                     drawnow()
-                    f.pixmap="off";
                 end
             end
 
@@ -729,7 +720,6 @@ function [xyt,orpar,oipar]=movept(a,xy,iipar,irpar,k)
         drawlater();
         points.data=xyt;
         [orpar,oipar]=drawSplin(a,xyt,oipar,orpar);
-        show_pixmap();
         drawnow()
     end
 
@@ -893,7 +883,6 @@ function  [orpar,oipar]=AutoScale(a,xy,inipar,inrpar)
     [orpar,oipar]=drawSplin(a,xy,oipar,orpar);
     rectx=findrect(a);
     a.data_bounds=rectx;
-    show_pixmap();
     drawnow()
 endfunction
 //============================
index 85faf45..d22ebdd 100644 (file)
@@ -385,7 +385,7 @@ function [rpar,ipar,ok] = poke_point(ixy,iparin,rparin)
                     a.data_bounds=[xmn1, ymn1; xmx1, ymx1];
                 end
             end
-            //drawnow();//show_pixmap();
+            //drawnow();
             //-------------------------------------------------------------------
         case "Autoscale" then
             [rpar,ipar]=AutoScale(a,xy,ipar,rpar)