Merge branch 'master' of salome:modules/shaper

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

diff --git a/src/GeomValidators/GeomValidators_Face.cpp b/src/GeomValidators/GeomValidators_Face.cpp
index c8797278b42d94c15b4674c65d4233594deac427..dd415526378ab07ea1531b9d0558641f260fb1b2 100644 (file)
--- a/src/GeomValidators/GeomValidators_Face.cpp
+++ b/src/GeomValidators/GeomValidators_Face.cpp
@@ -8,7 +8,9 @@
 
 #include <GeomAPI_Face.h>
 
-#include <Events_Error.h>
+#include <GeomAbs_SurfaceType.hxx>
+
+#include <Events_InfoMessage.h>
 
 #include <QString>
 #include <QMap>
@@ -16,7 +18,7 @@
 typedef std::map<std::string, GeomAbs_SurfaceType> FaceTypes;
 static FaceTypes MyFaceTypes;
 
-GeomAbs_SurfaceType GeomValidators_Face::faceType(const std::string& theType)
+GeomAbs_SurfaceType faceType(const std::string& theType)
 {
   if (MyFaceTypes.size() == 0) {
     MyFaceTypes["plane"] = GeomAbs_Plane;
@@ -26,25 +28,29 @@ GeomAbs_SurfaceType GeomValidators_Face::faceType(const std::string& theType)
   if (MyFaceTypes.find(aType) != MyFaceTypes.end())
     return MyFaceTypes[aType];
   
-  Events_Error::send("Face type defined in XML is not implemented!");
+  Events_InfoMessage("GeomValidators_Face", "Face type defined in XML is not implemented!").send();
   return GeomAbs_Plane;
 }
 
 bool GeomValidators_Face::isValid(const AttributePtr& theAttribute,
-                                  const std::list<std::string>& theArguments) const
+                                  const std::list<std::string>& theArguments,
+                                  Events_InfoMessage& theError) const
 {
-  bool aValid = false;
-
-  GeomAbs_SurfaceType aFaceType = GeomAbs_Plane;
-  if (theArguments.size() == 1) {
-    std::string anArgument = theArguments.front();
-    aFaceType = faceType(anArgument);
+  std::string anAttributeType = theAttribute->attributeType();
+  if (anAttributeType != ModelAPI_AttributeSelection::typeId()) {
+    theError = "The attribute with the %1 type is not processed";
+    theError.arg(theAttribute->attributeType());
+    return false;
   }
 
+  bool aValid = true;
   ObjectPtr anObject = GeomValidators_Tools::getObject(theAttribute);
-  if (anObject.get() != NULL) {
-    AttributeSelectionPtr aSelectionAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
-                                                                 (theAttribute);
+  if (!anObject.get()) {
+    aValid = true; // an empty face selected is valid.
+  }
+  else {
+    AttributeSelectionPtr aSelectionAttr =
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
     std::shared_ptr<GeomAPI_Shape> aGeomShape = aSelectionAttr->value();
     if (!aGeomShape.get()) {
       // if the shape is empty, apply the validator to the shape of result
@@ -53,23 +59,42 @@ 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()) {
+    if (!aGeomShape->isFace()) {
+      aValid = false;
+      theError = "The shape is not a face.";
+    }
+    else {
       std::shared_ptr<GeomAPI_Face> aGeomFace(new GeomAPI_Face(aGeomShape));
-      if (aGeomFace.get() != NULL) {
-        switch(aFaceType) {
-            case GeomAbs_Plane:
-              aValid = aGeomFace->isPlanar();
-              break;
-            case GeomAbs_Cylinder:
-              aValid = aGeomFace->isCylindrical();
-              break;
-            default:
-              break;
+      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
-    aValid = true; // an empty face selected is valid.
   return aValid;
 }