gtkagg fixes

jdh2358 · jdh2358 · commit 339ee5ff6f01 · 2004-05-26T22:19:27.000Z
svn path=/trunk/matplotlib/; revision=318
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 New entries should be added at the top
 
+
 2004-05-26 Added Gary's errorbar stuff and made some fixes for length
            one plots and constant data plots - JDH
 
diff --git a/MANIFEST b/MANIFEST
@@ -174,6 +174,7 @@ examples/README
 examples/__init__.py
 examples/alignment_test.py
 examples/anim.py
+examples/anim_tk.py
 examples/arctest.py
 examples/axes_demo.py
 examples/axes_props.py
@@ -398,6 +399,7 @@ matplotlib/backends/tkagg.py
 src/_backend_agg.cpp
 src/_backend_agg.h
 src/_gtkagg.cpp
+src/_gtkaggold.cpp
 src/_gtkgd.c
 src/_image.cpp
 src/_image.h
diff --git a/TODO b/TODO
@@ -394,6 +394,10 @@
 
 -- DONE y tick outside frame?
 
--- incorporate gary's errorbar
+-- DONE incorporate gary's errorbar
 
---  bug in -45 newline text
+--  bug in -45 newline text
+
+-- write to stream in Agg
+
+-- gtkagg bug in win98
diff --git a/setupext.py b/setupext.py
@@ -255,8 +255,12 @@ def build_ft2font(ext_modules, packages):
 def build_gtkagg(ext_modules, packages):
     global BUILT_GTKAGG
     if BUILT_GTKAGG: return # only build it if you you haven't already
+    deps = ['src/_gtkagg.cpp']
+    deps.extend(glob.glob('CXX/*.cxx'))
+    deps.extend(glob.glob('CXX/*.c'))
+
     module = Extension('matplotlib.backends._gtkagg',
-                       ['src/_gtkagg.cpp'],
+                       deps,
                        )
 
 
diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -1,87 +1,74 @@
-/* Helper functions for converting an agg image buffer to a gtk drawable
-   efficiently
-*/
-#include <Python.h>
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
 #include <cstring>
 #include <cerrno>
 #include <cstdio>
+#include <iostream>
+#include <cmath>
+#include <utility>
 
-#include "_backend_agg.h"
+#include <pygobject.h>
+#include <pygtk/pygtk.h>
 
-static PyObject *ErrorObject;
-static PyTypeObject *PyGObject_Type=NULL;    
+#include "_backend_agg.h"
 
+// the extension module
+class _gtkagg_module : public Py::ExtensionModule<_gtkagg_module>
+{
+public:
+  _gtkagg_module()
+    : Py::ExtensionModule<_gtkagg_module>( "_gtkagg" )
+  {
+    add_varargs_method("agg_to_gtk_drawable", 
+		       &_gtkagg_module::agg_to_gtk_drawable, 
+		       "Draw to a gtk drawable from a agg buffer.");
+    initialize( "The _gtkagg module" );
+  }
+  
+  virtual ~_gtkagg_module() {}
+  
+private:
+  
+  Py::Object agg_to_gtk_drawable(const Py::Tuple &args) {
 
-static PyObject *
-_agg_to_gtk_drawable(PyObject *self, PyObject *args) {
+    args.verify_length(2);  
 
-  PyGObject *py_drawable = NULL;                         
-  GdkDrawable *drawable = NULL;   
-  GdkGC* gc = NULL;
   
-  PyObject* aggo;
-
+    PyGObject *py_drawable = (PyGObject *)(args[0].ptr());
+    RendererAgg* aggRenderer = static_cast<RendererAgg*>(args[1].ptr());
 
-  if (!PyArg_ParseTuple(args, "O!O", PyGObject_Type, 
-			&py_drawable, &aggo))
-      return NULL;
+    
+    GdkDrawable *drawable = GDK_DRAWABLE(py_drawable->obj);
+    GdkGC* gc = gdk_gc_new(drawable);
 
+    unsigned int width = aggRenderer->get_width();
+    unsigned int height = aggRenderer->get_height();
 
-  RendererAgg* aggRenderer = (RendererAgg*)aggo;
+    gdk_draw_rgb_32_image(drawable, gc, 0, 0, 
+			  width, 
+			  height, 
+			  GDK_RGB_DITHER_NORMAL,
+			  aggRenderer->pixBuffer,
+			  width*4);
 
-  drawable = GDK_DRAWABLE(py_drawable->obj);
-  gc = gdk_gc_new(drawable);
+    return Py::Object();
 
-  unsigned int width = aggRenderer->get_width();
-  unsigned int height = aggRenderer->get_height();
+  }
+};
 
-  gdk_draw_rgb_32_image(drawable, gc, 0, 0, 
-			width, 
-			height, 
-			GDK_RGB_DITHER_NORMAL,
-			aggRenderer->pixBuffer,
-			width*4);
-
-  Py_INCREF(Py_None);
-  return Py_None;
-}
-  
 
+extern "C"
+DL_EXPORT(void)
+  init_gtkagg(void)
+{
+  init_pygobject();
+  init_pygtk();
+  //suppress unused warning by creating in two lines
+  static _gtkagg_module* _gtkagg = NULL; 
+  _gtkagg = new _gtkagg_module;
 
+};
 
 
-static struct PyMethodDef _gtkagg_methods[] = {
-  {"agg_to_gtk_drawable", (PyCFunction)_agg_to_gtk_drawable, METH_VARARGS, 
-   "Draw to a gtk drawable from a agg buffer."},
-  {NULL,		NULL}		/* sentinel */
-};
 
 
-extern "C"
-DL_EXPORT(void) init_gtkagg(void)
-{
-  PyObject *module, *d;
-  
 
 
-  init_pygobject();
-  init_pygtk();
-  /* Create the module and add the functions */
-  Py_InitModule("_gtkagg", _gtkagg_methods);  
-  module = PyImport_ImportModule("gobject");
-  if (module) {
-    PyGObject_Type =
-      (PyTypeObject*)PyObject_GetAttrString(module, "GObject");
-    Py_DECREF(module);
-  }
-  /* Add some symbolic constants to the module */
-  d = PyModule_GetDict(module);
-  ErrorObject = PyString_FromString("_gtkagg.error");
-  PyDict_SetItemString(d, "error", ErrorObject);
-  
-  /* Check for errors */
-  if (PyErr_Occurred())
-    Py_FatalError("can't initialize module _gtkagg");
-}
