simple plot works

mattip · mattip · commit b4e2b8aacb62 · 2017-11-05T21:24:18.000+02:00
diff --git a/lib/matplotlib/backends/_tkagg.py b/lib/matplotlib/backends/_tkagg.py
@@ -0,0 +1,61 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+from _tkinter.tklib_cffi import ffi as tkffi, lib as tklib
+from _tkinter.tclobj import FromTclStringNDArray
+import numpy as np
+
+app = None
+
+def PyAggImagePhoto(photoimage, data, mode):
+    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)  
+        return tklib.TCL_ERROR
+    img = FromTclStringNDArray(data)
+    has_bbox = False
+    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: 
+        block.offset[0] = 0
+        block.offset[1] = 1
+        block.offset[2] = 2
+        if mode == 1:
+            block.offset[3] = 0
+            block.pixelSize = 3
+            nval = 3
+        else:
+            block.offset[3] = 3
+            block.pixelSize = 4
+    if has_bbox:
+        block.width = destwidth
+        block.height = destheight
+        block.pitch = deststride
+        block.pixelPtr = 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)
+
+        #/* 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 
+
+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
@@ -7,29 +7,51 @@
 import numpy as np
 
 from matplotlib.backends import _tkagg
+from platform import python_implementation
 
-def blit(photoimage, aggimage, bbox=None, colormode=1):
-    tk = photoimage.tk
-
-    if bbox is not None:
-        bbox_array = bbox.__array__()
-    else:
-        bbox_array = None
-    data = np.asarray(aggimage)
-    try:
-        tk.call(
-            "PyAggImagePhoto", photoimage,
-            id(data), colormode, id(bbox_array))
-    except Tk.TclError:
+if python_implementation() == 'PyPy':
+    def blit(photoimage, aggimage, bbox=None, colormode=1):
+        tk = photoimage.tk
+
+        if bbox is not None:
+            bbox_array = bbox.__array__()
+        else:
+            bbox_array = None
+        data = np.asarray(aggimage)
+        try:
+            tk.call(
+                "PyAggImagePhoto", photoimage,
+                data, colormode, bbox_array)
+        except Tk.TclError:
+                _tkagg.tkinit(tk)
+                tk.call("PyAggImagePhoto", photoimage,
+                        data, colormode, bbox_array)
+
+else:
+    def blit(photoimage, aggimage, bbox=None, colormode=1):
+        tk = photoimage.tk
+
+        if bbox is not None:
+            bbox_array = bbox.__array__()
+        else:
+            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:
-                _tkagg.tkinit(tk.interpaddr(), 1)
-            except AttributeError:
-                _tkagg.tkinit(id(tk), 0)
-            tk.call("PyAggImagePhoto", photoimage,
-                    id(data), colormode, id(bbox_array))
-        except (ImportError, AttributeError, Tk.TclError):
-            raise
+                import pdb;pdb.set_trace()
+                try:
+                    _tkagg.tkinit(tk.interpaddr(), 1)
+                except AttributeError:
+                    _tkagg.tkinit(id(tk), 0)
+                tk.call("PyAggImagePhoto", photoimage,
+                        id(data), colormode, id(bbox_array))
+            except (ImportError, AttributeError, Tk.TclError):
+                raise
 
 def test(aggimage):
     import time
