+ change order of tangent and coincident constraints of slot

FreeCAD · Jun 5, 2014 · 2fcce86 · 2fcce86
1 parent dfda670
commit 2fcce86
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -2996,6 +2996,19 @@ class DrawSketchHandlerSlot: public DrawSketchHandler
                 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 @@ class DrawSketchHandlerSlot: public DrawSketchHandler
                     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()