Merge branch 'v1.5.x' into v2.0.x

Author: mdboom

doc/pyplots/pyplot_scales.py

@@ -34,7 +34,7 @@
 plt.grid(True)
 
 # logit
-plt.subplot(223)
+plt.subplot(224)
 plt.plot(x, y)
 plt.yscale('logit')
 plt.title('logit')

lib/matplotlib/backends/backend_wx.py

@@ -1369,6 +1369,7 @@ def notify_axes_change(fig):
 
     def show(self):
         self.frame.Show()
+        self.canvas.draw()
 
     def destroy(self, *args):
         DEBUG_MSG("destroy()", 1, self)
@@ -1573,6 +1574,12 @@ def __init__(self, canvas):
         self.canvas = canvas
         self._idle = True
         self.statbar = None
+        self.prevZoomRect = None
+        # for now, use alternate zoom-rectangle drawing on all
+        # Macs. N.B. In future versions of wx it may be possible to
+        # detect Retina displays with window.GetContentScaleFactor()
+        # and/or dc.GetContentScaleFactor()
+        self.retinaFix = 'wxMac' in wx.PlatformInfo
 
     def get_canvas(self, frame, fig):
         return FigureCanvasWx(frame, -1, fig)
@@ -1674,16 +1681,44 @@ def dynamic_update(self):
 
     def press(self, event):
         if self._active == 'ZOOM':
-            self.wxoverlay = wx.Overlay()
+            if not self.retinaFix:
+                self.wxoverlay = wx.Overlay()
+            else:
+                self.savedRetinaImage = self.canvas.copy_from_bbox(
+                    self.canvas.figure.gca().bbox)
+                self.zoomStartX = event.xdata
+                self.zoomStartY = event.ydata
 
     def release(self, event):
         if self._active == 'ZOOM':
             # When the mouse is released we reset the overlay and it
             # restores the former content to the window.
-            self.wxoverlay.Reset()
-            del self.wxoverlay
+            if not self.retinaFix:
+                self.wxoverlay.Reset()
+                del self.wxoverlay
+            else:
+                del self.savedRetinaImage
+                if self.prevZoomRect:
+                    self.prevZoomRect.pop(0).remove()
+                    self.prevZoomRect = None
 
     def draw_rubberband(self, event, x0, y0, x1, y1):
+        if self.retinaFix:  # On Macs, use the following code
+            # wx.DCOverlay does not work properly on Retina displays.
+            rubberBandColor = '#C0C0FF'
+            if self.prevZoomRect:
+                self.prevZoomRect.pop(0).remove()
+            self.canvas.restore_region(self.savedRetinaImage)
+            X0, X1 = self.zoomStartX, event.xdata
+            Y0, Y1 = self.zoomStartY, event.ydata
+            lineX = (X0, X0, X1, X1, X0)
+            lineY = (Y0, Y1, Y1, Y0, Y0)
+            self.prevZoomRect = self.canvas.figure.gca().plot(
+                lineX, lineY, '-', color=rubberBandColor)
+            self.canvas.figure.gca().draw_artist(self.prevZoomRect[0])
+            self.canvas.blit(self.canvas.figure.gca().bbox)
+            return
+
         # Use an Overlay to draw a rubberband-like bounding box.
 
         dc = wx.ClientDC(self.canvas)