kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

0001059: Cannot add object to DocumentObjectGroupPython

Browse Source
This commit is contained in:
wmayer
2013-03-23 16:45:37 +01:00
parent abc9e33e0a
commit b7658c04f6
4 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/App/DocumentObjectGroupPyImp.cpp
View File

@@ -25,6 +25,7 @@
#include "DocumentObjectGroup.h"
#include "Document.h"
#include <CXX/Objects.hxx>
// inclusion of the generated files (generated out of DocumentObjectGroupPy.xml)
#include "DocumentObjectGroupPy.h"
@@ -81,7 +82,24 @@ PyObject* DocumentObjectGroupPy::addObject(PyObject *args)
}
}
getDocumentObjectGroupPtr()->addObject(docObj->getDocumentObjectPtr());
DocumentObjectGroup* grp = getDocumentObjectGroupPtr();
if (grp->getTypeId().isDerivedFrom(App::DocumentObjectGroupPython::getClassTypeId())) {
DocumentObjectGroupPython* grppy = static_cast<DocumentObjectGroupPython*>(grp);
App::Property* proxy = grppy->getPropertyByName("Proxy");
if (proxy && proxy->getTypeId() == App::PropertyPythonObject::getClassTypeId()) {
Py::Object vp = static_cast<App::PropertyPythonObject*>(proxy)->getValue();
if (vp.hasAttr(std::string("addObject"))) {
Py::Callable method(vp.getAttr(std::string("addObject")));
Py::Tuple args(1);
args[0] = Py::Object(object);
method.apply(args);
Py_Return;
}
}
}
grp->addObject(docObj->getDocumentObjectPtr());
Py_Return;
}
@@ -101,7 +119,24 @@ PyObject* DocumentObjectGroupPy::removeObject(PyObject *args)
return NULL;
}
getDocumentObjectGroupPtr()->removeObject(docObj->getDocumentObjectPtr());
DocumentObjectGroup* grp = getDocumentObjectGroupPtr();
if (grp->getTypeId().isDerivedFrom(App::DocumentObjectGroupPython::getClassTypeId())) {
DocumentObjectGroupPython* grppy = static_cast<DocumentObjectGroupPython*>(grp);
App::Property* proxy = grppy->getPropertyByName("Proxy");
if (proxy && proxy->getTypeId() == App::PropertyPythonObject::getClassTypeId()) {
Py::Object vp = static_cast<App::PropertyPythonObject*>(proxy)->getValue();
if (vp.hasAttr(std::string("removeObject"))) {
Py::Callable method(vp.getAttr(std::string("removeObject")));
Py::Tuple args(1);
args[0] = Py::Object(object);
method.apply(args);
Py_Return;
}
}
}
grp->removeObject(docObj->getDocumentObjectPtr());
Py_Return;
}