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

App: fix recursive App::getLinksTo()

Browse Source
This commit is contained in:
Zheng, Lei
2020-09-27 10:16:43 +08:00
committed by wwmayer
parent 25fbb95a9a
commit f9aed763e4
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Application.h
View File

@@ -398,7 +398,7 @@ public:
/** Return the links to a given object
*
* @param obj: the linked object. If NULL, then all links are returned.
* @param option: @sa App::GetLinkOptions
* @param option: @sa App::GetLinkOption
* @param maxCount: limit the number of links returned, 0 means no limit
*/
std::set<DocumentObject*> getLinksTo(

20
src/App/Document.cpp
View File

@@ -2943,7 +2943,7 @@ void Document::getLinksTo(std::set<DocumentObject*> &links,
const DocumentObject *obj, int options, int maxCount,
const std::vector<DocumentObject*> &objs) const
{
std::map<const App::DocumentObject*,App::DocumentObject*> linkMap;
std::map<const App::DocumentObject*, std::vector<App::DocumentObject*> > linkMap;
for(auto o : objs.size()?objs:d->objectArray) {
if(o == obj) continue;
@@ -2960,7 +2960,7 @@ void Document::getLinksTo(std::set<DocumentObject*> &links,
if(linked && linked!=o) {
if(options & GetLinkRecursive)
linkMap[linked] = o;
linkMap[linked].push_back(o);
else if(linked == obj || !obj) {
if((options & GetLinkExternal)
&& linked->getDocument()==o->getDocument())
@@ -2983,15 +2983,19 @@ void Document::getLinksTo(std::set<DocumentObject*> &links,
if(!GetApplication().checkLinkDepth(depth,true))
break;
std::vector<const DocumentObject*> next;
for(auto o : current) {
for(const App::DocumentObject *o : current) {
auto iter = linkMap.find(o);
if(iter!=linkMap.end() && links.insert(iter->second).second) {
if(maxCount && maxCount<=(int)links.size())
return;
next.push_back(iter->second);
if(iter==linkMap.end())
continue;
for (App::DocumentObject *link : iter->second) {
if (links.insert(link).second) {
if(maxCount && maxCount<=(int)links.size())
return;
next.push_back(link);
}
}
}
current.swap(next);
current = std::move(next);
}
return;
}

2
src/App/Document.h
View File

@@ -477,7 +477,7 @@ public:
*
* @param links: holds the links found
* @param obj: the linked object. If NULL, then all links are returned.
* @param option: @sa App::GetLinkOptions
* @param option: @sa App::GetLinkOption
* @param maxCount: limit the number of links returned, 0 means no limit
* @param objs: optional objects to search for, if empty, then all objects
* of this document are searched.