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

fix overloaded methods SelectionSingleton::addSelection

Browse Source
This commit is contained in:
wmayer
2018-09-18 12:41:02 +02:00
parent 0286a4e313
commit b05f234fac
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Gui/Selection.cpp
View File

@@ -739,12 +739,21 @@ bool SelectionSingleton::addSelection(const char* pDocName, const char* pObjectN
temp.DocName = pDocName;
temp.FeatName = pObjectName ? pObjectName : "";
for (std::vector<std::string>::const_iterator it = pSubNames.begin(); it != pSubNames.end(); ++it) {
temp.SubName = it->c_str();
if (!pSubNames.empty()) {
for (std::vector<std::string>::const_iterator it = pSubNames.begin(); it != pSubNames.end(); ++it) {
temp.SubName = it->c_str();
temp.x = 0;
temp.y = 0;
temp.z = 0;
_SelList.push_back(temp);
}
}
else {
temp.SubName = "";
temp.x = 0;
temp.y = 0;
temp.z = 0;
_SelList.push_back(temp);
}
@@ -789,8 +798,16 @@ bool SelectionSingleton::addSelection(const SelectionObject& obj)
}
return ok;
}
else if (!subNames.empty()) {
bool ok = true;
for (std::size_t i=0; i<subNames.size(); i++) {
const std::string& name = subNames[i];
ok &= addSelection(obj.getDocName(), obj.getFeatName(), name.c_str());
}
return ok;
}
else {
return addSelection(obj.getDocName(), obj.getFeatName(), subNames);
return addSelection(obj.getDocName(), obj.getFeatName());
}
}