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

use object's inlist to filter selection in property link dialog to avoid dependency loops

Browse Source
This commit is contained in:
wmayer
2018-02-07 23:31:14 +01:00
parent d9ae108319
commit 5022c8df5c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/DlgPropertyLink.cpp
View File

@@ -141,7 +141,6 @@ void DlgPropertyLink::findObjects(bool on, const QString& searchText)
// get the direct base class of App::DocumentObject which 'obj' is derived from
while (!objType.isBad()) {
std::string name = objType.getName();
Base::Type parType = objType.getParent();
if (parType == baseType) {
baseType = objType;
@@ -152,15 +151,19 @@ void DlgPropertyLink::findObjects(bool on, const QString& searchText)
}
}
std::vector<App::DocumentObject*> outList;
std::vector<App::DocumentObject*> ignoreList;
App::DocumentObject* par = doc->getObject((const char*)parName.toLatin1());
if (par) {
// for multi-selection we need all objects
if (isSingleSelection) {
App::Property* prop = par->getPropertyByName((const char*)proName.toLatin1());
outList = par->getOutListOfProperty(prop);
ignoreList = par->getOutListOfProperty(prop);
}
outList.push_back(par);
// add the inlist to the ignore list to avoid dependency loops
std::vector<App::DocumentObject*> inList = par->getInListRecursive();
ignoreList.insert(ignoreList.end(), inList.begin(), inList.end());
ignoreList.push_back(par);
}
// Add a "None" entry on top
@@ -180,7 +183,7 @@ void DlgPropertyLink::findObjects(bool on, const QString& searchText)
}
if (vp && nameOk) {
// filter out the objects
if (std::find(outList.begin(), outList.end(), *it) == outList.end()) {
if (std::find(ignoreList.begin(), ignoreList.end(), *it) == ignoreList.end()) {
QListWidgetItem* item = new QListWidgetItem(ui->listWidget);
item->setIcon(vp->getIcon());
item->setText(QString::fromUtf8((*it)->Label.getValue()));