made tha animation example more uniform. added subplots_adjust button to qt backends

cmoad · cmoad · commit cee76c6ae161 · 2006-07-28T15:24:08.000Z
svn path=/trunk/matplotlib/; revision=2627
diff --git a/examples/animation_blit.py b/examples/animation_blit.py
@@ -17,6 +17,9 @@
 ax = p.subplot(111)
 canvas = ax.figure.canvas
 
+p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
+p.grid() # to ensure proper background restore
+
 # create the initial line
 x = nx.arange(0,2*nx.pi,0.01)
 line, = p.plot(x, nx.sin(x), animated=True, lw=2)
@@ -33,17 +36,21 @@ def update_line(*args):
     # update the data
     line.set_ydata(nx.sin(x+update_line.cnt/10.0))
     # just draw the animated artist
-    ax.draw_artist(line)
+    try:
+        ax.draw_artist(line)
+    except AssertionError:
+        return
     # just redraw the axes rectangle
     canvas.blit(ax.bbox)
 
-    if update_line.cnt==200:
+    if update_line.cnt==1000:
         # print the timing info and quit
-        print 'FPS:' , 200/(time.time()-tstart)
+        print 'FPS:' , 1000/(time.time()-tstart)
         sys.exit()
 
     update_line.cnt += 1
     return True
+
 update_line.cnt = 0
 update_line.background = None
 gobject.idle_add(update_line)
diff --git a/examples/animation_blit_fltk.py b/examples/animation_blit_fltk.py
@@ -35,13 +35,15 @@ def update(self,ptr):
         # just redraw the axes rectangle
         self.canvas.blit(ax.bbox) 
         self.cnt+=1
-        if self.cnt==200:
+        if self.cnt==1000:
             # print the timing info and quit
-            print 'FPS:' , 200/(time.time()-self.tstart)
+            print 'FPS:' , 1000/(time.time()-self.tstart)
             sys.exit()
         return True
 
 ax = p.subplot(111)
+p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
+p.grid() # to ensure proper background restore
 # create the initial line
 x = nx.arange(0,2*nx.pi,0.01)
 line, = p.plot(x, nx.sin(x), animated=True)
diff --git a/examples/animation_blit_qt.py b/examples/animation_blit_qt.py
@@ -12,7 +12,7 @@
 
 TRUE  = 1
 FALSE = 0
-ITERS = 200
+ITERS = 1000
 
 import pylab as p
 import matplotlib.numerix as nx
diff --git a/examples/animation_blit_tk.py b/examples/animation_blit_tk.py
@@ -32,15 +32,17 @@ def run(*args):
         # just redraw the axes rectangle
         canvas.blit(ax.bbox) 
 
-        if run.cnt==200:
+        if run.cnt==1000:
             # print the timing info and quit
-            print 'FPS:' , 200/(time.time()-tstart)
+            print 'FPS:' , 1000/(time.time()-tstart)
             sys.exit()
 
         run.cnt += 1
 run.cnt = 0        
 
 
+p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
+p.grid() # to ensure proper background restore
 manager = p.get_current_fig_manager()
 manager.window.after(100, run)
 
diff --git a/examples/animation_blit_wx.py b/examples/animation_blit_wx.py
@@ -22,6 +22,9 @@
 canvas = ax.figure.canvas
 
 
+p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
+p.grid() # to ensure proper background restore
+
 # create the initial line
 x = nx.arange(0,2*nx.pi,0.01)
 line, = p.plot(x, nx.sin(x), animated=True, lw=2)
@@ -48,18 +51,20 @@ def update_line(*args):
     canvas.blit(ax.bbox)
     blit_time += time.time() - t
 
-    if update_line.cnt==200:
+    if update_line.cnt==1000:
         # print the timing info and quit
         frame_time = time.time() - tstart
         print '200 frames: %.2f seconds' % frame_time
         print '200 blits:  %.2f seconds' % blit_time
         print
-        print 'FPS: %.2f' % (200/frame_time)
-        print 'BPS: %.2f' % (200/blit_time)
+        print 'FPS: %.2f' % (1000/frame_time)
+        print 'BPS: %.2f' % (1000/blit_time)
         sys.exit()
 
     update_line.cnt += 1
     wx.WakeUpIdle()
+    
+
 
 update_line.cnt = 0
 update_line.background = None
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -15,6 +15,8 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.figure import Figure
 from matplotlib.mathtext import math_parse_s_ft2font
+from matplotlib.widgets import SubplotTool
+
 import qt
 
 backend_version = "0.9.1"
@@ -164,22 +166,16 @@ def __init__( self, canvas, num ):
         self.window.setCaption( "Figure %d" % num )
 
         self.window._destroying = False
-
-        if matplotlib.rcParams['toolbar'] == 'classic':
-            print "Classic toolbar is not yet supported"
-            #self.toolbar = NavigationToolbarQT( centralWidget, canvas )
-            self.toolbar = None
-        elif matplotlib.rcParams['toolbar'] == 'toolbar2':
-            self.toolbar = NavigationToolbar2QT( centralWidget, canvas )
-        else:
-            self.toolbar = None
+        
+        self.toolbar = self._get_toolbar(self.canvas, centralWidget)
 
         # Use a vertical layout for the plot and the toolbar.  Set the
         # stretch to all be in the plot so the toolbar doesn't resize.
-        layout = qt.QVBoxLayout( centralWidget )
-        layout.addWidget( self.canvas, 1 )
+        self.layout = qt.QVBoxLayout( centralWidget )
+        self.layout.addWidget( self.canvas, 1 )
+        
         if self.toolbar:
-           layout.addWidget( self.toolbar, 0 )
+           self.layout.addWidget( self.toolbar, 0 )
 
         self.window.setCentralWidget( centralWidget )
 
@@ -212,6 +208,21 @@ def _widgetclosed( self ):
     def _widgetCloseEvent( self, event ):
         self._widgetclosed()
         qt.QWidget.closeEvent( self.window, event )
+        
+    def _get_toolbar(self, canvas, parent):
+        # must be inited after the window, drawingArea and figure
+        # attrs are set
+        if matplotlib.rcParams['toolbar'] == 'classic':
+            print "Classic toolbar is not yet supported"
+        elif matplotlib.rcParams['toolbar'] == 'toolbar2':
+            toolbar = NavigationToolbar2QT(canvas, parent)
+        else:
+            toolbar = None
+        return toolbar
+    
+    def set_canvas_size(self, width, height):
+        'set the canvas size in pixels'
+        self.window.resize(width, height)
 
     def destroy( self, *args ):
         if self.window._destroying: return
@@ -230,10 +241,11 @@ class NavigationToolbar2QT( NavigationToolbar2, qt.QWidget ):
         ('Pan', 'Pan axes with left mouse, zoom with right', 'move.ppm', 'pan'),
         ('Zoom', 'Zoom to rectangle','zoom_to_rect.ppm', 'zoom'),
         (None, None, None, None),
+        ('Subplots', 'Configure subplots','subplots.png', 'configure_subplots'),
         ('Save', 'Save the figure','filesave.ppm', 'save_figure'),
         )
         
-    def __init__( self, parent, canvas ):
+    def __init__( self, canvas, parent ):
         self.canvas = canvas
         self.buttons = {}
 
@@ -282,6 +294,9 @@ def _init_toolbar( self ):
         self.locLabel.setSizePolicy(qt.QSizePolicy(qt.QSizePolicy.Ignored,
                                                       qt.QSizePolicy.Ignored))
         self.layout.addWidget( self.locLabel, 1 )
+        
+        # reference holder for subplots_adjust window
+        self.adj_window = None
 
     def pan( self, *args ):
         self.buttons[ 'Zoom' ].setOn( False )
@@ -312,6 +327,32 @@ def draw_rubberband( self, event, x0, y0, x1, y1 ):
 
         rect = [ int(val)for val in min(x0,x1), min(y0, y1), w, h ]
         self.canvas.drawRectangle( rect )
+        
+    def configure_subplots(self):
+        self.adj_window = qt.QMainWindow()
+        win = self.adj_window
+        win.setCaption("Subplot Configuration Tool")
+        
+        toolfig = Figure(figsize=(6,3))
+        toolfig.subplots_adjust(top=0.9)        
+        w = int (toolfig.bbox.width())
+        h = int (toolfig.bbox.height())
+        
+        canvas = self._get_canvas(toolfig)
+        tool = SubplotTool(self.canvas.figure, toolfig)
+        centralWidget = qt.QWidget(win)
+        canvas.reparent(centralWidget, qt.QPoint(0, 0))
+        win.setCentralWidget(centralWidget)
+        
+        layout = qt.QVBoxLayout(centralWidget)
+        layout.addWidget(canvas, 1)
+        
+        win.resize(w, h)
+        canvas.setFocus()
+        win.show()
+    
+    def _get_canvas(self, fig):
+        return FigureCanvasQT(fig)
     
     def save_figure( self ):     
         fname = qt.QFileDialog.getSaveFileName()
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
@@ -4,13 +4,15 @@
 from __future__ import division
 
 import os, sys
+import matplotlib
 from matplotlib import verbose
 from matplotlib.cbook import enumerate
 from matplotlib.figure import Figure
 
 from backend_agg import FigureCanvasAgg
 from backend_qt import qt, FigureManagerQT, FigureCanvasQT,\
-     show, draw_if_interactive, backend_version
+     show, draw_if_interactive, backend_version, \
+     NavigationToolbar2QT
 
 DEBUG = False
 
@@ -23,7 +25,23 @@ def new_figure_manager( num, *args, **kwargs ):
     FigureClass = kwargs.pop('FigureClass', Figure)
     thisFig = FigureClass( *args, **kwargs )
     canvas = FigureCanvasQTAgg( thisFig )
-    return FigureManagerQT( canvas, num )
+    return FigureManagerQTAgg( canvas, num )
+
+class NavigationToolbar2QTAgg(NavigationToolbar2QT):
+    def _get_canvas(self, fig):
+        return FigureCanvasQTAgg(fig)
+    
+class FigureManagerQTAgg(FigureManagerQT):
+    def _get_toolbar(self, canvas, parent):
+        # must be inited after the window, drawingArea and figure
+        # attrs are set
+        if matplotlib.rcParams['toolbar']=='classic':
+            print "Classic toolbar is not yet supported"
+        elif matplotlib.rcParams['toolbar']=='toolbar2':
+            toolbar = NavigationToolbar2QTAgg(canvas, parent)
+        else:
+            toolbar = None
+        return toolbar
 
 class FigureCanvasQTAgg( FigureCanvasQT, FigureCanvasAgg ):
     """
