GIT_REPOSITORIES/LPP/PythonQt Commit - r85:90c5da76b56c

added support for dynamic properties...

florianlink -

r85:90c5da76b56c

parent child

Context file:

r85:90c5da76b56c

Collapse all files

src/PythonQtClassInfo.cpp +2 0

              bool PythonQtClassInfo::lookForPropertyAndCache(const char* memberName)
              {
+               if (!_meta) return false;
-               bool found = false;
                bool nameMapped = false;
                const char* attributeName = memberName;

src/PythonQtInstanceWrapper.cpp +37 -2

                        std::cerr << "PythonQtInstanceWrapper: something is wrong, could not get attribute " << name.toLatin1().data();
                      }
                    }
+                   QList<QByteArray>	dynamicProps = wrapper->_obj->dynamicPropertyNames();
+                   foreach (QByteArray name, dynamicProps) {
+                     PyObject* o = PyObject_GetAttrString(obj, name.data());
+                     if (o) {
+                       PyDict_SetItemString(dict, name.data(), o);
+                       Py_DECREF(o);
+                     } else {
+                       std::cerr << "PythonQtInstanceWrapper: dynamic property could not be read " << name.data();
+                     }
+                   }
                  }
                  // Note: we do not put children into the dict, is would look confusing?!
                  return dict;
                //  mlabDebugConst("Python","get " << attributeName);
-               // TODO: dynamic properties are missing
                PythonQtMemberInfo member = wrapper->classInfo()->member(attributeName);
                switch (member._type) {
                case PythonQtMemberInfo::Property:
                    return enumWrapper;
                  }
                  break;
+               case PythonQtMemberInfo::NotFound:
+                 // handle dynamic properties
+                 if (wrapper->_obj) {
+                   QVariant v = wrapper->_obj->property(attributeName);
+                   if (v.isValid()) {
+                     return PythonQtConv::QVariantToPyObject(v);
+                   }
+                 }
+                 break;
                default:
                  // is an invalid type, go on
                  break;
                } else if (member._type == PythonQtMemberInfo::EnumWrapper) {
                  error = QString("Enum '") + attributeName + "' can not be overwritten on " + obj->ob_type->tp_name + " object";
                } else if (member._type == PythonQtMemberInfo::NotFound) {
+                 // handle dynamic properties
+                 if (wrapper->_obj) {
+                   QVariant prop = wrapper->_obj->property(attributeName);
+                   if (prop.isValid()) {
+                     QVariant v = PythonQtConv::PyObjToQVariant(value);
+                     if (v.isValid()) {
+                       wrapper->_obj->setProperty(attributeName, v);
+                       return 0;
+                     } else {
+                       error = QString("Dynamic property '") + attributeName + "' does not accept an object of type "
+                       + QString(value->ob_type->tp_name) + " (" + PythonQtConv::PyObjGetRepresentation(value) + ")";
+                       PyErr_SetString(PyExc_AttributeError, error.toLatin1().data());
+                       return -1;
+                     }
+                   }
+                 }
-                 // if we are a derived python class, we allow setting attributes.
                  // if we are a direct CPP wrapper, we do NOT allow it, since
                  // it would be confusing to allow it because a wrapper will go away when it is not seen by python anymore

src/PythonQtStdDecorators.cpp +10 0

                return &o->children();
              }
+             bool PythonQtStdDecorators::setProperty(QObject* o, const char* name, const QVariant& value)
+             {
+               return o->setProperty(name, value);
+             }
+             QVariant PythonQtStdDecorators::property(QObject* o, const char* name)
+             {
+               return o->property(name);
+             }
              QString PythonQtStdDecorators::tr(QObject* obj, const QByteArray& text, const QByteArray& ambig, int n)
              {
                return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), QCoreApplication::CodecForTr, n);

src/PythonQtStdDecorators.h +3 0

                QList<QObject*> findChildren(QObject* parent, PyObject* type, const QString& name= QString());
                QList<QObject*> findChildren(QObject* parent, PyObject* type, const QRegExp& regExp);
+               bool setProperty(QObject* o, const char* name, const QVariant& value);
+               QVariant property(QObject* o, const char* name);
                double static_Qt_qAbs(double a) { return qAbs(a); }
                double static_Qt_qBound(double a,double b,double c) { return qBound(a,b,c); }
                void static_Qt_qDebug(const QByteArray& msg) { qDebug(msg.constData()); }

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