From b1495bdf386e23e5ed7de85e082a663452168608 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 18 Jun 2017 18:01:27 +0200 Subject: [PATCH] improve readability, minor performance improvements --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 855feb28e7..2ab3262f76 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -156,9 +156,11 @@ SketcherGui::ViewProviderSketch* getSketchViewprovider(Gui::Document *doc) return 0; } -void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch, std::vector &sug1, std::vector &sug2) { - - if(sug1.size()>0 && sug2.size()>0) { +void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch, + std::vector &sug1, + std::vector &sug2) +{ + if(!sug1.empty() && !sug2.empty()) { bool rmvhorvert = false; @@ -205,9 +207,9 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch, std::vec detectredundant(sug2, secondext, secondorig, secondaxis); - rmvhorvert = ( (firstext && secondext) || // coincident with external on both endpoints - (firstorig && secondaxis) || // coincident origin and point on object on other - (secondorig && firstaxis) ); + rmvhorvert = ((firstext && secondext) || // coincident with external on both endpoints + (firstorig && secondaxis) || // coincident origin and point on object on other + (secondorig && firstaxis)); if(rmvhorvert) { for(std::vector::reverse_iterator it = sug2.rbegin(); it!=sug2.rend(); ++it) { @@ -216,7 +218,6 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch, std::vec } } } - } }