suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ issue #0002417: console autocomplete runs python properties

Browse Source
This commit is contained in:
wmayer 2016-01-31 02:28:24 +01:00
parent 2cb06c6f65
commit 0f858f99b7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/CallTips.cpp
View File

@ -246,7 +246,14 @@ QMap<QString, CallTip> CallTipsList::extractTips(const QString& context) const
else if (PyObject_IsSubclass(type.ptr(), typeobj.o) == 1) { else if (PyObject_IsSubclass(type.ptr(), typeobj.o) == 1) {
obj = type; obj = type;
} }
else if (PyInstance_Check(obj.ptr())) {
// instances of old style classes
PyInstanceObject* inst = reinterpret_cast<PyInstanceObject*>(obj.ptr());
PyObject* classobj = reinterpret_cast<PyObject*>(inst->in_class);
obj = Py::Object(classobj);
}
// TODO: How to find new style classes
// If we have an instance of PyObjectBase then determine whether it's valid or not // If we have an instance of PyObjectBase then determine whether it's valid or not
if (PyObject_IsInstance(inst.ptr(), typeobj.o) == 1) { if (PyObject_IsInstance(inst.ptr(), typeobj.o) == 1) {
Base::PyObjectBase* baseobj = static_cast<Base::PyObjectBase*>(inst.ptr()); Base::PyObjectBase* baseobj = static_cast<Base::PyObjectBase*>(inst.ptr());
@ -257,7 +264,7 @@ QMap<QString, CallTip> CallTipsList::extractTips(const QString& context) const
PyErr_Clear(); PyErr_Clear();
} }
Py::List list(PyObject_Dir(obj.ptr()), true); Py::List list(obj.dir());
// If we derive from PropertyContainerPy we can search for the properties in the // If we derive from PropertyContainerPy we can search for the properties in the
// C++ twin class. // C++ twin class.