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

GeoFeatureGroup: Make link collection non-DAG save

Browse Source
This commit is contained in:
Stefan Tröger
2017-06-03 15:18:40 +02:00
committed by wmayer
parent bfb95e3d12
commit 4ecd831bfd
8 changed files with 60 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/App/GroupExtension.cpp
View File

@@ -104,29 +104,6 @@ std::vector< DocumentObject* > GroupExtension::addObjects(std::vector< DocumentO
return added;
}
void GroupExtension::addObjects(const std::vector<App::DocumentObject*>& objs)
{
bool objectAdded = false;
std::vector<DocumentObject*> grp = Group.getValues();
for (auto obj : objs) {
if (allowObject(obj)) {
//only one group per object
auto *group = App::GroupExtension::getGroupOfObject(obj);
if (group && group != getExtendedObject())
group->getExtensionByType<App::GroupExtension>()->removeObject(obj);
if (std::find(grp.begin(), grp.end(), obj) == grp.end()) {
grp.push_back(obj);
objectAdded = true;
}
}
}
if (objectAdded)
Group.setValues(grp);
}
std::vector<DocumentObject*> GroupExtension::removeObject(DocumentObject* obj)
{
std::vector<DocumentObject*> vec = {obj};