From 2fcce866a73bb4c3d5ca55195d676dc7e0fad3ab Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 6 Jun 2014 00:33:56 +0200 Subject: [PATCH] + change order of tangent and coincident constraints of slot --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 1621e34bb..bbb949da1 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -2996,6 +2996,19 @@ public: Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addGeometry(Part.Line(App.Vector(%f,%f,0),App.Vector(%f,%f,0)))", sketchgui->getObject()->getNameInDocument(), EditCurve[0].fX,EditCurve[0].fY,EditCurve[34].fX,EditCurve[34].fY); + //// add the tnagent constraints + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " + ,sketchgui->getObject()->getNameInDocument() + ,firstCurve,firstCurve+2); + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " + ,sketchgui->getObject()->getNameInDocument() + ,firstCurve,firstCurve+3); + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " + ,sketchgui->getObject()->getNameInDocument() + ,firstCurve+1,firstCurve+2); + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " + ,sketchgui->getObject()->getNameInDocument() + ,firstCurve+1,firstCurve+3); // add the four coincidents to ty them together Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Coincident',%i,1,%i,1)) " ,sketchgui->getObject()->getNameInDocument() @@ -3018,19 +3031,6 @@ public: Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Vertical',%i)) " ,sketchgui->getObject()->getNameInDocument() ,firstCurve+2); - //// add the tnagent constraints - Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " - ,sketchgui->getObject()->getNameInDocument() - ,firstCurve,firstCurve+2); - Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " - ,sketchgui->getObject()->getNameInDocument() - ,firstCurve,firstCurve+3); - Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " - ,sketchgui->getObject()->getNameInDocument() - ,firstCurve+1,firstCurve+2); - Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Tangent',%i,%i)) " - ,sketchgui->getObject()->getNameInDocument() - ,firstCurve+1,firstCurve+3); // make the two arcs equal Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Equal',%i,%i)) " ,sketchgui->getObject()->getNameInDocument()