From: azv Date: Fri, 25 Dec 2015 08:10:13 +0000 (+0300) Subject: Update Angle constraint processing (issue #1181) X-Git-Tag: V_2.1.0~50 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b83d39afdcf3053712cf0ff8281d5fd54e0b1649;p=modules%2Fshaper.git Update Angle constraint processing (issue #1181) --- diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.cpp index 2267b067c..57537a056 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.cpp +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Builder.cpp @@ -1084,6 +1084,9 @@ void adjustAngle(ConstraintWrapperPtr theConstraint) } } + if (aDir[0]->cross(aDir[1]) * aConstraint->value() < 0.0) + aConstraint->setValue(-aConstraint->value()); + bool isChange = false; for (int i = 0; i < 2; i++) if (aLine[i]->direction()->dot(aDir[i]) < 0.0) diff --git a/src/SketchSolver/SketchSolver_ConstraintAngle.cpp b/src/SketchSolver/SketchSolver_ConstraintAngle.cpp index 553d5a803..2ed05b5a1 100644 --- a/src/SketchSolver/SketchSolver_ConstraintAngle.cpp +++ b/src/SketchSolver/SketchSolver_ConstraintAngle.cpp @@ -26,106 +26,6 @@ void SketchSolver_ConstraintAngle::adjustConstraint() if (fabs(myAngle - aConstraint->value()) < aTol) return; myAngle = aConstraint->value(); - - bool isFixed[2][2]; - std::shared_ptr aPoints[2][2]; // start and end points of lines - const std::list& aConstrLines = aConstraint->entities(); - std::list::const_iterator aCLIt = aConstrLines.begin(); - for (int i = 0; aCLIt != aConstrLines.end(); ++i, ++aCLIt) { - const std::list& aLinePoints = (*aCLIt)->subEntities(); - std::list::const_iterator aLPIt = aLinePoints.begin(); - for (int j = 0; aLPIt != aLinePoints.end(); ++j, ++aLPIt) { - isFixed[i][j] = ((*aLPIt)->group() != myGroupID); - aPoints[i][j] = aBuilder->point(*aLPIt); - } - } - - if (isFixed[0][0] && isFixed[0][1] && isFixed[1][0] && isFixed[1][1]) - return; // both lines are fixed => no need to update them - - std::shared_ptr aLine[2] = { - std::shared_ptr(new GeomAPI_Lin2d(aPoints[0][0], aPoints[0][1])), - std::shared_ptr(new GeomAPI_Lin2d(aPoints[1][0], aPoints[1][1])) - }; - std::shared_ptr anIntersection = aLine[0]->intersect(aLine[1]); - if (!anIntersection) - return; - double aDist[2][2]; - 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 aDir[2]; - for (int i = 0; i < 2; i++) - if (aDist[i][1] > fabs(aDist[i][0])) - aDir[i] = std::shared_ptr(new GeomAPI_Dir2d( - aPoints[i][1]->xy()->decreased(anIntersection->xy()))); - else { - aDir[i] = std::shared_ptr(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; - } - } - - // Recalculate positions of lines to avoid conflicting constraints - // while changing angle value several times - double cosA = cos(myAngle * PI / 180.0); - double sinA = sin(myAngle * PI / 180.0); - if (aDir[0]->cross(aDir[1]) < 0.0) - sinA *= -1.0; - int aLineToUpd = 1; - if (isFixed[1][0] && isFixed[1][1]) { - sinA *= -1.0; - aLineToUpd = 0; - } - double x = aDir[1-aLineToUpd]->x() * cosA - aDir[1-aLineToUpd]->y() * sinA; - double y = aDir[1-aLineToUpd]->x() * sinA + aDir[1-aLineToUpd]->y() * cosA; - - std::shared_ptr aNewPoints[2]; - for (int i = 0; i < 2; i++) { - aNewPoints[i] = std::shared_ptr( - new GeomAPI_Pnt2d(anIntersection->x() + x * aDist[aLineToUpd][i], - anIntersection->y() + y * aDist[aLineToUpd][i])); - } - - std::shared_ptr aDelta; - if (isFixed[aLineToUpd][0] && !isFixed[aLineToUpd][1]) - aDelta = aPoints[aLineToUpd][0]->xy()->decreased(aNewPoints[0]->xy()); - else if (!isFixed[aLineToUpd][0] && isFixed[aLineToUpd][1]) - aDelta = aPoints[aLineToUpd][1]->xy()->decreased(aNewPoints[1]->xy()); - if (aDelta) { - for (int i = 0; i < 2; i++) { - aNewPoints[i]->setX(aNewPoints[i]->x() + aDelta->x()); - aNewPoints[i]->setY(aNewPoints[i]->y() + aDelta->y()); - } - } - - // Update positions of points - std::list::const_iterator anUpdLine = aConstrLines.begin(); - if (aLineToUpd > 0) ++anUpdLine; - const std::list& anUpdPoints = (*anUpdLine)->subEntities(); - std::list::const_iterator aPIt = anUpdPoints.begin(); - for (int i = 0; aPIt != anUpdPoints.end(); ++aPIt, ++i) { - double aCoord[2] = {aNewPoints[i]->x(), aNewPoints[i]->y()}; - const std::list& aParams = (*aPIt)->parameters(); - std::list::const_iterator aParIt = aParams.begin(); - for (int j = 0; aParIt != aParams.end(); ++j, ++aParIt) - (*aParIt)->setValue(aCoord[j]); - } - aBuilder->adjustConstraint(aConstraint); myStorage->addConstraint(myBaseConstraint, aConstraint); } diff --git a/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Builder.cpp b/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Builder.cpp index 21bd5f536..68ce5aaf3 100644 --- a/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Builder.cpp +++ b/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Builder.cpp @@ -635,16 +635,22 @@ void adjustAngle(ConstraintWrapperPtr theConstraint) std::shared_ptr aConstraint = std::dynamic_pointer_cast(theConstraint); + bool isFixed[2][2]; std::shared_ptr aPoints[2][2]; // start and end points of lines const std::list& aConstrLines = aConstraint->entities(); std::list::const_iterator aCLIt = aConstrLines.begin(); for (int i = 0; aCLIt != aConstrLines.end(); ++i, ++aCLIt) { const std::list& aLinePoints = (*aCLIt)->subEntities(); std::list::const_iterator aLPIt = aLinePoints.begin(); - for (int j = 0; aLPIt != aLinePoints.end(); ++j, ++aLPIt) + for (int j = 0; aLPIt != aLinePoints.end(); ++j, ++aLPIt) { + isFixed[i][j] = ((*aLPIt)->group() != theConstraint->group()); aPoints[i][j] = aBuilder->point(*aLPIt); + } } + if (isFixed[0][0] && isFixed[0][1] && isFixed[1][0] && isFixed[1][1]) + return; // both lines are fixed => no need to update them + std::shared_ptr aLine[2] = { std::shared_ptr(new GeomAPI_Lin2d(aPoints[0][0], aPoints[0][1])), std::shared_ptr(new GeomAPI_Lin2d(aPoints[1][0], aPoints[1][1])) @@ -688,6 +694,52 @@ void adjustAngle(ConstraintWrapperPtr theConstraint) for (int i = 0; i < 2; i++) if (aLine[i]->direction()->dot(aDir[i]) < 0.0) aSlvsConstraint.other = !aSlvsConstraint.other; + + // Recalculate positions of lines to avoid conflicting constraints + // while changing angle value several times + double cosA = cos(aConstraint->value() * PI / 180.0); + double sinA = sin(aConstraint->value() * PI / 180.0); + if (aDir[0]->cross(aDir[1]) < 0.0) + sinA *= -1.0; + int aLineToUpd = 1; + if (isFixed[1][0] && isFixed[1][1]) { + sinA *= -1.0; + aLineToUpd = 0; + } + double x = aDir[1-aLineToUpd]->x() * cosA - aDir[1-aLineToUpd]->y() * sinA; + double y = aDir[1-aLineToUpd]->x() * sinA + aDir[1-aLineToUpd]->y() * cosA; + + std::shared_ptr aNewPoints[2]; + for (int i = 0; i < 2; i++) { + aNewPoints[i] = std::shared_ptr( + new GeomAPI_Pnt2d(anIntersection->x() + x * aDist[aLineToUpd][i], + anIntersection->y() + y * aDist[aLineToUpd][i])); + } + + std::shared_ptr aDelta; + if (isFixed[aLineToUpd][0] && !isFixed[aLineToUpd][1]) + aDelta = aPoints[aLineToUpd][0]->xy()->decreased(aNewPoints[0]->xy()); + else if (!isFixed[aLineToUpd][0] && isFixed[aLineToUpd][1]) + aDelta = aPoints[aLineToUpd][1]->xy()->decreased(aNewPoints[1]->xy()); + if (aDelta) { + for (int i = 0; i < 2; i++) { + aNewPoints[i]->setX(aNewPoints[i]->x() + aDelta->x()); + aNewPoints[i]->setY(aNewPoints[i]->y() + aDelta->y()); + } + } + + // Update positions of points + std::list::const_iterator anUpdLine = aConstrLines.begin(); + if (aLineToUpd > 0) ++anUpdLine; + const std::list& anUpdPoints = (*anUpdLine)->subEntities(); + std::list::const_iterator aPIt = anUpdPoints.begin(); + for (int i = 0; aPIt != anUpdPoints.end(); ++aPIt, ++i) { + double aCoord[2] = {aNewPoints[i]->x(), aNewPoints[i]->y()}; + const std::list& aParams = (*aPIt)->parameters(); + std::list::const_iterator aParIt = aParams.begin(); + for (int j = 0; aParIt != aParams.end(); ++j, ++aParIt) + (*aParIt)->setValue(aCoord[j]); + } } void adjustMirror(ConstraintWrapperPtr theConstraint)