Fix the problem that for Remove Shapes the sub-result can be selected as a base objec...

diff --git a/src/FeaturesPlugin/remove_subshapes_widget.xml b/src/FeaturesPlugin/remove_subshapes_widget.xml
index b2698e274c197719d918007f6317fed11285dcc9..353881c4554a970d05053b9dfe1498f76634b6f5 100644 (file)
--- a/src/FeaturesPlugin/remove_subshapes_widget.xml
+++ b/src/FeaturesPlugin/remove_subshapes_widget.xml
@@ -27,7 +27,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
                   concealment="true"
                   greed="true">
     <validator id="GeomValidators_ShapeType" parameters="wire,shell,compsolid,compound"/>
-    <validator id="GeomValidators_BodyShapes"/>
+    <validator id="GeomValidators_BodyShapes" parameters="toplevel"/>
   </shape_selector>
   <multi_selector id="subshapes"
                   label="Sub-Shapes to keep:"

diff --git a/src/GeomValidators/GeomValidators_BodyShapes.cpp b/src/GeomValidators/GeomValidators_BodyShapes.cpp
index bf790bb16a1ff2aa0a3999cf268670baef6335ef..bcfae3effe85aa00701b7cf8094d295dba1dc549 100644 (file)
--- a/src/GeomValidators/GeomValidators_BodyShapes.cpp
+++ b/src/GeomValidators/GeomValidators_BodyShapes.cpp
@@ -25,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,
@@ -46,6 +47,13 @@ bool GeomValidators_BodyShapes::isValid(const AttributePtr& theAttribute,
       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);