X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_ShapeType.h;h=d7cb899e3c7c8c6788849bc254a9e791580d73e3;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=50be8a5ec16eca8a4d719278af55c6f3f2a21c85;hpb=57e5ff999c4f23cc66bc2c91fc298c8acf63b2b2;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_ShapeType.h b/src/GeomValidators/GeomValidators_ShapeType.h
index 50be8a5ec..d7cb899e3 100644
--- a/src/GeomValidators/GeomValidators_ShapeType.h
+++ b/src/GeomValidators/GeomValidators_ShapeType.h
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_ShapeType.h
-// Created:     19 Mar 2015
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2023  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
+//
 
 #ifndef GeomValidators_ShapeType_H
 #define GeomValidators_ShapeType_H
@@ -34,7 +47,9 @@ class GeomValidators_ShapeType : public ModelAPI_AttributeValidator
     Wire,
     Face,
     Plane,
+    Shell,
     Solid,
+    CompSolid,
     Compound,
     AnyShape
   };
@@ -47,19 +62,21 @@ class GeomValidators_ShapeType : public ModelAPI_AttributeValidator
   //! \param[out] theError error message.
   GEOMVALIDATORS_EXPORT virtual bool isValid(const AttributePtr& theAttribute,
                                              const std::list<std::string>& theArguments,
-                                             std::string& theError) const;
-protected:
+                                             Events_InfoMessage& theError) const;
+
   /// 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,
-                        std::string& theError) const;
+                        Events_InfoMessage& theError) const;
 
   /// Returns true if the attibute's object type satisfies the argument value
   /// \param[in] theObject a checked object
@@ -67,7 +84,8 @@ protected:
   /// \param[out] theError error message.
   bool isValidObject(const ObjectPtr& theObject,
                      const TypeOfShape theShapeType,
-                     std::string& theError) const;
+                     const bool theIsGeometricalSelection,
+                     Events_InfoMessage& theError) const;
 
   /// Returns true if the attibute's object type satisfies the argument value
   /// \param[in] theShape a checked shape
@@ -75,7 +93,8 @@ protected:
   /// \param[out] theError error message.
   bool isValidShape(const GeomShapePtr theShape,
                     const TypeOfShape theShapeType,
-                    std::string& theError) const;
+                    const bool theIsGeometricalSelection,
+                    Events_InfoMessage& theError) const;
 
 };