Salome HOME
Initial implementation of support of any level of hierarchy in Result Bodies.
[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_CompositeBoolean.cpp
index 6bc4ae5d04d19406d8c93891cb7b4fe164f1ba14..9cdf2b7ccd45eafe2de8dcb2a7a4975c838dc6a1 100644 (file)
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// 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 "FeaturesPlugin_CompositeBoolean.h"
 
-// File:        FeaturesPlugin_CompositeBoolean.cpp
-// Created:     11 June 2015
-// Author:      Dmitry Bobylev
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Tools.h>
 
-#include <FeaturesPlugin_CompositeBoolean.h>
+#include <GeomAlgoAPI_Boolean.h>
+#include <GeomAlgoAPI_MakeShapeList.h>
+#include <GeomAlgoAPI_PaveFiller.h>
+#include <GeomAlgoAPI_ShapeTools.h>
 
-#include <ModelAPI_AttributeSelectionList.h>
-#include <ModelAPI_AttributeReference.h>
-#include <ModelAPI_BodyBuilder.h>
-#include <ModelAPI_ResultBody.h>
-#include <ModelAPI_ResultConstruction.h>
+#include <GeomAPI_ShapeExplorer.h>
 
-#include <GeomAlgoAPI_Prism.h>
-#include <GeomAlgoAPI_Revolution.h>
-#include <GeomAlgoAPI_ShapeProps.h>
+#include <map>
 
 //=================================================================================================
-void FeaturesPlugin_CompositeBoolean::initAttributes()
+void FeaturesPlugin_CompositeBoolean::initBooleanAttributes()
 {
-  data()->addAttribute(SKETCH_OBJECT_ID(), ModelAPI_AttributeReference::typeId());
-
-  // Boolean works with solids always.
-  data()->addAttribute(BOOLEAN_OBJECTS_ID(), ModelAPI_AttributeSelectionList::typeId());
-  AttributeSelectionListPtr aSelection = data()->selectionList(BOOLEAN_OBJECTS_ID());
-  aSelection->setSelectionType("SOLID");
-
-  initMakeSolidsAttributes();
+  myFeature->data()->addAttribute(OBJECTS_ID(), ModelAPI_AttributeSelectionList::typeId());
 }
 
 //=================================================================================================
-std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeBoolean::addFeature(std::string theID)
+void FeaturesPlugin_CompositeBoolean::executeCompositeBoolean()
 {
-  std::shared_ptr<ModelAPI_Feature> aNew = document()->addFeature(theID, false);
-  if (aNew) {
-    data()->reference(SKETCH_OBJECT_ID())->setValue(aNew);
+  // Make generation.
+  ListOfShape aGenBaseShapes;
+  ListOfMakeShape aGenMakeShapes;
+  if(!makeGeneration(aGenBaseShapes, aGenMakeShapes)) {
+    return;
   }
-   // set as current also after it becomes sub to set correctly enabled for other sketch subs
-  document()->setCurrentFeature(aNew, false);
-  return aNew;
-}
 
-//=================================================================================================
-int FeaturesPlugin_CompositeBoolean::numberOfSubs(bool forTree) const
-{
-  ObjectPtr aObj = data()->reference(SKETCH_OBJECT_ID())->value();
-  return aObj.get()? 1 : 0;
-}
+  // Getting tools.
+  ListOfShape aTools;
+  for(ListOfMakeShape::const_iterator
+      anIt = aGenMakeShapes.cbegin(); anIt != aGenMakeShapes.cend(); ++anIt) {
+    aTools.push_back((*anIt)->shape());
+  }
 
-//=================================================================================================
-std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeBoolean::subFeature(const int theIndex, bool forTree) const
-{
-  if (theIndex == 0)
-    return std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_OBJECT_ID())->value());
-  return std::shared_ptr<ModelAPI_Feature>();
-}
+  // Make boolean.
+  ListOfShape aBooleanObjects;
+  ListOfMakeShape aBooleanMakeShapes;
+  if(!makeBoolean(aTools, aBooleanObjects, aBooleanMakeShapes)) {
+    return;
+  }
 
-//=================================================================================================
-int FeaturesPlugin_CompositeBoolean::subFeatureId(const int theIndex) const
-{
-  std::shared_ptr<ModelAPI_Feature> aFeature = subFeature(theIndex);
-  if (aFeature.get())
-    return aFeature->data()->featureId();
-  return -1;
-}
+  if(myOperationType == BOOL_FUSE) {
+    aTools.splice(aTools.begin(), aBooleanObjects);
+    aBooleanObjects.splice(aBooleanObjects.begin(), aTools, aTools.begin());
+  }
 
-//=================================================================================================
-bool FeaturesPlugin_CompositeBoolean::isSub(ObjectPtr theObject) const
-{
-  // check is this feature of result
-  FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
-  if (!aFeature)
-    return false;
-  ObjectPtr aSub = data()->reference(SKETCH_OBJECT_ID())->value();
-  return aSub == theObject;
-}
+  // Store result.
+  int aResultIndex = 0;
+  ListOfShape::const_iterator aBoolObjIt = aBooleanObjects.cbegin();
+  ListOfMakeShape::const_iterator aBoolMSIt = aBooleanMakeShapes.cbegin();
+  for(; aBoolObjIt != aBooleanObjects.cend() && aBoolMSIt != aBooleanMakeShapes.cend();
+      ++aBoolObjIt, ++aBoolMSIt) {
 
-//=================================================================================================
-void FeaturesPlugin_CompositeBoolean::removeFeature(std::shared_ptr<ModelAPI_Feature> theFeature)
-{
-}
+    int aTag = 1;
 
-//=================================================================================================
-void FeaturesPlugin_CompositeBoolean::erase()
-{
-  if (data().get() && data()->isValid()) { // on abort of sketch of this composite it may be invalid
-    FeaturePtr aSketch =
-      std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_OBJECT_ID())->value());
-    if (aSketch.get() && aSketch->data()->isValid()) {
-      document()->removeFeature(aSketch);
+    ResultBodyPtr aResultBody = myFeature->document()->createBody(myFeature->data(), aResultIndex);
+
+    if((*aBoolObjIt)->isEqual((*aBoolMSIt)->shape())) {
+      aResultBody->store((*aBoolMSIt)->shape(), false);
     }
-  }
-  ModelAPI_CompositeFeature::erase();
-}
+    else
+    {
+      aResultBody->storeModified(*aBoolObjIt, (*aBoolMSIt)->shape(), aTag);
+
+      aTag += 5000;
+
+      // Store generation history.
+      ListOfShape::const_iterator aGenBaseIt = aGenBaseShapes.cbegin();
+      ListOfMakeShape::const_iterator aGenMSIt = aGenMakeShapes.cbegin();
+      for(; aGenBaseIt != aGenBaseShapes.cend() && aGenMSIt != aGenMakeShapes.cend();
+          ++aGenBaseIt, ++aGenMSIt) {
+        storeGenerationHistory(aResultBody, *aGenBaseIt, *aGenMSIt, aTag);
+      }
 
+      int aModTag = aTag;
+      storeModificationHistory(aResultBody, *aBoolObjIt, aTools, *aBoolMSIt, aModTag);
+    }
 
-//=================================================================================================
-void FeaturesPlugin_CompositeBoolean::execute()
-{
-  // Getting faces to create solids.
-  std::shared_ptr<ModelAPI_Feature> aSketchFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(
-                                                     reference(SKETCH_OBJECT_ID())->value());
-  if(!aSketchFeature) {
-    return;
-  }
-  ResultPtr aSketchRes = aSketchFeature->results().front();
-  ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aSketchRes);
-  if(!aConstruction.get()) {
-    return;
-  }
-  int aSketchFacesNum = aConstruction->facesNum();
-  if(aSketchFacesNum == 0) {
-    return; //TODO: set error message
-  }
-  ListOfShape aSketchFacesList;
-  for(int aFaceIndex = 0; aFaceIndex < aSketchFacesNum; aFaceIndex++) {
-    std::shared_ptr<GeomAPI_Shape> aFace = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
-    aSketchFacesList.push_back(aFace);
+    myFeature->setResult(aResultBody, aResultIndex++);
   }
 
-  // Pass faces to soldis creation function.
-  ListOfShape aBooleanTools;
-  std::list<std::shared_ptr<GeomAPI_Interface>> theSolidsAlgos;
-  makeSolids(aSketchFacesList, aBooleanTools, theSolidsAlgos);
-  if(aBooleanTools.empty()) {
-    return;
-  }
+  myFeature->removeResults(aResultIndex);
+}
 
-  // Getting objects for boolean operation.
-  ListOfShape aBooleanObjects;
-  AttributeSelectionListPtr anObjectsSelList = selectionList(BOOLEAN_OBJECTS_ID());
-  if (anObjectsSelList->size() == 0) {
-    return;
-  }
+//=================================================================================================
+bool FeaturesPlugin_CompositeBoolean::makeBoolean(const ListOfShape& theTools,
+                                                  ListOfShape& theObjects,
+                                                  ListOfMakeShape& theMakeShapes)
+{
+  // Getting objects.
+  ListOfShape anObjects, anEdgesAndFaces, aCompSolids;
+  std::map<GeomShapePtr, ListOfShape> aCompSolidsObjects;
+  AttributeSelectionListPtr anObjectsSelList = myFeature->selectionList(OBJECTS_ID());
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
-    std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
+    AttributeSelectionPtr anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+    GeomShapePtr anObject = anObjectAttr->value();
     if(!anObject.get()) {
-      return;
+      myFeature->setError("Error: Could not get object.");
+      return false;
+    }
+    ResultPtr aContext = anObjectAttr->context();
+    ResultBodyPtr aResCompSolidPtr = ModelAPI_Tools::bodyOwner(aContext);
+    if(aResCompSolidPtr.get()) {
+      GeomShapePtr aContextShape = aResCompSolidPtr->shape();
+      std::map<GeomShapePtr, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
+      for(; anIt != aCompSolidsObjects.end(); anIt++) {
+        if(anIt->first->isEqual(aContextShape)) {
+          aCompSolidsObjects[anIt->first].push_back(anObject);
+          break;
+        }
+      }
+      if(anIt == aCompSolidsObjects.end()) {
+        aCompSolidsObjects[aContextShape].push_back(anObject);
+        aCompSolids.push_back(aContextShape);
+      }
+    } else {
+      if(anObject->shapeType() == GeomAPI_Shape::EDGE ||
+         anObject->shapeType() == GeomAPI_Shape::FACE) {
+        anEdgesAndFaces.push_back(anObject);
+      } else {
+        anObjects.push_back(anObject);
+      }
     }
-    aBooleanObjects.push_back(anObject);
   }
 
-  // Cut from each object solids.
-  int aResultIndex = 0;
+  switch(myOperationType) {
+    case BOOL_CUT: {
+      if((anObjects.empty() && aCompSolidsObjects.empty()) || theTools.empty()) {
+        myFeature->setError("Error: Not enough objects for boolean operation.");
+        return false;
+      }
 
-  switch(myBooleanOperationType) {
-    case GeomAlgoAPI_Boolean::BOOL_CUT:
-    case GeomAlgoAPI_Boolean::BOOL_COMMON:{
-      // Cut each object with all tools
-      for(ListOfShape::iterator anObjectsIt = aBooleanObjects.begin(); anObjectsIt != aBooleanObjects.end(); anObjectsIt++) {
-        std::shared_ptr<GeomAPI_Shape> anObject = *anObjectsIt;
+      // For solids cut each object with all tools.
+      for(ListOfShape::const_iterator
+          anIt = anObjects.cbegin(); anIt != anObjects.cend(); ++anIt) {
+        GeomShapePtr anObject = *anIt;
         ListOfShape aListWithObject;
         aListWithObject.push_back(anObject);
-        GeomAlgoAPI_Boolean aBoolAlgo(aListWithObject, aBooleanTools, myBooleanOperationType);
+        std::shared_ptr<GeomAlgoAPI_Boolean> aBoolAlgo(new GeomAlgoAPI_Boolean(aListWithObject,
+                                                                theTools,
+                                                                GeomAlgoAPI_Boolean::BOOL_CUT));
 
         // Checking that the algorithm worked properly.
-        if(!aBoolAlgo.isDone() || aBoolAlgo.shape()->isNull() || !aBoolAlgo.isValid()) {
-          setError("Boolean algorithm failed");
-          return;
+        if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) {
+          myFeature->setError("Error: Boolean algorithm failed.");
+          return false;
         }
 
-        if(GeomAlgoAPI_ShapeProps::volume(aBoolAlgo.shape()) > 1.e-7) {
-          std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-          loadNamingDS(aResultBody, anObject, aSketchFacesList, theSolidsAlgos, aBooleanTools, aBoolAlgo);
-          setResult(aResultBody, aResultIndex);
-          aResultIndex++;
+        if(GeomAlgoAPI_ShapeTools::volume(aBoolAlgo->shape()) > 1.e-27) {
+          theObjects.push_back(anObject);
+          theMakeShapes.push_back(aBoolAlgo);
+        }
+      }
+
+      // Compsolids handling
+      for(std::map<GeomShapePtr, ListOfShape>::const_iterator anIt = aCompSolidsObjects.cbegin();
+          anIt != aCompSolidsObjects.cend(); ++anIt) {
+        GeomShapePtr aCompSolid = anIt->first;
+        const ListOfShape& aUsedShapes = anIt->second;
+
+        // Collecting solids from compsolids which will not be modified in boolean operation.
+        ListOfShape aShapesToAdd;
+        for(GeomAPI_ShapeExplorer
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+          GeomShapePtr aSolidInCompSolid = anExp.current();
+          ListOfShape::const_iterator aUsedShapesIt = aUsedShapes.cbegin();
+          for(; aUsedShapesIt != aUsedShapes.cend(); ++aUsedShapesIt) {
+            if(aSolidInCompSolid->isEqual(*aUsedShapesIt)) {
+              break;
+            }
+          }
+          if(aUsedShapesIt == aUsedShapes.end()) {
+            aShapesToAdd.push_back(aSolidInCompSolid);
+          }
+        }
+
+        std::shared_ptr<GeomAlgoAPI_Boolean> aBoolAlgo(new GeomAlgoAPI_Boolean(aUsedShapes,
+                                                                  theTools,
+                                                                  GeomAlgoAPI_Boolean::BOOL_CUT));
+
+        // Checking that the algorithm worked properly.
+        if(!aBoolAlgo->isDone() || aBoolAlgo->shape()->isNull() || !aBoolAlgo->isValid()) {
+          myFeature->setError("Error: Boolean algorithm failed.");
+          return false;
+        }
+
+        std::shared_ptr<GeomAlgoAPI_MakeShapeList> aMakeShapeList(new GeomAlgoAPI_MakeShapeList());
+        aMakeShapeList->appendAlgo(aBoolAlgo);
+
+        // Add result to not used solids from compsolid.
+        aShapesToAdd.push_back(aBoolAlgo->shape());
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+          new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        if(!aFillerAlgo->isDone() || aFillerAlgo->shape()->isNull() || !aFillerAlgo->isValid()) {
+          myFeature->setError("Error: PaveFiller algorithm failed.");
+          return false;
+        }
+
+        aMakeShapeList->appendAlgo(aFillerAlgo);
+
+        if(GeomAlgoAPI_ShapeTools::volume(aFillerAlgo->shape()) > 1.e-27) {
+          theObjects.push_back(aCompSolid);
+          theMakeShapes.push_back(aMakeShapeList);
         }
       }
       break;
     }
-    case GeomAlgoAPI_Boolean::BOOL_FUSE: {
+    case BOOL_FUSE: {
+      // Set objects.
+      theObjects.insert(theObjects.end(), anEdgesAndFaces.begin(), anEdgesAndFaces.end());
+      theObjects.insert(theObjects.end(), anObjects.begin(), anObjects.end());
+      theObjects.insert(theObjects.end(), aCompSolids.begin(), aCompSolids.end());
+
+      // Filter edges and faces in tools.
+      ListOfShape aTools;
+      for(ListOfShape::const_iterator anIt = theTools.cbegin(); anIt != theTools.cend(); ++anIt) {
+        if((*anIt)->shapeType() == GeomAPI_Shape::EDGE ||
+           (*anIt)->shapeType() == GeomAPI_Shape::FACE) {
+          anEdgesAndFaces.push_back(*anIt);
+        } else {
+          aTools.push_back(*anIt);
+        }
+      }
+
+      if((anObjects.size() + aTools.size() +
+          aCompSolidsObjects.size() + anEdgesAndFaces.size()) < 2) {
+        myFeature->setError("Error: Not enough objects for boolean operation.");
+        return false;
+      }
+
+      // Collecting all solids which will be fused.
+      ListOfShape aSolidsToFuse;
+      aSolidsToFuse.insert(aSolidsToFuse.end(), anObjects.begin(), anObjects.end());
+      aSolidsToFuse.insert(aSolidsToFuse.end(), aTools.begin(), aTools.end());
+
+      // Collecting solids from compsolids which will not be
+      // modified in boolean operation and will be added to result.
+      ListOfShape aShapesToAdd;
+      for(std::map<GeomShapePtr, ListOfShape>::iterator anIt = aCompSolidsObjects.begin();
+          anIt != aCompSolidsObjects.end(); anIt++) {
+        GeomShapePtr aCompSolid = anIt->first;
+        ListOfShape& aUsedShapes = anIt->second;
+        aSolidsToFuse.insert(aSolidsToFuse.end(), aUsedShapes.begin(), aUsedShapes.end());
+
+        // Collect solids from compsolid which will not be modified in boolean operation.
+        for(GeomAPI_ShapeExplorer
+            anExp(aCompSolid, GeomAPI_Shape::SOLID); anExp.more(); anExp.next()) {
+          GeomShapePtr aSolidInCompSolid = anExp.current();
+          ListOfShape::iterator anIt = aUsedShapes.begin();
+          for(; anIt != aUsedShapes.end(); anIt++) {
+            if(aSolidInCompSolid->isEqual(*anIt)) {
+              break;
+            }
+          }
+          if(anIt == aUsedShapes.end()) {
+            aShapesToAdd.push_back(aSolidInCompSolid);
+          }
+        }
+      }
+
+      // Cut edges and faces(if we have any) with solids.
+      ListOfShape aCutTools;
+      aCutTools.insert(aCutTools.end(), anObjects.begin(), anObjects.end());
+      aCutTools.insert(aCutTools.end(), aCompSolids.begin(), aCompSolids.end());
+      aCutTools.insert(aCutTools.end(), aTools.begin(), aTools.end());
+
+      std::shared_ptr<GeomAlgoAPI_MakeShapeList> aMakeShapeList(new GeomAlgoAPI_MakeShapeList());
+      if(!anEdgesAndFaces.empty() && !aCutTools.empty()) {
+        std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(anEdgesAndFaces,
+                                                              aCutTools,
+                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
+        if(aCutAlgo->isDone() && !aCutAlgo->shape()->isNull() && aCutAlgo->isValid()) {
+          anEdgesAndFaces.clear();
+          anEdgesAndFaces.push_back(aCutAlgo->shape());
+          aMakeShapeList->appendAlgo(aCutAlgo);
+        }
+      }
+
+      // If we have compsolids then cut with not used solids all others.
+      if(!aShapesToAdd.empty()) {
+        std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(new GeomAlgoAPI_Boolean(aSolidsToFuse,
+                                                              aShapesToAdd,
+                                                              GeomAlgoAPI_Boolean::BOOL_CUT));
+        if(aCutAlgo->isDone() && GeomAlgoAPI_ShapeTools::volume(aCutAlgo->shape()) > 1.e-27) {
+          aSolidsToFuse.clear();
+          aSolidsToFuse.push_back(aCutAlgo->shape());
+          aMakeShapeList->appendAlgo(aCutAlgo);
+        }
+      }
+
       // Fuse all objects and all tools.
-      GeomAlgoAPI_Boolean aBoolAlgo(aBooleanObjects, aBooleanTools, myBooleanOperationType);
+      GeomShapePtr aFusedShape;
+      if(aSolidsToFuse.size() == 1) {
+        aFusedShape = aSolidsToFuse.front();
+      } else if(aSolidsToFuse.size() > 1){
+        anObjects.clear();
+        anObjects.push_back(aSolidsToFuse.front());
+        aSolidsToFuse.pop_front();
+        aTools = aSolidsToFuse;
+
+        std::shared_ptr<GeomAlgoAPI_Boolean> aFuseAlgo(new GeomAlgoAPI_Boolean(anObjects,
+                                                          aTools,
+                                                          GeomAlgoAPI_Boolean::BOOL_FUSE));
+
+        // Checking that the algorithm worked properly.
+        if(!aFuseAlgo->isDone() || aFuseAlgo->shape()->isNull() || !aFuseAlgo->isValid()) {
+          myFeature->setError("Error: Boolean algorithm failed.");
+          return false;
+        }
 
-      // Checking that the algorithm worked properly.
-      if(!aBoolAlgo.isDone() || aBoolAlgo.shape()->isNull() || !aBoolAlgo.isValid()) {
-        setError("Boolean algorithm failed");
-        return;
+        aFusedShape = aFuseAlgo->shape();
+        aMakeShapeList->appendAlgo(aFuseAlgo);
       }
 
-      std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-      loadNamingDS(aResultBody, aBooleanObjects.front(), aSketchFacesList, theSolidsAlgos, aBooleanTools, aBoolAlgo);
-      setResult(aResultBody, aResultIndex);
-      aResultIndex++;
+      // Combine result with not used solids from compsolid and edges and faces (if we have any).
+      aShapesToAdd.insert(aShapesToAdd.end(), anEdgesAndFaces.begin(), anEdgesAndFaces.end());
+      if(!aShapesToAdd.empty()) {
+        if(aFusedShape.get()) {
+          aShapesToAdd.push_back(aFusedShape);
+        }
+
+        std::shared_ptr<GeomAlgoAPI_PaveFiller> aFillerAlgo(
+          new GeomAlgoAPI_PaveFiller(aShapesToAdd, true));
+        if(!aFillerAlgo->isDone() || aFillerAlgo->shape()->isNull() || !aFillerAlgo->isValid()) {
+          myFeature->setError("Error: PaveFiller algorithm failed.");
+          return false;
+        }
+
+        aMakeShapeList->appendAlgo(aFillerAlgo);
+      }
+
+      theMakeShapes.push_back(aMakeShapeList);
       break;
     }
-    default: {
-      setError("Error: wrong type of boolean operation");
-      return;
-    }
   }
 
-  // Remove the rest results if there were produced in the previous pass.
-  removeResults(aResultIndex);
+  return true;
 }
 
 //=================================================================================================
-void FeaturesPlugin_CompositeBoolean::loadNamingDS(std::shared_ptr<ModelAPI_ResultBody> theResultBody,
-                                                   const std::shared_ptr<GeomAPI_Shape>& theBaseShape,
-                                                   const ListOfShape& theFaces,
-                                                   const std::list<std::shared_ptr<GeomAPI_Interface>>& theSolidsAlgos,
-                                                   const ListOfShape& theTools,
-                                                   const GeomAlgoAPI_Boolean& theAlgo)
+void FeaturesPlugin_CompositeBoolean::storeModificationHistory(ResultBodyPtr theResultBody,
+                                const GeomShapePtr theObject,
+                                const ListOfShape& theTools,
+                                const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+                                int& theTag)
 {
-  ModelAPI_BodyBuilder* aResultBuilder = theResultBody->getBodyBuilder();
-  //load result
-  if(theBaseShape->isEqual(theAlgo.shape())) {
-    aResultBuilder->store(theAlgo.shape());
-  } else {
-    const int aGenTag = 1;
-    const int aFrTag = 2;
-    const int aToTag = 3;
-    const int aModTag = 4;
-    const int aDelTag = 5;
-    const int aSubsolidsTag=6; /// sub solids will be placed at labels 6, 7, etc. if result is compound of solids
-    const std::string aGenName = "Generated";
-    const std::string aModName = "Modified";
-    const std::string aLatName = "LateralFace";
-    const std::string aFrName = "FromFace";
-    const std::string aToName = "ToFace";
-
-    aResultBuilder->storeModified(theBaseShape, theAlgo.shape(), aSubsolidsTag);
-
-    ListOfShape::const_iterator aFaceIter = theFaces.begin();
-    std::list<std::shared_ptr<GeomAPI_Interface>>::const_iterator aSolidsAlgosIter = theSolidsAlgos.begin();
-    for(; aFaceIter != theFaces.end() && aSolidsAlgosIter != theSolidsAlgos.end(); aFaceIter++, aSolidsAlgosIter++) {
-      std::shared_ptr<GeomAPI_Shape> aFromFace;
-      std::shared_ptr<GeomAPI_Shape> aToFace;
-      std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes;
-
-      //Insert lateral face : Face from Edge
-      if(std::dynamic_pointer_cast<GeomAlgoAPI_Prism>(*aSolidsAlgosIter)) {
-        std::shared_ptr<GeomAlgoAPI_Prism> aPrismAlgo = std::dynamic_pointer_cast<GeomAlgoAPI_Prism>(*aSolidsAlgosIter);
-        aSubShapes = aPrismAlgo->mapOfShapes();
-        aResultBuilder->loadAndOrientGeneratedShapes(aPrismAlgo->makeShape().get(), *aFaceIter, GeomAPI_Shape::EDGE, aGenTag,
-                                                    aLatName, *aSubShapes.get());
-        aFromFace = aPrismAlgo->firstShape();
-        aToFace = aPrismAlgo->lastShape();
-      } else if(std::dynamic_pointer_cast<GeomAlgoAPI_Revolution>(*aSolidsAlgosIter)) {
-        std::shared_ptr<GeomAlgoAPI_Revolution> aRevolAlgo = std::dynamic_pointer_cast<GeomAlgoAPI_Revolution>(*aSolidsAlgosIter);
-        aSubShapes = aRevolAlgo->mapOfShapes();
-        aResultBuilder->loadAndOrientGeneratedShapes(aRevolAlgo->makeShape().get(), *aFaceIter, GeomAPI_Shape::EDGE, aGenTag,
-                                                    aLatName, *aSubShapes.get());
-        aFromFace = aRevolAlgo->firstShape();
-        aToFace = aRevolAlgo->lastShape();
-      }
+  int aModTag = theTag;
+  int anEdgesAndFacesTag = ++aModTag;
+  int aDelTag = ++anEdgesAndFacesTag;
+  theTag = aDelTag;
 
-      //Insert bottom face
-      if(!aFromFace->isNull()) {
-        if(aSubShapes->isBound(aFromFace)) {
-          aFromFace = aSubShapes->find(aFromFace);
-        }
-        aResultBuilder->generated(aFromFace, aFrName, aFrTag);
-      }
+  const std::string aModName = "Modfied";
 
-      //Insert top face
-      if (!aToFace->isNull()) {
-        if (aSubShapes->isBound(aToFace)) {
-          aToFace = aSubShapes->find(aToFace);
-        }
-        aResultBuilder->generated(aToFace, aToName, aToTag);
-      }
-    }
+  ListOfShape aTools = theTools;
+  aTools.push_back(theObject);
 
-    aResultBuilder->loadAndOrientModifiedShapes(theAlgo.makeShape().get(), theBaseShape, GeomAPI_Shape::FACE,
-                                               aModTag, aModName, *theAlgo.mapOfShapes().get());
-    aResultBuilder->loadDeletedShapes(theAlgo.makeShape().get(), theBaseShape, GeomAPI_Shape::FACE, aDelTag);
+  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aMap = theMakeShape->mapOfSubShapes();
 
-    for(ListOfShape::const_iterator anIter = theTools.begin(); anIter != theTools.end(); anIter++) {
-      aResultBuilder->loadAndOrientModifiedShapes(theAlgo.makeShape().get(), *anIter, GeomAPI_Shape::FACE,
-                                                 aModTag, aModName, *theAlgo.mapOfShapes().get());
-      aResultBuilder->loadDeletedShapes(theAlgo.makeShape().get(), *anIter, GeomAPI_Shape::FACE, aDelTag);
+  int aTag;
+  std::string aName;
+  for(ListOfShape::const_iterator anIt = aTools.begin(); anIt != aTools.end(); anIt++) {
+    if((*anIt)->shapeType() == GeomAPI_Shape::EDGE) {
+      aTag = anEdgesAndFacesTag;
+      aName = aModName + "_Edge";
+    }
+    else if((*anIt)->shapeType() == GeomAPI_Shape::FACE) {
+      aTag = anEdgesAndFacesTag;
+      aName = aModName + "_Face";
+    } else {
+      aTag = aModTag;
+      aName = aModName;
     }
+    theResultBody->loadAndOrientModifiedShapes(theMakeShape.get(), *anIt,
+      (*anIt)->shapeType() == GeomAPI_Shape::EDGE ?
+      GeomAPI_Shape::EDGE : GeomAPI_Shape::FACE, aTag, aName, *aMap.get(), false, false, true);
+    theResultBody->loadDeletedShapes(theMakeShape.get(), *anIt, GeomAPI_Shape::FACE, aDelTag);
   }
 }