X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_RemoveSubShapes.cpp;h=f0deaf6a6e1f2e1a7bc6e6c534f6cf8b6b535730;hb=c575ad28dd7f9087e727b675f43bbbc9ad3446f6;hp=24a0de7e7b1cbddbb950deafdfbdd43c4fe8ffd3;hpb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp b/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp
index 24a0de7e7..f0deaf6a6 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  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
@@ -86,65 +86,71 @@ void FeaturesPlugin_RemoveSubShapes::attributeChanged(const std::string& theID)
   }
 
   myChangedInCode = true;
+  if (theID == BASE_SHAPE_ID() || theID == SUBSHAPES_TO_KEEP_ID() ||
+    theID == SUBSHAPES_TO_REMOVE_ID()) {
+    std::list<ResultPtr> anAllSubs;
+    ModelAPI_Tools::allSubs(aResultBody, anAllSubs);
 
-  if(theID == BASE_SHAPE_ID()) {
-    aSubShapesToKeepAttrList->clear();
-    aSubShapesToRemoveAttrList->clear();
+    if(theID == BASE_SHAPE_ID()) {
+      aSubShapesToKeepAttrList->clear();
+      aSubShapesToRemoveAttrList->clear();
 
-    if (!aBaseShape.get()) {
-      return;
-    }
+      if (!aBaseShape.get()) {
+        return;
+      }
 
-    std::list<GeomShapePtr> aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape);
-    for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt)
-    {
-      GeomShapePtr aSubShape = *anIt;
-      if(!isHasSubs) {
-        aSubShapesToKeepAttrList->append(aContext, aSubShape);
-      } else {
-        std::list<ResultPtr> anAllSubs;
-        ModelAPI_Tools::allSubs(aResultBody, anAllSubs);
-        std::list<ResultPtr>::iterator aSubsIt = anAllSubs.begin();
-        for(; aSubsIt != anAllSubs.end(); aSubsIt++) {
-          ResultBodyPtr aSub = std::dynamic_pointer_cast<ModelAPI_ResultBody>(*aSubsIt);
-          if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) {
-            aSubShapesToKeepAttrList->append(aSub, aSubShape);
-            break;
+      std::list<GeomShapePtr> aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape);
+      ListOfShape::const_iterator anIt = aSubShapes.cbegin();
+      for (; anIt != aSubShapes.cend(); ++anIt)
+      {
+        GeomShapePtr aSubShape = *anIt;
+        if(!isHasSubs) {
+          aSubShapesToKeepAttrList->append(aContext, aSubShape);
+        } else {
+          std::list<ResultPtr>::iterator aSubsIt = anAllSubs.begin();
+          for(; aSubsIt != anAllSubs.end(); aSubsIt++) {
+            ResultBodyPtr aSub = std::dynamic_pointer_cast<ModelAPI_ResultBody>(*aSubsIt);
+            if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) {
+              aSubShapesToKeepAttrList->append(aSub, aSubShape);
+              break;
+            }
           }
         }
       }
     }
-  }
-  else if (theID == SUBSHAPES_TO_KEEP_ID())
-  {
-    aSubShapesToRemoveAttrList->clear();
+    else if (theID == SUBSHAPES_TO_KEEP_ID())
+    {
+      aSubShapesToRemoveAttrList->clear();
 
-    if (!aBaseShape.get()) {
-      return;
-    }
+      if (!aBaseShape.get()) {
+        return;
+      }
 
-    int anIndex;
-    const int aSubsToKeepNb = aSubShapesToKeepAttrList->size();
-    std::list<GeomShapePtr> aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape);
-    for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt)
-    {
-      GeomShapePtr aSubShape = *anIt;
+      int anIndex;
+      // optimization: collect selection attribute values into a map
+      const int aSubsToKeepNb = aSubShapesToKeepAttrList->size();
+      GeomAPI_DataMapOfShapeShape aSubShapesToKeep;
       for(anIndex = 0; anIndex < aSubsToKeepNb; ++anIndex) {
         AttributeSelectionPtr anAttrSelectionInList = aSubShapesToKeepAttrList->value(anIndex);
         GeomShapePtr aSubShapeToKeep = anAttrSelectionInList->value();
-        if (aSubShapeToKeep.get() && aSubShapeToKeep->isEqual(aSubShape)) {
-          break;
-        }
+        if (aSubShapeToKeep.get())
+          aSubShapesToKeep.bind(aSubShapeToKeep, aSubShapeToKeep);
       }
 
-      if (anIndex == aSubsToKeepNb) {
+      std::list<GeomShapePtr> aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape);
+      ListOfShape::const_iterator anIt = aSubShapes.cbegin();
+      for (; anIt != aSubShapes.cend(); ++anIt)
+      {
+        GeomShapePtr aSubShape = *anIt;
+        if (aSubShapesToKeep.isBound(aSubShape))
+          continue;
+
         if(!isHasSubs) {
           aSubShapesToRemoveAttrList->append(aContext, aSubShape);
-        } else {
-          std::list<ResultPtr> anAllSubs;
-          ModelAPI_Tools::allSubs(aResultBody, anAllSubs);
+        }
+        else {
           std::list<ResultPtr>::iterator aSubsIt = anAllSubs.begin();
-          for(; aSubsIt != anAllSubs.end(); aSubsIt++) {
+          for (; aSubsIt != anAllSubs.end(); aSubsIt++) {
             ResultBodyPtr aSub = std::dynamic_pointer_cast<ModelAPI_ResultBody>(*aSubsIt);
             if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) {
               aSubShapesToRemoveAttrList->append(aSub, aSubShape);
@@ -154,37 +160,39 @@ void FeaturesPlugin_RemoveSubShapes::attributeChanged(const std::string& theID)
         }
       }
     }
-  }
-  else if (theID == SUBSHAPES_TO_REMOVE_ID())
-  {
-    aSubShapesToKeepAttrList->clear();
+    else if (theID == SUBSHAPES_TO_REMOVE_ID())
+    {
+      aSubShapesToKeepAttrList->clear();
 
-    if (!aBaseShape.get()) {
-      return;
-    }
+      if (!aBaseShape.get()) {
+        return;
+      }
 
-    int anIndex;
-    const int aSubsToRemoveNb = aSubShapesToRemoveAttrList->size();
-    std::list<GeomShapePtr> aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape);
-    for (ListOfShape::const_iterator anIt = aSubShapes.cbegin(); anIt != aSubShapes.cend(); ++anIt)
-    {
-      GeomShapePtr aSubShape = *anIt;
+      int anIndex;
+      const int aSubsToRemoveNb = aSubShapesToRemoveAttrList->size();
+      GeomAPI_DataMapOfShapeShape aSubShapesToRemove;
       for(anIndex = 0; anIndex < aSubsToRemoveNb; ++anIndex) {
         AttributeSelectionPtr anAttrSelectionInList = aSubShapesToRemoveAttrList->value(anIndex);
         GeomShapePtr aSubShapeToRemove = anAttrSelectionInList->value();
-        if (aSubShapeToRemove.get() && aSubShapeToRemove->isEqual(aSubShape)) {
-          break;
-        }
+        if (aSubShapeToRemove.get())
+          aSubShapesToRemove.bind(aSubShapeToRemove, aSubShapeToRemove);
       }
 
-      if (anIndex == aSubsToRemoveNb) {
-        if(!isHasSubs) {
+
+      std::list<GeomShapePtr> aSubShapes = GeomAlgoAPI_ShapeTools::getLowLevelSubShapes(aBaseShape);
+      ListOfShape::const_iterator anIt = aSubShapes.cbegin();
+      for (; anIt != aSubShapes.cend(); ++anIt)
+      {
+        GeomShapePtr aSubShape = *anIt;
+        if (aSubShapesToRemove.isBound(aSubShape))
+          continue;
+
+        if (!isHasSubs) {
           aSubShapesToKeepAttrList->append(aContext, aSubShape);
-        } else {
-          std::list<ResultPtr> anAllSubs;
-          ModelAPI_Tools::allSubs(aResultBody, anAllSubs);
+        }
+        else {
           std::list<ResultPtr>::iterator aSubsIt = anAllSubs.begin();
-          for(; aSubsIt != anAllSubs.end(); aSubsIt++) {
+          for (; aSubsIt != anAllSubs.end(); aSubsIt++) {
             ResultBodyPtr aSub = std::dynamic_pointer_cast<ModelAPI_ResultBody>(*aSubsIt);
             if (aSub && aSub->shape().get() && aSub->shape()->isSubShape(aSubShape)) {
               aSubShapesToKeepAttrList->append(aSub, aSubShape);
@@ -282,7 +290,9 @@ void FeaturesPlugin_RemoveSubShapes::execute()
 
   // Store result.
   ResultBodyPtr aResultBody = document()->createBody(data());
-  aResultBody->storeModified(aBaseShape, aResultShape);
+  std::list<GeomShapePtr> anOldShapes;
+  anOldShapes.push_back(aBaseShape);
+  aResultBody->storeModified(anOldShapes, aResultShape, aMakeShapeList);
   for (std::set<GeomAPI_Shape::ShapeType>::iterator aTypeIter = aTypes.begin();
        aTypeIter != aTypes.end();
        ++aTypeIter)