suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ObjectIdentifier: Resolve document name on both identifier and Label.

Browse Source
This commit is contained in:
Eivind Kvedalen 2016-01-01 18:06:01 +01:00
parent 9cc45e6ff2
commit 5f26cd9d7c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/App/ObjectIdentifier.cpp
View File

@ -625,21 +625,33 @@ void ObjectIdentifier::resolve() const
Document * ObjectIdentifier::getDocument(String name) const
{
App::Document * doc = 0;
const std::vector<App::Document*> docs = App::GetApplication().getDocuments();
if (name.getString().size() == 0)
name = getDocumentName();
App::Document * docById = App::GetApplication().getDocument(name);
App::Document * docByLabel = 0;
const std::vector<App::Document*> docs = App::GetApplication().getDocuments();
for (std::vector<App::Document*>::const_iterator i = docs.begin(); i != docs.end(); ++i) {
if ((*i)->Label.getValue() == name.getString()) {
if (doc != 0)
/* Multiple hits for same label? */
if (docByLabel != 0)
return 0;
doc = *i;
docByLabel = *i;
}
}
return doc;
/* Not found on id? */
if (docById == 0)
return docByLabel; // Either not found at all, or on label
else {
/* Not found on label? */
if (docByLabel == 0) /* Then return doc by id */
return docById;
/* docByLabel and docById could be equal; that is ok */
return docByLabel == docById ? docById : 0;
}
}
/**