SF.net SVN: matplotlib: [5655] trunk/matplotlib/lib/matplotlib

[<jd...@us...>]

Revision: 5655
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5655&view=rev
Author:   jdh2358
Date:     2008-06-24 06:56:55 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
removed idle support from tkagg until I figure out interrupts

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
    trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
    trunk/matplotlib/lib/matplotlib/legend.py

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2008-06-24 12:26:43 UTC (rev 5654)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2008-06-24 13:56:55 UTC (rev 5655)
@@ -7,7 +7,7 @@
 from matplotlib import verbose
 from matplotlib.cbook import is_string_like, onetrue
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
-     FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
+     FigureManagerBase, FigureCanvasBase, NavigationToolbar2, IdleEvent, cursors
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
@@ -94,10 +94,15 @@
         FigureCanvasBase.__init__( self, figure )
         self.figure = figure
         self.setMouseTracking( True )
-
+        # hide until we can test and fix
+        #self.startTimer(backend_IdleEvent.milliseconds)
         w,h = self.get_width_height()
         self.resize( w, h )
 
+    def __timerEvent(self, event):
+        # hide until we can test and fix
+        self.mpl_idle_event(event)
+
     def mousePressEvent( self, event ):
         x = event.pos().x()
         # flipy so y=0 is bottom of canvas

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2008-06-24 12:26:43 UTC (rev 5654)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2008-06-24 13:56:55 UTC (rev 5655)
@@ -178,9 +178,10 @@
         def on_idle(*ignore):
             self.idle_event()
             return True
-        t = cbook.Idle(on_idle)
 
-        self._tkcanvas.after_idle(lambda *ignore: t.start())
+        # disable until you figure out how to handle threads and interrupts
+        #t = cbook.Idle(on_idle)
+        #self._tkcanvas.after_idle(lambda *ignore: t.start())
 
     def resize(self, event):
         width, height = event.width, event.height

Modified: trunk/matplotlib/lib/matplotlib/legend.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/legend.py	2008-06-24 12:26:43 UTC (rev 5654)
+++ trunk/matplotlib/lib/matplotlib/legend.py	2008-06-24 13:56:55 UTC (rev 5655)
@@ -271,7 +271,7 @@
                 legline_marker.set_linestyle('None')
                 self._set_artist_props(legline_marker)
                 # we don't want to add this to the return list because
-                # the texts and handles are assumed to be in one to ne
+                # the texts and handles are assumed to be in one-to-one
                 # correpondence.
                 legline._legmarker = legline_marker
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.