flesh out bbox handling, fix mpl_PyFile_Dup for PyPy which is like python3

mattip · mattip · commit 68492fbd6926 · 2017-11-05T21:24:18.000+02:00
diff --git a/lib/matplotlib/backends/_tkagg.py b/lib/matplotlib/backends/_tkagg.py
@@ -6,23 +6,40 @@
 
 app = None
 
-def PyAggImagePhoto(photoimage, data, mode):
+def PyAggImagePhoto(photoimage, data_as_str, mode, bbox_as_str=None):
     interp = PyAggImagePhoto.interp
     if not tklib.Tk_MainWindow(interp):
         raise _tkinter.TclError("this isn't a Tk application")
     photo = tklib.Tk_FindPhoto(interp, photoimage)
     if not photo:
-        tklib.Tcl_AppendResult(interp, "destination photo must exist", 0)  
+        tklib.Tcl_AppendResult(interp, "destination photo must exist", 0)
         return tklib.TCL_ERROR
-    img = FromTclStringNDArray(data)
-    has_bbox = False
+    data = FromTclStringNDArray(data_as_str)
+    if bbox_as_str:
+        try:
+            bbox = FromTclStringNDArray(bbox_as_str)
+        except:
+            tklib.Tcl_AppendResult(interp, "bbox not valid", 0)
+            return tklib.TCL_ERROR
+        destx = int(bbox[0, 0])
+        desty = data.shape[0] - int(bbox[1, 1])
+        destwidth = int(bbox[1, 0] - bbox[0, 0])
+        destheight = int(bbox[1, 1] - bbox[0, 1])
+        deststride = 4 * destwidth;
+        destbuffer = np.empty([destheight, destwidth, 4], dtype='uint8')
+        has_bbox = True
+        destbuffer[:,:,:] = data[desty:desty+destheight, destx:destx+destwidth,:]
+    else:
+        has_bbox = False
+        destbuffer = None
+        destx = desty = destwidth = destheight = deststride = 0;
     pBlock = tkffi.new('Tk_PhotoImageBlock[1]')
     block = pBlock[0]
     block.pixelSize = 1
     if mode == 0:
         block.offset[0] = block.offset[1] = block.offset[2] = 0
         nval = 1
-    else: 
+    else:
         block.offset[0] = 0
         block.offset[1] = 1
         block.offset[2] = 2
@@ -37,25 +54,25 @@ def PyAggImagePhoto(photoimage, data, mode):
         block.width = destwidth
         block.height = destheight
         block.pitch = deststride
-        block.pixelPtr = destbuffer
+        block.pixelPtr = tkffi.from_buffer(destbuffer)
 
         tklib.Tk_PhotoPutBlock_NoComposite(photo, pBlock, destx, desty,
                 destwidth, destheight);
 
     else:
-        block.width = shape[1]
-        block.height = shape[0]
-        block.pitch = img.strides[0]
-        block.pixelPtr = tkffi.from_buffer(img)
+        block.width = data.shape[1]
+        block.height = data.shape[0]
+        block.pitch = data.strides[0]
+        block.pixelPtr = tkffi.from_buffer(data)
 
         #/* Clear current contents */
         tklib.Tk_PhotoBlank(photo);
         #/* Copy opaque block to photo image, and leave the rest to TK */
         tklib.Tk_PhotoPutBlock_NoComposite(photo, pBlock, 0, 0,
                  block.width, block.height);
-    return tklib.TCL_OK 
+    return tklib.TCL_OK
 
 def tkinit(tk):
     tk.createcommand(b"PyAggImagePhoto", PyAggImagePhoto)
     PyAggImagePhoto.interp = tk.interp
-    
+
diff --git a/lib/matplotlib/backends/tkagg.py b/lib/matplotlib/backends/tkagg.py
@@ -37,13 +37,11 @@ def blit(photoimage, aggimage, bbox=None, colormode=1):
             bbox_array = None
         data = np.asarray(aggimage)
         try:
-            import pdb;pdb.set_trace()
             tk.call(
                 "PyAggImagePhoto", photoimage,
                 id(data), colormode, id(bbox_array))
         except Tk.TclError:
             try:
-                import pdb;pdb.set_trace()
                 try:
                     _tkagg.tkinit(tk.interpaddr(), 1)
                 except AttributeError:
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -48,7 +48,7 @@ extern "C" {
 /*
  * PyFile_* compatibility
  */
-#if PY3K
+#if defined(PY3K) | defined(PYPY_VERSION)
 
 /*
  * Get a FILE* handle to the file represented by the Python object
