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

Merge pull request #4275 from realthunder/FixGetPartOf

Browse Source 
App: fix Part::getPartOfObject()
This commit is contained in:
Yorik van Havre
2021-01-14 12:53:20 +01:00
committed by GitHub
parent 94801b56dd 74de3aebee
commit 33ec7fb3e7
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/App/Part.cpp
View File

@@ -67,19 +67,38 @@ Part::~Part(void)
{
}
App::Part *Part::getPartOfObject (const DocumentObject* obj) {
static App::Part *_getPartOfObject(const DocumentObject *obj,
std::set<const DocumentObject*> *objset)
{
// as a Part is a geofeaturegroup it must directly link to all
// objects it contains, even if they are in additional groups etc.
auto list = obj->getInList();
for (auto obj : list) {
if(obj->isDerivedFrom(App::Part::getClassTypeId()))
return static_cast<App::Part*>(obj);
// But we still must call 'hasObject()' to exclude link brought in by
// expressions.
for (auto inObj : obj->getInList()) {
if (objset && !objset->insert(inObj).second)
continue;
auto group = inObj->getExtensionByType<GeoFeatureGroupExtension>(true);
if(group && group->hasObject(obj)) {
if(inObj->isDerivedFrom(App::Part::getClassTypeId()))
return static_cast<App::Part*>(inObj);
else if (objset)
return _getPartOfObject(inObj, objset);
// Only one parent geofeature group per object, so break
break;
}
}
return nullptr;
}
App::Part *Part::getPartOfObject (const DocumentObject* obj, bool recursive) {
if (!recursive)
return _getPartOfObject(obj, nullptr);
std::set<const DocumentObject *> objset;
objset.insert(obj);
return _getPartOfObject(obj, &objset);
}
PyObject *Part::getPyObject()
{

3
src/App/Part.h
View File

@@ -88,8 +88,9 @@ public:
* Returns the part which contains this object.
* In case this object does not belong to any Part, 0 is returned.
* @param obj the object to search for
* @param recursive: whether to recursively find any grand parent Part container
*/
static App::Part* getPartOfObject (const DocumentObject* obj);
static App::Part* getPartOfObject (const DocumentObject* obj, bool recursive=true);
virtual PyObject *getPyObject(void) override;
};