fixed print_figure bug in qt, updated fig.set_figsize_inches to point to new figmgr.resize

cmoad · cmoad · commit 2220a0595d35 · 2006-07-28T18:20:11.000Z
svn path=/trunk/matplotlib/; revision=2629
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -339,7 +339,6 @@ def configure_subplots(self):
         h = int (toolfig.bbox.height())
         
         canvas = self._get_canvas(toolfig)
-        self.canvas.figure.canvas = self.canvas # Weirdness but needed
         tool = SubplotTool(self.canvas.figure, toolfig)
         centralWidget = qt.QWidget(win)
         canvas.reparent(centralWidget, qt.QPoint(0, 0))
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
@@ -158,5 +158,6 @@ def print_figure( self, filename, dpi=150, facecolor='w', edgecolor='w',
         agg = self.switch_backends( FigureCanvasAgg )
         agg.print_figure( filename, dpi, facecolor, edgecolor, orientation,
                           **kwargs )
+        self.figure.set_canvas(self)
 
         
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -272,7 +272,9 @@ def set_figsize_inches(self, *args, **kwargs):
             dpival = self.dpi.get()
             canvasw = w*dpival
             canvash = h*dpival
-            self.canvas.resize(int(canvasw), int(canvash))
+            manager = getattr(self.canvas, 'manager', None)
+            if manager is not None:
+                manager.resize(int(canvasw), int(canvash))
 
     def get_size_inches(self):
         return self.figwidth.get(), self.figheight.get()
