From 97f0020093b53e2bba19c171f8a478f6314b98e6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 13 Jan 2018 15:49:39 +0100 Subject: [PATCH] improve whitespaces --- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 53 ++++++++++----------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 8b7f90d63d..e1cfabb716 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -5855,10 +5855,11 @@ bool ViewProviderSketch::onDelete(const std::vector &subList) delConstraints.insert(ConstrId); } } + // We stored the vertices, but is there really a coincident constraint? Check const std::vector< Sketcher::Constraint * > &vals = getSketchObject()->Constraints.getValues(); - std::set::const_reverse_iterator rit; + std::set::const_reverse_iterator rit; for (rit = delConstraints.rbegin(); rit != delConstraints.rend(); ++rit) { try { @@ -5871,33 +5872,31 @@ bool ViewProviderSketch::onDelete(const std::vector &subList) } for (rit = delCoincidents.rbegin(); rit != delCoincidents.rend(); ++rit) { - int GeoId; - PointPos PosId; - - if (*rit == GeoEnum::RtPnt) { // RootPoint - GeoId = Sketcher::GeoEnum::RtPnt; - PosId = start; - } else { - getSketchObject()->getGeoVertexIndex(*rit, GeoId, PosId); - } - - if(GeoId != Constraint::GeoUndef) { - - for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); it != vals.end(); ++it) { + int GeoId; + PointPos PosId; - if ( ((*it)->Type == Sketcher::Coincident) && (((*it)->First == GeoId && (*it)->FirstPos == PosId) || - ((*it)->Second == GeoId && (*it)->SecondPos == PosId)) ) { - try { - Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.delConstraintOnPoint(%i,%i)" - ,getObject()->getNameInDocument(), GeoId, (int)PosId); - } - catch (const Base::Exception& e) { - Base::Console().Error("%s\n", e.what()); - } - break; - } - } - } + if (*rit == GeoEnum::RtPnt) { // RootPoint + GeoId = Sketcher::GeoEnum::RtPnt; + PosId = start; + } else { + getSketchObject()->getGeoVertexIndex(*rit, GeoId, PosId); + } + + if (GeoId != Constraint::GeoUndef) { + for (std::vector< Sketcher::Constraint * >::const_iterator it= vals.begin(); it != vals.end(); ++it) { + if (((*it)->Type == Sketcher::Coincident) && (((*it)->First == GeoId && (*it)->FirstPos == PosId) || + ((*it)->Second == GeoId && (*it)->SecondPos == PosId)) ) { + try { + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.delConstraintOnPoint(%i,%i)" + ,getObject()->getNameInDocument(), GeoId, (int)PosId); + } + catch (const Base::Exception& e) { + Base::Console().Error("%s\n", e.what()); + } + break; + } + } + } } for (rit = delInternalGeometries.rbegin(); rit != delInternalGeometries.rend(); ++rit) {