From 29761fc90d75d1e0cb03ca6f3a86ed275dc2f631 Mon Sep 17 00:00:00 2001 From: AjinkyaDahale Date: Wed, 22 Feb 2017 04:27:34 +0530 Subject: [PATCH] Sketcher: External edges in constraint modes (parallel) --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index fe364677c..af351bb86 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -2477,8 +2477,6 @@ void CmdSketcherConstrainPointOnObject::applyConstraint(std::vector & // ====================================================================================== -//DEF_STD_CMD_AU(CmdSketcherConstrainDistanceX); - class CmdSketcherConstrainDistanceX : public CmdSketcherConstraint { public: @@ -2717,8 +2715,6 @@ void CmdSketcherConstrainDistanceX::updateAction(int mode) // ====================================================================================== -//DEF_STD_CMD_AU(CmdSketcherConstrainDistanceY); - class CmdSketcherConstrainDistanceY : public CmdSketcherConstraint { public: @@ -3020,7 +3016,8 @@ CmdSketcherConstrainParallel::CmdSketcherConstrainParallel() eType = ForEdit; // TODO: Also needed: ExternalEdges - allowedSelSequences = {{SelEdge, SelEdgeOrAxis}, {SelEdgeOrAxis, SelEdge}}; + allowedSelSequences = {{SelEdge, SelEdgeOrAxis}, {SelEdgeOrAxis, SelEdge}, + {SelEdge, SelExternalEdge}, {SelExternalEdge, SelEdge}}; constraintCursor = cursor_createparallel; } @@ -3110,6 +3107,8 @@ void CmdSketcherConstrainParallel::applyConstraint(std::vector &selSe switch (seqIndex) { case 0: // {SelEdge, SelEdgeOrAxis} case 1: // {SelEdgeOrAxis, SelEdge} + case 2: // {SelEdge, SelExternalEdge} + case 3: // {SelExternalEdge, SelEdge} // create the constraint SketcherGui::ViewProviderSketch* sketchgui = static_cast(getActiveGuiDocument()->getInEdit()); Sketcher::SketchObject* Obj = sketchgui->getSketchObject();