Modification of distance constraint changes the line direction (issue #874)

diff --git a/src/SketchSolver/SketchSolver_ConstraintDistance.cpp b/src/SketchSolver/SketchSolver_ConstraintDistance.cpp
index d7313a49dfc9609d7fb5dad62dfa5b9b0469cce5..63bd0ae7ddbd2c3d2f8bffb7a278a8d245cda1bd 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintDistance.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintDistance.cpp
@@ -91,9 +91,10 @@ void SketchSolver_ConstraintDistance::adjustConstraint()
     }
     std::shared_ptr<GeomAPI_XY> aLineVec = aPoints[2]->decreased(aPoints[1]);
     std::shared_ptr<GeomAPI_XY> aPtLineVec = aPoints[0]->decreased(aPoints[1]);
-    if (aPtLineVec->cross(aLineVec) * aConstraint.valA < 0.0) {
+    if (aPtLineVec->cross(aLineVec) * aConstraint.valA < 0.0 || myIsNegative) {
       aConstraint.valA *= -1.0;
       myStorage->updateConstraint(aConstraint);
+      myIsNegative = true;
     }
   }
 }

diff --git a/src/SketchSolver/SketchSolver_ConstraintDistance.h b/src/SketchSolver/SketchSolver_ConstraintDistance.h
index ba1827208743f01e074cace7fcdf38680ea31b10..8c3a7ea5c5d663b5621212b3dd791b3193d33df7 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintDistance.h
+++ b/src/SketchSolver/SketchSolver_ConstraintDistance.h
@@ -38,6 +38,7 @@ protected:
 private:
   int myType; ///< type of constraint (applicable: SLVS_C_PT_PT_DISTANCE, SLVS_C_PT_LINE_DISTANCE)
   double myPrevValue; ///< previous value of distance (for correct calculation of a distance sign)
+  bool myIsNegative;  ///< \c true, if the point if placed rightside of line direction (SLVS_C_PT_LINE_DISTANCE only)
 };
 
 #endif