X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_Face.cpp;h=82d0f476e915d8330ea0b430b6cdd4bd579a2de5;hb=be64ac512378281d54e4a73e8edb68ae43d0c5a7;hp=391ae4f827232caa1f05d6dd197d5d13112aaa7a;hpb=7e9e955376b504dc7d9e0a5e79a9a38943a53fcd;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_Face.cpp b/src/GeomValidators/GeomValidators_Face.cpp
index 391ae4f82..82d0f476e 100644
--- a/src/GeomValidators/GeomValidators_Face.cpp
+++ b/src/GeomValidators/GeomValidators_Face.cpp
@@ -1,5 +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 "GeomValidators_Face.h"
 #include "GeomValidators_Tools.h"
@@ -7,14 +23,12 @@
 #include "ModelAPI_AttributeSelection.h"
 
 #include <GeomAPI_Face.h>
+#include <GeomAPI_ShapeIterator.h>
 
 #include <GeomAbs_SurfaceType.hxx>
 
 #include <Events_InfoMessage.h>
 
-#include <QString>
-#include <QMap>
-
 typedef std::map<std::string, GeomAbs_SurfaceType> FaceTypes;
 static FaceTypes MyFaceTypes;
 
@@ -27,9 +41,45 @@ GeomAbs_SurfaceType faceType(const std::string& theType)
   std::string aType = std::string(theType.c_str());
   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,
@@ -38,8 +88,11 @@ bool GeomValidators_Face::isValid(const AttributePtr& theAttribute,
 {
   std::string anAttributeType = theAttribute->attributeType();
   if (anAttributeType != ModelAPI_AttributeSelection::typeId()) {
-    theError = "The attribute with the " + theAttribute->attributeType() + " type is not processed";
+// 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;
@@ -58,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<GeomAPI_Face> 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;
 }