Issue #2811: Update content of Object node on creation moment

[modules/shaper.git] / src / GeomValidators / GeomValidators_Face.cpp

diff --git a/src/GeomValidators/GeomValidators_Face.cpp b/src/GeomValidators/GeomValidators_Face.cpp
index 945f9bc34d306c14beda27425213d5b0cadb4100..a5f9d588cb888bb78977b362846b54f0ad8b9a7c 100644 (file)
--- a/src/GeomValidators/GeomValidators_Face.cpp
+++ b/src/GeomValidators/GeomValidators_Face.cpp
@@ -24,6 +24,7 @@
 #include "ModelAPI_AttributeSelection.h"
 
 #include <GeomAPI_Face.h>
+#include <GeomAPI_ShapeIterator.h>
 
 #include <GeomAbs_SurfaceType.hxx>
 
@@ -46,6 +47,40 @@ GeomAbs_SurfaceType faceType(const std::string& theType)
   return GeomAbs_Plane;
 }
 
+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,
                                   const std::list<std::string>& theArguments,
                                   Events_InfoMessage& theError) const
@@ -78,36 +113,22 @@ bool GeomValidators_Face::isValid(const AttributePtr& theAttribute,
       theError = "The shape is not a face.";
     }
     else {
-      std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face(aGeomShape));
-      if (!aGeomFace.get()) {
-        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()) {
+        isValidFace(aGeomShape, aFaceType, theError);
       }
-      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.";
+      else if (aSelectionAttr->isGeometricalSelection() && aGeomShape->isCompound()) {
+        for (GeomAPI_ShapeIterator anIt(aGeomShape); anIt.more(); anIt.next()) {
+          if (!isValidFace(anIt.current(), aFaceType, theError)) {
             break;
           }
         }
       }
+      else {
+        aValid = false;
+        theError = "The shape is not a face.";
+      }
     }
   }
   return aValid;