GIT_REPOSITORIES/LPP/PythonQt Commit - r22:29d38290403f

changed implementation to allow deriving python classes from PythonQt classes...

florianlink -

r22:29d38290403f

parent child

Context file:

r22:29d38290403f

Collapse all files

src/PythonQtClassWrapper.cpp +71 -17

              #include "PythonQtSlot.h"
              #include "PythonQtClassInfo.h"
              #include "PythonQtConversion.h"
+             #include "PythonQtInstanceWrapper.h"
              static PyObject* PythonQtClassWrapper_alloc(PyTypeObject *self, Py_ssize_t nitems)
              {
                return PythonQt::self()->helpCalled(type->classInfo());
              }
+             PyObject *PythonQtClassWrapper__init__(PythonQtClassWrapper *type, PyObject *args)
+             {
+               Py_ssize_t argc = PyTuple_Size(args);
+               if (argc>0) {
+                 // we need to call __init__ of the instance
+                 PyObject* self = PyTuple_GET_ITEM(args, 0);
+                 if (PyObject_TypeCheck(self, (PyTypeObject*)type->classInfo()->pythonQtClassWrapper())) {
+                   PyObject* newargs = PyTuple_New(argc-1);
+                   for (int i = 0;i<argc-1; i++) {
+                     PyTuple_SET_ITEM(newargs, i,PyTuple_GET_ITEM(args, i+1));
+                   }
+                   PythonQtInstanceWrapper* wrapper = (PythonQtInstanceWrapper*)self;
+                   int result = PythonQtInstanceWrapper_init(wrapper, newargs, NULL);
+                   Py_DECREF(newargs);
+                   if (result==0) {
+                     Py_INCREF(Py_None);
+                     return Py_None;
+                   } else {
+                     // init failed!
+                   }
+                 } else {
+                   // self not of correct type!
+                 }
+               } else {
+                 // wrong number of args
+               }
+               return NULL;
+             }
              static PyMethodDef PythonQtClassWrapper_methods[] = {
+                 {"__init__", (PyCFunction)PythonQtClassWrapper__init__, METH_VARARGS,
+                 "Return the classname of the object"
+                 },
                  {"className", (PyCFunction)PythonQtClassWrapper_classname, METH_NOARGS,
                   "Return the classname of the object"
                  },
              {
                const char *attributeName;
                PythonQtClassWrapper *wrapper = (PythonQtClassWrapper *)obj;
-               if ((attributeName = PyString_AsString(name)) == NULL) {
                  return NULL;
                }
+               if (obj == (PyObject*)&PythonQtInstanceWrapper_Type) {
+                 return NULL;
+               }
-               PythonQtMemberInfo member = wrapper->classInfo()->member(attributeName);
-               if (member._type == PythonQtMemberInfo::EnumValue) {
-                 return PyInt_FromLong(member._enumValue);
+               if (qstrcmp(attributeName, "__dict__")==0) {
+                 PyObject* dict = ((PyTypeObject *)wrapper)->tp_dict;
+                 if (!wrapper->classInfo()) {
+                   Py_INCREF(dict);
+                   return dict;
+                 }
+                 dict = PyDict_Copy(dict);
+                 QStringList l = wrapper->classInfo()->memberList(true);
+                 foreach (QString name, l) {
+                   PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
+                   PyDict_SetItemString(dict, name.toLatin1().data(), o);
+                   Py_DECREF(o);
+                 }
+                 if (wrapper->classInfo()->constructors()) {
+                   PyDict_SetItemString(dict, "__init__", PyCFunction_New(&PythonQtClassWrapper_methods[0], obj));
+                 }
+                 PyDict_SetItemString(dict, PythonQtClassWrapper_methods[1].ml_name, PyCFunction_New(&PythonQtClassWrapper_methods[1], obj));
+                 PyDict_SetItemString(dict, PythonQtClassWrapper_methods[2].ml_name, PyCFunction_New(&PythonQtClassWrapper_methods[2], obj));
+                 return dict;
                }
-               if (member._type == PythonQtMemberInfo::Slot && member._slot->isClassDecorator()) {
-                 return PythonQtSlotFunction_New(member._slot, obj, NULL);
+               if (wrapper->classInfo()) {
+                 PythonQtMemberInfo member = wrapper->classInfo()->member(attributeName);
+                 if (member._type == PythonQtMemberInfo::EnumValue) {
+                   return PyInt_FromLong(member._enumValue);
+                 } else
+                 if (member._type == PythonQtMemberInfo::Slot && member._slot->isClassDecorator()) {
+                   return PythonQtSlotFunction_New(member._slot, obj, NULL);
+                 }
                }
                // look for the interal methods (className(), help())
                }
                PyErr_Clear();
-               if (qstrcmp(attributeName, "__dict__")==0) {
-                 QStringList l = wrapper->classInfo()->memberList(true);
-                 PyObject* dict = PyDict_New();
-                 foreach (QString name, l) {
-                   //PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
-                   PyDict_SetItemString(dict, name.toLatin1().data(), Py_None);
-                   //Py_DECREF(o);
+                 }
-                 return dict;
+               // look in super
+               PyObject* superAttr = PyType_Type.tp_getattro(obj, name);
+               if (superAttr) {
+                 return superAttr;
                }
                QString error = QString(wrapper->classInfo()->className()) + " has no attribute named '" + QString(attributeName) + "'";
 ,                   /* tp_weaklistoffset */
 ,                   /* tp_iter */
 ,                   /* tp_iternext */
-,             /* tp_methods */
-,             /* tp_members */
+,                   /* tp_methods */
+,                   /* tp_members */
 ,                         /* tp_getset */
 ,                         /* tp_base */
 ,                         /* tp_dict */

src/PythonQtInstanceWrapper.cpp +28 -20

                return (PyObject *)self;
              }
-             static int PythonQtInstanceWrapper_init(PythonQtInstanceWrapper * self, PyObject * args, PyObject * kwds)
+             int PythonQtInstanceWrapper_init(PythonQtInstanceWrapper * self, PyObject * args, PyObject * kwds)
              {
                PyObject* result = NULL;
                }
                PyErr_Clear();
-               if (wrapper->_obj) {
-                 // look for a child
-                 QObjectList children = wrapper->_obj->children();
-                 for (int i = 0; i < children.count(); i++) {
-                   QObject *child = children.at(i);
-                   if (child->objectName() == attributeName) {
-                     return PythonQt::self()->priv()->wrapQObject(child);
+                   }
+                 }
+               }
                if (qstrcmp(attributeName, "__dict__")==0) {
                  QStringList l = wrapper->classInfo()->memberList(false);
                  PyObject* dict = PyDict_New();
                  foreach (QString name, l) {
-                   //PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
+                   PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
                    PyDict_SetItemString(dict, name.toLatin1().data(), Py_None);
-                   //Py_DECREF(o);
+                   Py_DECREF(o);
                  }
                  // Note: we do not put children into the dict, is would look confusing?!
                  return dict;
                }
+               // look in super
+               PyObject* superAttr = PyBaseObject_Type.tp_getattro(obj, name);
+               if (superAttr) {
+                 return superAttr;
+               }
+               if (wrapper->_obj) {
+                 // look for a child
+                 QObjectList children = wrapper->_obj->children();
+                 for (int i = 0; i < children.count(); i++) {
+                   QObject *child = children.at(i);
+                   if (child->objectName() == attributeName) {
+                     return PythonQt::self()->priv()->wrapQObject(child);
+                   }
+                 }
+               }
                QString error = QString(wrapper->classInfo()->className()) + " has no attribute named '" + QString(attributeName) + "'";
                PyErr_SetString(PyExc_AttributeError, error.toLatin1().data());
              static PyObject * PythonQtInstanceWrapper_str(PyObject * obj)
              {
                PythonQtInstanceWrapper* wrapper = (PythonQtInstanceWrapper*)obj;
+               const char* typeName = obj->ob_type->tp_name;
                QObject *qobj = wrapper->_obj;
                if (wrapper->_wrappedPtr) {
                  QString str = PythonQtConv::CPPObjectToString(wrapper->classInfo()->metaTypeId(), wrapper->_wrappedPtr);
                    return PyString_FromFormat("%s", str.toLatin1().constData());
                  } else
                  if (wrapper->_obj) {
-                   return PyString_FromFormat("%s (C++ Object %p wrapped by %s %p))", wrapper->classInfo()->className(), wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
+                   return PyString_FromFormat("%s (C++ Object %p wrapped by %s %p))", typeName, wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
                  } else {
-                   return PyString_FromFormat("%s (C++ Object %p)", wrapper->classInfo()->className(), wrapper->_wrappedPtr);
+                   return PyString_FromFormat("%s (C++ Object %p)", typeName, wrapper->_wrappedPtr);
                  }
                } else {
-                 return PyString_FromFormat("%s (QObject %p)", wrapper->classInfo()->className(), qobj);
+                 return PyString_FromFormat("%s (QObject %p)", typeName, qobj);
                }
              }
              static PyObject * PythonQtInstanceWrapper_repr(PyObject * obj)
              {
                PythonQtInstanceWrapper* wrapper = (PythonQtInstanceWrapper*)obj;
+               const char* typeName = obj->ob_type->tp_name;
-               QObject *qobj = wrapper->_obj;
                if (wrapper->_wrappedPtr) {
                  QString str = PythonQtConv::CPPObjectToString(wrapper->classInfo()->metaTypeId(), wrapper->_wrappedPtr);
                  if (!str.isEmpty()) {
-                   return PyString_FromFormat("%s(%s, %p)", QMetaType::typeName(wrapper->classInfo()->metaTypeId()), str.toLatin1().constData(), wrapper->_wrappedPtr);
+                   return PyString_FromFormat("%s(%s, %p)", typeName, str.toLatin1().constData(), wrapper->_wrappedPtr);
                  } else
                  if (wrapper->_obj) {
-                   return PyString_FromFormat("%s (C++ Object %p wrapped by %s %p))", wrapper->classInfo()->className(), wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
+                   return PyString_FromFormat("%s (C++ Object %p wrapped by %s %p))", typeName, wrapper->_wrappedPtr, wrapper->_obj->metaObject()->className(), qobj);
                  } else {
-                   return PyString_FromFormat("%s (C++ Object %p)", wrapper->classInfo()->className(), wrapper->_wrappedPtr);
+                   return PyString_FromFormat("%s (C++ Object %p)", typeName, wrapper->_wrappedPtr);
                  }
                } else {
                  return PyString_FromFormat("%s (QObject %p)", wrapper->classInfo()->className(), qobj);

src/PythonQtInstanceWrapper.h +1 0

              } PythonQtInstanceWrapper;
+             int PythonQtInstanceWrapper_init(PythonQtInstanceWrapper * self, PyObject * args, PyObject * kwds);
              #endif
  No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages