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

App: fix py return of propertyLinkSubList

Browse Source 
fixes #0002602

Now, it won't bunch up same object entries if they are not adjacent. I.e., same object  can appear twice and more, for example:
[(object1, ('Edge2', 'Edge3')), (object2, ('Edge1',)), (object1, ('Edge4', 'Edge5'))]

Complete bunching causes information loss, and it's impossible to fix the bug with keeping the bunching complete.
This commit is contained in:
DeepSOIC
2018-04-05 02:43:28 +03:00
committed by Yorik van Havre
parent 0f869c179b
commit 73fc672909
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/App/PropertyLinks.cpp
View File

@@ -894,24 +894,15 @@ std::vector<PropertyLinkSubList::SubSet> PropertyLinkSubList::getSubListValues()
if (_lValueList.size() != _lSubList.size())
throw Base::ValueError("PropertyLinkSubList::getSubListValues: size of subelements list != size of objects list");
std::map<App::DocumentObject*, std::vector<std::string> > tmp;
for (std::size_t i = 0; i < _lValueList.size(); i++) {
App::DocumentObject* link = _lValueList[i];
std::string sub = _lSubList[i];
if (tmp.find(link) == tmp.end()) {
// make sure to keep the same order as in '_lValueList'
PropertyLinkSubList::SubSet item;
item.first = link;
values.push_back(item);
if (values.size() == 0 || values.back().first != link){
//new object started, start a new subset.
values.push_back(SubSet(link, std::vector<std::string>()));
}
tmp[link].push_back(sub);
values.back().second.push_back(sub);
}
for (std::vector<PropertyLinkSubList::SubSet>::iterator it = values.begin(); it != values.end(); ++it) {
it->second = tmp[it->first];
}
return values;
}