GIT_REPOSITORIES/LPP/PythonQt Commit - r34:5daedfb035c8

improved so that dict contains properties and that dir() shows all available things, including the derived base attributes...

florianlink -

r34:5daedfb035c8

parent child

Context file:

r34:5daedfb035c8

src/PythonQtClassInfo.cpp +14 -5

               }
             }
-            QStringList PythonQtClassInfo::memberList(bool metaOnly)
+            QStringList PythonQtClassInfo::propertyList()
             {
-              decorator();
               QStringList l;
-              QString h;
+              if (_isQObject && _meta) {
-              if (_isQObject && _meta && !metaOnly) {
                 int i;
                 int numProperties = _meta->propertyCount();
                 for (i = 0; i < numProperties; i++) {
                   l << QString(p.name());
                 }
               }
+              return l;
+            }
+            QStringList PythonQtClassInfo::memberList(bool metaOnly)
+            {
+              decorator();
+              QStringList l;
+              QString h;
+              if (_isQObject && _meta && !metaOnly) {
+                l = propertyList();
+              }
               // normal slots of QObject (or wrapper QObject)
               if (!metaOnly && _meta) {

src/PythonQtClassInfo.h +3 0

               //! get help string for the metaobject
               QString help();
+              //! get list of all properties (on QObjects only, otherwise the list is empty)
+              QStringList propertyList();
               //! get list of all members
               QStringList memberList(bool metaOnly = false);

src/PythonQtInstanceWrapper.cpp +10 -6

               }
               if (qstrcmp(attributeName, "__dict__")==0) {
-                QStringList l = wrapper->classInfo()->memberList(false);
+                PyObject* dict = PyBaseObject_Type.tp_getattro(obj, name);
-                PyObject* dict = PyDict_New();
+                dict = PyDict_Copy(dict);
+                // only the properties are missing, the rest is already available from
+                // PythonQtClassWrapper...
+                QStringList l = wrapper->classInfo()->propertyList();
                 foreach (QString name, l) {
                   PyObject* o = PyObject_GetAttrString(obj, name.toLatin1().data());
+                  if (o) {
                     PyDict_SetItemString(dict, name.toLatin1().data(), o);
                     Py_DECREF(o);
+                  } else {
+                    std::cerr << "PythonQtInstanceWrapper: something is wrong, could not get attribute " << name.toLatin1().data();
+                  }
                 }
-                // TODO xxx:
-                // this does include python member methods, but not attributes, from where can we get
-                // the correct dict with the attributes of the derive
                 // Note: we do not put children into the dict, is would look confusing?!
                 return dict;
               }

General Comments 0

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

No TODOs yet

	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