X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintAngle.cpp;h=c73ae7d175e339714dcab36fb25f1eeefc3deb8c;hb=c7a5ff20294ae8270bfb9120b8887f0c9959d658;hp=7874be39513f2c17c99082de801dbabbed27d366;hpb=22b8f7fe2eccd1eeee183f52834b191b1e904dc3;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp b/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp index 7874be395..c73ae7d17 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp @@ -160,24 +160,14 @@ double SketchPlugin_ConstraintAngle::calculateAngle() }; // Directions of lines - if (aDist[0][1] < tolerance) + if (aDist[0][0] > aDist[0][1]) aEndA = aStartA; - if (aDist[1][1] < tolerance) + if (aDist[1][0] > aDist[1][1]) aEndB = aStartB; std::shared_ptr aDirA(new GeomAPI_Dir2d(aEndA->xy()->decreased(anInter->xy()))); std::shared_ptr aDirB(new GeomAPI_Dir2d(aEndB->xy()->decreased(anInter->xy()))); anAngle = fabs(aDirA->angle(aDirB)) * 180.0 / PI; - - // If the lines intersected inside one of them, the angle selected is less than 90 degrees - if ((aDist[0][0] >= tolerance && aDist[0][1] >= tolerance && - aDist[0][0] + aDist[0][1] < aStartA->distance(aEndA) + 2.0 * tolerance) || - (aDist[1][0] >= tolerance && aDist[1][1] >= tolerance && - aDist[1][0] + aDist[1][1] < aStartB->distance(aEndB) + 2.0 * tolerance)) { - if (anAngle > 90.0) - anAngle = 180.0 - anAngle; - } - return anAngle; }