]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Angle adjusting
authorazv <azv@opencascade.com>
Fri, 22 Apr 2016 09:58:51 +0000 (12:58 +0300)
committerazv <azv@opencascade.com>
Fri, 22 Apr 2016 09:59:18 +0000 (12:59 +0300)
src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Builder.cpp

index 22d431dc2c91b32d04c90c0f721896ebf0f322af..bc86af89dcd7a356f6fcffe9be4aa6878b4ff2ef 100644 (file)
@@ -713,17 +713,10 @@ void adjustAngle(ConstraintWrapperPtr theConstraint)
   double aDist[2][2];
   for (int i = 0; i < 2; i++) {
     for (int j = 0; j < 2; j++) {
-      aDist[i][j] = aCenter->distance(aPoints[i][j]);
+      aDist[i][j] = aDir[i]->xy()->dot(aPoints[i][j]->xy()->decreased(aCenter->xy()));
       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;
-    }
   }
 
   // Recalculate positions of lines to avoid conflicting constraints