X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomValidators%2FGeomValidators_BodyShapes.cpp;h=bcfae3effe85aa00701b7cf8094d295dba1dc549;hb=88c4a5c85a8d2cfab598c69882b9ceae15507123;hp=504daa4afda22792eb6f04cd8881092d173e6621;hpb=ba727bd58bc3166536229f47c363a14d5a126fa7;p=modules%2Fshaper.git

diff --git a/src/GeomValidators/GeomValidators_BodyShapes.cpp b/src/GeomValidators/GeomValidators_BodyShapes.cpp
index 504daa4af..bcfae3eff 100644
--- a/src/GeomValidators/GeomValidators_BodyShapes.cpp
+++ b/src/GeomValidators/GeomValidators_BodyShapes.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_BodyShapes.cpp
-// Created:     21 December 2015
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "GeomValidators_BodyShapes.h"
 
@@ -11,6 +25,7 @@
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_Tools.h>
 
 bool GeomValidators_BodyShapes::isValid(const AttributePtr& theAttribute,
                                         const std::list<std::string>& theArguments,
@@ -26,11 +41,19 @@ bool GeomValidators_BodyShapes::isValid(const AttributePtr& theAttribute,
       return false;
     }
 
-    ResultConstructionPtr aResultConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+    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::compSolidOwner(aContext).get()) {
+        theError = "Error: Only higher level shape allowed.";
+        return false;
+      }
+    }
   } else if(anAttributeType == ModelAPI_AttributeSelectionList::typeId()) {
     AttributeSelectionListPtr anAttrSelectionList =
       std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(theAttribute);