fixed qt subplots button. added FigureManager.resize method

cmoad · cmoad · commit c337b3dc4424 · 2006-07-28T17:58:58.000Z
svn path=/trunk/matplotlib/; revision=2628
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,6 @@
+	FigureManager.resize(width, height): resize the window
+	specified in pixels
+	
     barh: x and y args have been renamed to width and bottom
     respectively, and their order has been swapped to maintain
     a (position, value) order.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2006-07-28 Added resize method to FigureManager class
+		   for Qt and Gtk backend - CM
+
+2006-07-28 Added subplots_adjust button to Qt backend - CM
+
 2006-07-22 Fixed bug #1209354 - DSD
 
 2006-07-22 make scatter() work with the kwarg "color". Closes bug 
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1004,6 +1004,11 @@ def destroy(self):
 
     def full_screen_toggle (self):
         pass
+    
+    def resize(self, w, h):
+        'For gui backends: resize window in pixels'
+        pass
+    
     def key_press(self, event):
 
         # these bindings happen whether you are over an axes or not
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -470,11 +470,12 @@ def _get_toolbar(self, canvas):
         return toolbar
 
 
-    def set_canvas_size(self, width, height):
+    def resize(self, width, height):
         'set the canvas size in pixels'
-        _, _, cw, ch = self.canvas.allocation
-        _, _, ww, wh = self.window.allocation
-        self.window.resize (width-cw+ww, height-ch+wh)
+        #_, _, cw, ch = self.canvas.allocation
+        #_, _, ww, wh = self.window.allocation
+        #self.window.resize (width-cw+ww, height-ch+wh)
+        self.window.resize(width, height)
 
 
 class NavigationToolbar2GTK(NavigationToolbar2, gtk.Toolbar):
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -81,8 +81,8 @@ class FigureCanvasQT( qt.QWidget, FigureCanvasBase ):
     buttond = {1:1, 2:3, 4:2}
     def __init__( self, figure ):
         if DEBUG: print 'FigureCanvasQt: ', figure
-        FigureCanvasBase.__init__( self, figure )
         qt.QWidget.__init__( self, None, "QWidget figure" )
+        FigureCanvasBase.__init__( self, figure )
         self.figure = figure
         self.setMouseTracking( True )
 
@@ -220,7 +220,7 @@ def _get_toolbar(self, canvas, parent):
             toolbar = None
         return toolbar
     
-    def set_canvas_size(self, width, height):
+    def resize(self, width, height):
         'set the canvas size in pixels'
         self.window.resize(width, height)
 
@@ -329,7 +329,7 @@ def draw_rubberband( self, event, x0, y0, x1, y1 ):
         self.canvas.drawRectangle( rect )
         
     def configure_subplots(self):
-        self.adj_window = qt.QMainWindow()
+        self.adj_window = qt.QMainWindow(None, None, qt.Qt.WDestructiveClose)
         win = self.adj_window
         win.setCaption("Subplot Configuration Tool")
         
@@ -339,6 +339,7 @@ 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
@@ -87,7 +87,7 @@ def paintEvent( self, e ):
         """
         
         FigureCanvasQT.paintEvent( self, e )
-        if DEBUG: print 'FigureCanvasQtAgg.paintEvent: ', \
+        if DEBUG: print 'FigureCanvasQtAgg.paintEvent: ', self, \
            self.get_width_height()
 
         p = qt.QPainter( self )
@@ -140,10 +140,10 @@ def draw( self ):
         Draw the figure when xwindows is ready for the update
         """
         
-        if DEBUG: print "FigureCanvasQtAgg.draw"
+        if DEBUG: print "FigureCanvasQtAgg.draw", self
         self.replot = True
         self.repaint( False )
-        
+                
     def blit(self, bbox=None):
         """
         Blit the region in bbox
