X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_Face.cpp;h=82d0f476e915d8330ea0b430b6cdd4bd579a2de5;hb=be64ac512378281d54e4a73e8edb68ae43d0c5a7;hp=945f9bc34d306c14beda27425213d5b0cadb4100;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/GeomValidators/GeomValidators_Face.cpp b/src/GeomValidators/GeomValidators_Face.cpp index 945f9bc34..82d0f476e 100644 --- a/src/GeomValidators/GeomValidators_Face.cpp +++ b/src/GeomValidators/GeomValidators_Face.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 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 @@ -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 "GeomValidators_Face.h" @@ -24,6 +23,7 @@ #include "ModelAPI_AttributeSelection.h" #include +#include #include @@ -42,8 +42,44 @@ GeomAbs_SurfaceType faceType(const std::string& theType) if (MyFaceTypes.find(aType) != MyFaceTypes.end()) return MyFaceTypes[aType]; +// LCOV_EXCL_START Events_InfoMessage("GeomValidators_Face", "Face type defined in XML is not implemented!").send(); return GeomAbs_Plane; +// LCOV_EXCL_STOP +} + +bool isValidFace(const GeomShapePtr theShape, + const GeomAbs_SurfaceType theFaceType, + Events_InfoMessage& theError) +{ + GeomFacePtr aGeomFace = theShape->face(); + + if (!aGeomFace.get()) { + theError = "The shape is not a face."; + return false; + } + + bool aValid = true; + + switch (theFaceType) { + case GeomAbs_Plane: { + aValid = aGeomFace->isPlanar(); + if (!aValid) theError = "The shape is not a plane."; + break; + } + case GeomAbs_Cylinder: { + aValid = aGeomFace->isCylindrical(); + if (!aValid) theError = "The shape is not a cylinder."; + break; + } + default: { + aValid = false; + theError = "The shape is not an available face."; + break; + } + } + + return aValid; } bool GeomValidators_Face::isValid(const AttributePtr& theAttribute, @@ -52,9 +88,11 @@ bool GeomValidators_Face::isValid(const AttributePtr& theAttribute, { std::string anAttributeType = theAttribute->attributeType(); if (anAttributeType != ModelAPI_AttributeSelection::typeId()) { +// LCOV_EXCL_START theError = "The attribute with the %1 type is not processed"; theError.arg(theAttribute->attributeType()); return false; +// LCOV_EXCL_STOP } bool aValid = true; @@ -73,42 +111,21 @@ bool GeomValidators_Face::isValid(const AttributePtr& theAttribute, // it is necessary to check whether the shape is face in order to set in selection a value // with any type and check the type in this validator // It is realized to select any object in OB and filter it in this validator (sketch plane) - if (!aGeomShape->isFace()) { - aValid = false; - theError = "The shape is not a face."; + GeomAbs_SurfaceType aFaceType = GeomAbs_Plane; + if (theArguments.size() == 1) + aFaceType = faceType(theArguments.front()); + if (aGeomShape->isFace()) { + aValid = isValidFace(aGeomShape, aFaceType, theError); } - else { - std::shared_ptr aGeomFace(new GeomAPI_Face(aGeomShape)); - if (!aGeomFace.get()) { - aValid = false; - theError = "The shape is not a face."; - } - else { - GeomAbs_SurfaceType aFaceType = GeomAbs_Plane; - if (theArguments.size() == 1) - aFaceType = faceType(theArguments.front()); - - switch (aFaceType) { - case GeomAbs_Plane: { - aValid = aGeomFace->isPlanar(); - if (!aValid) - theError = "The shape is not a plane."; - } - break; - case GeomAbs_Cylinder:{ - aValid = aGeomFace->isCylindrical(); - if (!aValid) - theError = "The shape is not a cylinder."; - } - break; - default: { - aValid = false; - theError = "The shape is not an available face."; - break; - } - } + else if (aSelectionAttr->isGeometricalSelection() && aGeomShape->isCompound()) { + for (GeomAPI_ShapeIterator anIt(aGeomShape); anIt.more() && aValid; anIt.next()) { + aValid = isValidFace(anIt.current(), aFaceType, theError); } } + else { + aValid = false; + theError = "The shape is not a face."; + } } return aValid; }