X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_BodyShapes.cpp;h=b00864d4d7851f00d74851041d68dbb79b0162a9;hb=b7f954c1e5b9da1fc425908ac4edfebb513ebf23;hp=56068837aa9a90bc81e791632ceef4c410506bdf;hpb=87474d56199326bace66da349e9dc2c44e02d3a7;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_BodyShapes.cpp b/src/GeomValidators/GeomValidators_BodyShapes.cpp
index 56068837a..b00864d4d 100644
--- a/src/GeomValidators/GeomValidators_BodyShapes.cpp
+++ b/src/GeomValidators/GeomValidators_BodyShapes.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_BodyShapes.cpp
-// Created:     21 December 2015
-// Author:      Dmitry Bobylev
+// 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_BodyShapes.h"
 
@@ -11,6 +24,8 @@
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultBody.h>
 
 bool GeomValidators_BodyShapes::isValid(const AttributePtr& theAttribute,
                                         const std::list<std::string>& theArguments,
@@ -21,16 +36,38 @@ bool GeomValidators_BodyShapes::isValid(const AttributePtr& theAttribute,
     AttributeSelectionPtr anAttrSelection =
       std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
     ResultPtr aContext = anAttrSelection->context();
-    if(!aContext.get()) {
+    FeaturePtr aContextFeature = anAttrSelection->contextFeature();
+    if (!(aContext.get() || aContextFeature.get())) {
       theError = "Error: Context is empty.";
       return false;
     }
-
-    ResultConstructionPtr aResultConstruction =
-      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
-    if(aResultConstruction.get()) {
-      theError = "Error: Result construction selected.";
-      return false;
+    if (aContext.get()) {
+      ResultConstructionPtr aResultConstruction =
+        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+      if (aResultConstruction.get()) {
+        theError = "Error: Result construction selected.";
+        return false;
+      }
+      // additional check that the selected object is top-level result
+      if (theArguments.size() > 0 && *(theArguments.rbegin()) == "toplevel") {
+        if (ModelAPI_Tools::bodyOwner(aContext).get()) {
+          theError = "Error: Only higher level shape allowed.";
+          return false;
+        }
+      }
+    } else {
+      std::list<ResultPtr> aResList = aContextFeature->results();
+      std::list<ResultPtr>::const_iterator aIt;
+      for (aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) {
+        ResultPtr aRes = (*aIt);
+        ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(aRes);
+        if (aBody.get())
+          break;
+      }
+      if (aIt == aResList.cend()) {
+        theError = "Error: Feature doesn't creates body.";
+        return false;
+      }
     }
   } else if(anAttributeType == ModelAPI_AttributeSelectionList::typeId()) {
     AttributeSelectionListPtr anAttrSelectionList =
@@ -44,9 +81,11 @@ bool GeomValidators_BodyShapes::isValid(const AttributePtr& theAttribute,
       }
     }
   } else {
+// LCOV_EXCL_START
     theError = "Error: Attribute \"%1\" does not supported by this validator.";
     theError.arg(anAttributeType);
     return false;
+// LCOV_EXCL_STOP
   }
 
   return true;