Revert "First phase of SketchSolver refactoring"

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintAngle.cpp

diff --git a/src/SketchSolver/SketchSolver_ConstraintAngle.cpp b/src/SketchSolver/SketchSolver_ConstraintAngle.cpp
index d255da0e34fbc92d449238ac7cfbdaae1b4d1c45..10dbae16549bc0ab16c9024acee89c9c0b085199 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintAngle.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintAngle.cpp
@@ -46,17 +46,34 @@ void SketchSolver_ConstraintAngle::adjustConstraint()
   if (!anIntersection)
     return;
   double aDist[2][2];
-  for (int i = 0; i < 2; i++)
-    for (int j = 0; j < 2; j++)
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 2; j++) {
       aDist[i][j] = anIntersection->distance(aPoints[i][j]);
+      if (fabs(aDist[i][j]) <= tolerance)
+        aDist[i][j] = 0.0;
+    }
+    if (aDist[i][0] > tolerance && aDist[i][1] > tolerance &&
+        aDist[i][0] + aDist[i][1] < aPoints[i][0]->distance(aPoints[i][1]) + 2.0 * tolerance) {
+      // the intersection point is an inner point of the line,
+      // we change the sign of distance till start point to calculate correct coordinates
+      // after rotation
+      aDist[i][0] *= -1.0;
+    }
+  }
   std::shared_ptr<GeomAPI_Dir2d> aDir[2];
   for (int i = 0; i < 2; i++)
-    if (aDist[i][1] > aDist[i][0])
+    if (aDist[i][1] > fabs(aDist[i][0]))
       aDir[i] = std::shared_ptr<GeomAPI_Dir2d>(new GeomAPI_Dir2d(
           aPoints[i][1]->xy()->decreased(anIntersection->xy())));
-    else
+    else {
       aDir[i] = std::shared_ptr<GeomAPI_Dir2d>(new GeomAPI_Dir2d(
           aPoints[i][0]->xy()->decreased(anIntersection->xy())));
+      // main direction is opposite => change signs
+      if (aDist[i][0] < 0.0) {
+        aDist[i][0] *= -1.0;
+        aDist[i][1] *= -1.0;
+      }
+    }
 
   aConstraint.other = false;
   for (int i = 0; i < 2; i++)