X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_ShapeType.h;h=2d9bca0af290bed0c379a6f3a595113a9fc4e3ca;hb=88ee9b2b81cf93a6324336b57e30cc8a3a487499;hp=daf9fda38d230c7d73c38e318c4a809baea31e59;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git diff --git a/src/GeomValidators/GeomValidators_ShapeType.h b/src/GeomValidators/GeomValidators_ShapeType.h index daf9fda38..2d9bca0af 100644 --- a/src/GeomValidators/GeomValidators_ShapeType.h +++ b/src/GeomValidators/GeomValidators_ShapeType.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 // #ifndef GeomValidators_ShapeType_H @@ -64,15 +63,17 @@ class GeomValidators_ShapeType : public ModelAPI_AttributeValidator GEOMVALIDATORS_EXPORT virtual bool isValid(const AttributePtr& theAttribute, const std::list& theArguments, Events_InfoMessage& theError) const; -protected: + /// Convert string to TypeOfShape value /// \param theType a string value - static TypeOfShape shapeType(const std::string& theType); + GEOMVALIDATORS_EXPORT static TypeOfShape shapeType(const std::string& theType); +protected: /// Returns true if the attibute's object type satisfies the argument value /// \param[in] theAttribute a checked attribute /// \param[in] theShapeType a type of shape /// \param[out] theError error message. + GEOMVALIDATORS_EXPORT bool isValidAttribute(const AttributePtr& theAttribute, const TypeOfShape theShapeType, Events_InfoMessage& theError) const; @@ -83,6 +84,7 @@ protected: /// \param[out] theError error message. bool isValidObject(const ObjectPtr& theObject, const TypeOfShape theShapeType, + const bool theIsGeometricalSelection, Events_InfoMessage& theError) const; /// Returns true if the attibute's object type satisfies the argument value @@ -91,6 +93,7 @@ protected: /// \param[out] theError error message. bool isValidShape(const GeomShapePtr theShape, const TypeOfShape theShapeType, + const bool theIsGeometricalSelection, Events_InfoMessage& theError) const; };