X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchSolver%2FSketchSolver_Constraint.cpp;h=17720fdc4c3855a4a995e25075523c5510aa17d9;hb=bb4ab20a1f03f936d4d8511eb9e9733ee965bb72;hp=5c73c9a9bd517f2c45a87faf2bdaac46a3c2d0ea;hpb=b49300c581e67523203dc497c967676d42fb0728;p=modules%2Fshaper.git diff --git a/src/SketchSolver/SketchSolver_Constraint.cpp b/src/SketchSolver/SketchSolver_Constraint.cpp index 5c73c9a9b..17720fdc4 100644 --- a/src/SketchSolver/SketchSolver_Constraint.cpp +++ b/src/SketchSolver/SketchSolver_Constraint.cpp @@ -1,4 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -13,6 +30,7 @@ #include #include +#include #include #include #include @@ -59,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; @@ -214,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)