fixed layer images bug

jdh2358 · jdh2358 · commit e1b8eca78b4a · 2004-07-14T16:20:31.000Z
svn path=/trunk/matplotlib/; revision=402
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2004-07-14 Fixed layer images demo which was broken by the 07/12 image
+           extent fixes - JDH
+
 2004-07-13 Modified line collections to handle arbitrary length
            segments for each line segment. - JDH
 
diff --git a/examples/embedding_in_wx2.py b/examples/embedding_in_wx2.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-An example of how to use wx or wxagg in an application w/o the toolbar
+An example of how to use wx or wxagg in an application w. or w/o the toolbar
 """
 
 from matplotlib.numerix import arange, sin, pi
@@ -14,6 +14,7 @@
 # comment out the following to use wx rather than wxagg
 matplotlib.use('WXAgg')
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+from matplotlib.backends.backend_wx import NavigationToolbarWx as NavigationToolbar
 
 from matplotlib.figure import Figure
 
@@ -27,7 +28,7 @@ def __init__(self):
 
         self.SetBackgroundColour(wxNamedColor("WHITE"))
 
-        self.figure = Figure(figsize=(5,4), dpi=100)
+        self.figure = Figure()
         self.axes = self.figure.add_subplot(111)
         t = arange(0.0,3.0,0.01)
         s = sin(2*pi*t)
@@ -38,9 +39,35 @@ def __init__(self):
 
         self.sizer = wxBoxSizer(wxVERTICAL)
         self.sizer.Add(self.canvas, 1, wxTOP | wxLEFT | wxEXPAND)
+
+        #self.add_toolbar()  # comment this out for no toolbar
+
+
         # Capture the paint message        
         EVT_PAINT(self, self.OnPaint)        
 
+    def add_toolbar(self):
+        self.toolbar = NavigationToolbar(self.canvas, True)
+        self.toolbar.Realize()
+        if wxPlatform == '__WXMAC__':
+            # Mac platform (OSX 10.3, MacPython) does not seem to cope with
+            # having a toolbar in a sizer. This work-around gets the buttons
+            # back, but at the expense of having the toolbar at the top
+            self.SetToolBar(self.toolbar)
+        else:
+            # On Windows platform, default window size is incorrect, so set
+            # toolbar width to figure width.
+            tw, th = self.toolbar.GetSizeTuple()
+            fw, fh = self.canvas.GetSizeTuple()
+            # By adding toolbar in sizer, we are able to put it at the bottom
+            # of the frame - so appearance is closer to GTK version.
+            # As noted above, doesn't work for Mac.
+            self.toolbar.SetSize(wxSize(fw, th))
+            self.sizer.Add(self.toolbar, 0, wxLEFT | wxEXPAND)
+        # update the axes menu on the toolbar
+        self.toolbar.update()  
+
+        
     def OnPaint(self, event):
         self.canvas.draw()
         
diff --git a/examples/layer_images.py b/examples/layer_images.py
@@ -16,12 +16,22 @@ def func3(x,y):
 y = arange(-3.0, 3.0, dy)
 X,Y = meshgrid(x, y)
 
+# when layering multiple images, the images need to have the same
+# extent.  This does not mean they need to have the same shape, but
+# they both need to render to the same coordinate system determined by
+# xmin, xmax, ymin, ymax
+
+xmin, xmax, ymin, ymax = min(x), max(x), min(y), max(y)
+extent = xmin, xmax, ymin, ymax
 Z1 = array(([0,1]*4 + [1,0]*4)*4); Z1.shape = 8,8  # chessboard
-im1 = imshow(Z1, cmap=cm.gray, interpolation='nearest')
+im1 = imshow(Z1, cmap=cm.gray, interpolation='nearest',
+             extent=extent)
 hold(True)
 
 Z2 = func3(X, Y)
-im2 = imshow(Z2, cmap=cm.jet, alpha=.9, interpolation='bilinear')
+im2 = imshow(Z2, cmap=cm.jet, alpha=.9, interpolation='bilinear',
+             extent=extent)
+axis([xmin, xmax, ymin, ymax])
 
 
 #savefig('layer_images')
