X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_Constraint.cpp;h=8baa8e3022e48648d0bd2b46beae0187c80bc207;hb=05c54697df5d6968704e869a4a21102a0477121f;hp=4a78cc548d772a7ea1c7bde38680abc5018b83cd;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git diff --git a/src/SketchSolver/SketchSolver_Constraint.cpp b/src/SketchSolver/SketchSolver_Constraint.cpp index 4a78cc548..8baa8e302 100644 --- a/src/SketchSolver/SketchSolver_Constraint.cpp +++ b/src/SketchSolver/SketchSolver_Constraint.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -31,6 +30,7 @@ #include #include +#include #include #include #include @@ -77,7 +77,8 @@ void SketchSolver_Constraint::blockEvents(bool isBlocked) SketchSolver_ConstraintType SketchSolver_Constraint::TYPE(ConstraintPtr theConstraint) { const std::string& aType = theConstraint->getKind(); - if (aType == SketchPlugin_ConstraintCoincidence::ID()) + if (aType == SketchPlugin_ConstraintCoincidence::ID() || + aType == SketchPlugin_ConstraintCoincidenceInternal::ID()) return CONSTRAINT_COINCIDENCE; else if (aType == SketchPlugin_ConstraintRigid::ID()) return CONSTRAINT_FIXED; @@ -232,7 +233,7 @@ void SketchSolver_Constraint::getAttributes( SketchSolver_EntityType aType = anEntity->type(); if (aType == ENTITY_UNKNOWN) continue; - else if (aType == ENTITY_POINT) + else if (aType == ENTITY_POINT || aType == ENTITY_POINT_ARRAY) theAttributes[aPtInd++] = anEntity; // the point is created else { // another entity (not a point) is created if (aEntInd < anInitNbOfAttr)