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

Gui: PR6497 move return statement to new line

Browse Source
This commit is contained in:
Chris Hennes
2022-03-29 12:33:50 -05:00
parent f7edc74eee
commit 5df3dbae6f
57 changed files with 352 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -204,7 +204,8 @@ void SoFCUnifiedSelection::write(SoWriteAction * action)
SoOutput * out = action->getOutput();
if (out->getStage() == SoOutput::WRITE) {
// Do not write out the fields of this class
if (this->writeHeader(out, true, false)) return;
if (this->writeHeader(out, true, false))
return;
SoGroup::doAction((SoAction *)action);
this->writeFooter(out);
}
@@ -216,10 +217,14 @@ void SoFCUnifiedSelection::write(SoWriteAction * action)
int SoFCUnifiedSelection::getPriority(const SoPickedPoint* p)
{
const SoDetail* detail = p->getDetail();
if (!detail) return 0;
if (detail->isOfType(SoFaceDetail::getClassTypeId())) return 1;
if (detail->isOfType(SoLineDetail::getClassTypeId())) return 2;
if (detail->isOfType(SoPointDetail::getClassTypeId())) return 3;
if (!detail)
return 0;
if (detail->isOfType(SoFaceDetail::getClassTypeId()))
return 1;
if (detail->isOfType(SoLineDetail::getClassTypeId()))
return 2;
if (detail->isOfType(SoPointDetail::getClassTypeId()))
return 3;
return 0;
}
@@ -263,7 +268,8 @@ SoFCUnifiedSelection::getPickedList(SoHandleEventAction* action, bool singlePick
ret.push_back(info);
}
if(ret.size()<=1) return ret;
if(ret.size()<=1)
return ret;
// To identify the picking of lines in a concave area we have to
// get all intersection points. If we have two or more intersection
@@ -534,7 +540,8 @@ bool SoFCUnifiedSelection::setHighlight(SoFullPath *path, const SoDetail *det,
}
bool SoFCUnifiedSelection::setSelection(const std::vector<PickedInfo> &infos, bool ctrlDown) {
if(infos.empty() || !infos[0].vpd) return false;
if(infos.empty() || !infos[0].vpd)
return false;
std::vector<SelectionSingleton::SelObj> sels;
if(infos.size()>1) {
@@ -559,9 +566,11 @@ bool SoFCUnifiedSelection::setSelection(const std::vector<PickedInfo> &infos, bo
const auto &info = infos[0];
auto vpd = info.vpd;
if(!vpd) return false;
if(!vpd)
return false;
const char *objname = vpd->getObject()->getNameInDocument();
if(!objname) return false;
if(!objname)
return false;
const char *docname = vpd->getObject()->getDocument()->getName();
bool hasNext = false;