Salome HOME
Issue #1942: group - names are empty strings
[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Revolution.cpp
index 889cce3525eb00c6d3c9969290bcdd043349b5b2..feed9c76554e1a45d1045f550956e36eb1b4eb30 100644 (file)
@@ -7,6 +7,7 @@
 #include "GeomAlgoAPI_Revolution.h"
 
 #include <GeomAPI_Face.h>
+#include <GeomAPI_Pln.h>
 #include <GeomAPI_ShapeExplorer.h>
 #include <GeomAlgoAPI_DFLoader.h>
 #include <GeomAlgoAPI_FaceBuilder.h>
@@ -56,7 +57,25 @@ static gp_Pnt centreOfMass(const TopoDS_Shape& theShape);
 /// \return solid.
 static TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint);
 
-//=================================================================================================
+static void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
+                                   const TopoDS_Shape& theBase,
+                                   const TopAbs_ShapeEnum theType,
+                                   BRepPrimAPI_MakeRevol* theRevolBuilder);
+
+static void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
+                                   const TopoDS_Shape& theResult,
+                                   const TopAbs_ShapeEnum theType,
+                                   const TopoDS_Shape& theToFace,
+                                   const TopoDS_Shape& theFromFace);
+
+static void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
+                                   const TopoDS_Shape& theResult,
+                                   const TopAbs_ShapeEnum theType,
+                                   const TopoDS_Shape& theRotatedBoundingFace,
+                                   const TopoDS_Shape& theModifiedBaseShape,
+                                   const bool theIsFromFaceSet);
+
+//==================================================================================================
 GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr                 theBaseShape,
                                                const std::shared_ptr<GeomAPI_Ax1> theAxis,
                                                const double                       theToAngle,
@@ -65,7 +84,7 @@ GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr
   build(theBaseShape, theAxis, GeomShapePtr(), theToAngle, GeomShapePtr(), theFromAngle);
 }
 
-//=================================================================================================
+//==================================================================================================
 GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr                 theBaseShape,
                                                const std::shared_ptr<GeomAPI_Ax1> theAxis,
                                                const GeomShapePtr                 theToShape,
@@ -76,7 +95,7 @@ GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr
   build(theBaseShape, theAxis, theToShape, theToAngle, theFromShape, theFromAngle);
 }
 
-//=================================================================================================
+//==================================================================================================
 void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseShape,
                                    const std::shared_ptr<GeomAPI_Ax1>& theAxis,
                                    const GeomShapePtr&                 theToShape,
@@ -85,7 +104,8 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
                                    const double                        theFromAngle)
 {
   if(!theBaseShape || !theAxis ||
-    (((!theFromShape && !theToShape) || (theFromShape && theToShape && theFromShape->isEqual(theToShape)))
+    (((!theFromShape && !theToShape) ||
+    (theFromShape && theToShape && theFromShape->isEqual(theToShape)))
     && (theFromAngle == -theToAngle))) {
     return;
   }
@@ -105,6 +125,9 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     case TopAbs_SHELL:
       aShapeTypeToExp = TopAbs_FACE;
       break;
+    case TopAbs_COMPOUND:
+      aShapeTypeToExp = TopAbs_COMPOUND;
+      break;
     default:
       return;
   }
@@ -166,7 +189,8 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     if(!aBaseTransform) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBaseTransform)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aBaseTransform)));
     if(!aBaseTransform->IsDone()) {
       return;
     }
@@ -174,34 +198,35 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
 
     // Making revolution to the angle equal to the sum of "from angle" and "to angle".
     BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aRotatedBase,
-                                                                      anAxis,
-                                                                      (theFromAngle + theToAngle) / 180 * M_PI,
-                                                                      Standard_True);
+                                                        anAxis,
+                                                        (theFromAngle + theToAngle) / 180 * M_PI,
+                                                        Standard_True);
     if(!aRevolBuilder) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aRevolBuilder)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aRevolBuilder)));
     if(!aRevolBuilder->IsDone()) {
       return;
     }
     aResult = aRevolBuilder->Shape();
 
     // Setting naming.
-    for(TopExp_Explorer anExp(aRotatedBase, aShapeTypeToExp); anExp.More(); anExp.Next()) {
-      const TopoDS_Shape& aShape = anExp.Current();
-      GeomShapePtr aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape);
-      aFromShape->setImpl(new TopoDS_Shape(aRevolBuilder->FirstShape(aShape)));
-      aToShape->setImpl(new TopoDS_Shape(aRevolBuilder->LastShape(aShape)));
-      this->addFromShape(aFromShape);
-      this->addToShape(aToShape);
+    if(aShapeTypeToExp == TopAbs_COMPOUND) {
+      storeGenerationHistory(this, aRotatedBase, TopAbs_EDGE, aRevolBuilder);
+      storeGenerationHistory(this, aRotatedBase, TopAbs_FACE, aRevolBuilder);
+    } else {
+      storeGenerationHistory(this, aRotatedBase, aShapeTypeToExp, aRevolBuilder);
     }
   } else if(theFromShape && theToShape) { // Case 2: When both bounding planes were set.
     // Making revolution to the 360 angle.
-    BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aBaseShape, anAxis, 2 * M_PI, Standard_True);
+    BRepPrimAPI_MakeRevol* aRevolBuilder =
+      new BRepPrimAPI_MakeRevol(aBaseShape, anAxis, 2 * M_PI, Standard_True);
     if(!aRevolBuilder) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aRevolBuilder)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aRevolBuilder)));
     if(!aRevolBuilder->IsDone()) {
       return;
     }
@@ -214,11 +239,16 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     // Getting planes from bounding face.
     GeomLib_IsPlanarSurface isFromPlanar(BRep_Tool::Surface(aFromFace));
     GeomLib_IsPlanarSurface isToPlanar(BRep_Tool::Surface(aToFace));
-    if(!isFromPlanar.IsPlanar() || !isToPlanar.IsPlanar()) {// non-planar shapes is not supported for revolution bounding
+    if(!isFromPlanar.IsPlanar() || !isToPlanar.IsPlanar()) {
+      // non-planar shapes is not supported for revolution bounding
       return;
     }
-    gp_Pln aFromPln = isFromPlanar.Plan();
-    gp_Pln aToPln   = isToPlanar.Plan();
+
+    std::shared_ptr<GeomAPI_Face> aGeomFromFace(new GeomAPI_Face(theFromShape));
+    std::shared_ptr<GeomAPI_Face> aGeomToFace(new GeomAPI_Face(theToShape));
+
+    gp_Pln aFromPln = aGeomFromFace->getPlane()->impl<gp_Pln>();
+    gp_Pln aToPln   = aGeomToFace->getPlane()->impl<gp_Pln>();
 
     // Orienting bounding planes properly so that the center of mass of the base face stays
     // on the result shape after cut.
@@ -232,8 +262,12 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     // Rotating bounding planes to the specified angle.
     gp_Trsf aFromTrsf;
     gp_Trsf aToTrsf;
-    double aFromRotAngle = ((aFromPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theFromAngle : theFromAngle;
-    double aToRotAngle = ((aToPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theToAngle : theToAngle;
+    double aFromRotAngle =
+      ((aFromPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theFromAngle :
+                                                                              theFromAngle;
+    double aToRotAngle =
+      ((aToPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theToAngle :
+                                                                            theToAngle;
     aFromTrsf.SetRotation(anAxis,aFromRotAngle / 180.0 * M_PI);
     aToTrsf.SetRotation(anAxis, aToRotAngle / 180.0 * M_PI);
     BRepBuilderAPI_Transform aFromTransform(aFromSolid, aFromTrsf, true);
@@ -249,7 +283,8 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     if(!aFromCutBuilder->IsDone()) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aFromCutBuilder)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aFromCutBuilder)));
     aResult = aFromCutBuilder->Shape();
     if(aResult.ShapeType() == TopAbs_COMPOUND) {
       aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
@@ -261,7 +296,8 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     if(!aToCutBuilder->IsDone()) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aToCutBuilder)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aToCutBuilder)));
     aResult = aToCutBuilder->Shape();
     TopoDS_Iterator aCheckIt(aResult);
     if(!aCheckIt.More()) {
@@ -271,100 +307,59 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
       aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
     }
     if(aResult.ShapeType() == TopAbs_COMPOUND) {
-      GeomShapePtr aCompound(new GeomAPI_Shape);
-      aCompound->setImpl(new TopoDS_Shape(aResult));
+      std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+      aGeomShape->setImpl(new TopoDS_Shape(aResult));
       ListOfShape aCompSolids, aFreeSolids;
-      GeomAlgoAPI_ShapeTools::combineShapes(aCompound, GeomAPI_Shape::COMPSOLID, aCompSolids, aFreeSolids);
-      if(aCompSolids.size() == 1 && aFreeSolids.size() == 0) {
-        aResult = aCompSolids.front()->impl<TopoDS_Shape>();
-      } else if (aCompSolids.size() > 1 || (aCompSolids.size() >= 1 && aFreeSolids.size() >= 1)) {
-        TopoDS_Compound aResultComp;
-        TopoDS_Builder aBuilder;
-        aBuilder.MakeCompound(aResultComp);
-        for(ListOfShape::const_iterator anIter = aCompSolids.cbegin(); anIter != aCompSolids.cend(); anIter++) {
-          aBuilder.Add(aResultComp, (*anIter)->impl<TopoDS_Shape>());
-        }
-        for(ListOfShape::const_iterator anIter = aFreeSolids.cbegin(); anIter != aFreeSolids.cend(); anIter++) {
-          aBuilder.Add(aResultComp, (*anIter)->impl<TopoDS_Shape>());
-        }
-        aResult = aResultComp;
-      }
+      aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
+                                                         GeomAPI_Shape::COMPSOLID,
+                                                         aCompSolids,
+                                                         aFreeSolids);
+      aResult = aGeomShape->impl<TopoDS_Shape>();
     }
 
-    // If after cut we got more than one solids then take closest to the center of mass of the base face.
+    // If after cut we got more than one solids then take closest
+    // to the center of mass of the base face.
     aResult = findClosest(aResult, aBaseCentre);
 
     // Setting naming.
-    for(TopExp_Explorer anExp(aResult, aShapeTypeToExp); anExp.More (); anExp.Next ()) {
-      const TopoDS_Shape& aShape = anExp.Current();
-      GeomShapePtr aGeomSh(new GeomAPI_Shape());
-      if(aShapeTypeToExp == TopAbs_VERTEX) {
-        gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
-        IntTools_Context anIntTools;
-        if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(aRotatedToFace), Precision::Confusion()) == Standard_True) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          this->addToShape(aGeomSh);
-        }
-        if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(aRotatedFromFace), Precision::Confusion()) == Standard_True) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          this->addFromShape(aGeomSh);
-        }
-      } else if(aShapeTypeToExp == TopAbs_EDGE) {
-        TopoDS_Edge anEdge = TopoDS::Edge(aShape);
-        BRepLib_CheckCurveOnSurface anEdgeCheck(anEdge, TopoDS::Face(aRotatedToFace));
-        anEdgeCheck.Perform();
-        if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          this->addToShape(aGeomSh);
-        }
-        anEdgeCheck.Init(anEdge, TopoDS::Face(aRotatedFromFace));
-        anEdgeCheck.Perform();
-        if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          this->addFromShape(aGeomSh);
-        }
-      } else {
-        Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aShape));
-        Handle(Geom_Surface) aFromSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedFromFace));
-        Handle(Geom_Surface) aToSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedToFace));
-        if(aFaceSurface == aFromSurface) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          this->addFromShape(aGeomSh);
-        }
-        if(aFaceSurface == aToSurface) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          this->addToShape(aGeomSh);
-        }
-      }
+    if(aShapeTypeToExp == TopAbs_COMPOUND) {
+      storeGenerationHistory(this, aResult, TopAbs_EDGE, aRotatedToFace, aRotatedFromFace);
+      storeGenerationHistory(this, aResult, TopAbs_FACE, aRotatedToFace, aRotatedFromFace);
+    } else {
+      storeGenerationHistory(this, aResult, aShapeTypeToExp, aRotatedToFace, aRotatedFromFace);
     }
   } else { //Case 3: When only one bounding plane was set.
     // Making revolution to the 360 angle.
-    BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aBaseShape, anAxis, 2 * M_PI, Standard_True);
+    BRepPrimAPI_MakeRevol* aRevolBuilder =
+      new BRepPrimAPI_MakeRevol(aBaseShape, anAxis, 2 * M_PI, Standard_True);
     if(!aRevolBuilder) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aRevolBuilder)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aRevolBuilder)));
     if(!aRevolBuilder->IsDone()) {
       return;
     }
     aResult = aRevolBuilder->Shape();
 
     // Getting bounding face.
-    TopoDS_Face aBoundingFace;
     bool isFromFaceSet = false;
+    std::shared_ptr<GeomAPI_Face> aGeomBoundingFace;
     if(theFromShape) {
-      aBoundingFace = TopoDS::Face(theFromShape->impl<TopoDS_Shape>());
+      aGeomBoundingFace.reset(new GeomAPI_Face(theFromShape));
       isFromFaceSet = true;
     } else if(theToShape) {
-      aBoundingFace = TopoDS::Face(theToShape->impl<TopoDS_Shape>());
+      aGeomBoundingFace.reset(new GeomAPI_Face(theToShape));
     }
+    TopoDS_Face aBoundingFace = TopoDS::Face(aGeomBoundingFace->impl<TopoDS_Shape>());
 
     // Getting plane from bounding face.
     GeomLib_IsPlanarSurface isBoundingPlanar(BRep_Tool::Surface(aBoundingFace));
     if(!isBoundingPlanar.IsPlanar()) { // non-planar shapes is not supported for revolution bounding
       return;
     }
-    gp_Pln aBoundingPln = isBoundingPlanar.Plan();
+
+    gp_Pln aBoundingPln = aGeomBoundingFace->getPlane()->impl<gp_Pln>();
 
     // Orienting bounding plane properly so that the center of mass of the base face stays
     // on the result shape after cut.
@@ -396,14 +391,15 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     if(!aBoundingCutBuilder->IsDone()) {
       return;
     }
-    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBoundingCutBuilder)));
+    this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+      new GeomAlgoAPI_MakeShape(aBoundingCutBuilder)));
     aResult = aBoundingCutBuilder->Shape();
     if(aResult.ShapeType() == TopAbs_COMPOUND) {
       aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
     }
 
     // Setting naming.
-    if(aShapeTypeToExp == TopAbs_FACE) {
+    if(aShapeTypeToExp == TopAbs_FACE || aShapeTypeToExp == TopAbs_COMPOUND) {
       const TopTools_ListOfShape& aBndShapes = aBoundingCutBuilder->Modified(aBoundingFace);
       for(TopTools_ListIteratorOfListOfShape anIt(aBndShapes); anIt.More(); anIt.Next()) {
         GeomShapePtr aShape(new GeomAPI_Shape());
@@ -426,7 +422,8 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
                                                              aBasePlane->Axis().Direction().Z()));
       GeomShapePtr aPln = GeomAlgoAPI_FaceBuilder::planarFace(theCenter, theNormal);
       aList.push_back(aSh);
-      std::list<std::shared_ptr<GeomAPI_Pnt> > aBoundingPoints = GeomAlgoAPI_ShapeTools::getBoundingBox(aList);
+      std::list<std::shared_ptr<GeomAPI_Pnt> >
+        aBoundingPoints = GeomAlgoAPI_ShapeTools::getBoundingBox(aList);
       aSh = GeomAlgoAPI_ShapeTools::fitPlaneToBox(aPln, aBoundingPoints);
       aModifiedBaseShape = aSh->impl<TopoDS_Shape>();
     } else {
@@ -460,12 +457,13 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
       TopoDS_Shape aCutResult = aBaseCutBuilder->Shape();
       TopoDS_Iterator aCheckIt(aCutResult);
       if(aCheckIt.More()) {
-        this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBaseCutBuilder)));
+        this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
+          new GeomAlgoAPI_MakeShape(aBaseCutBuilder)));
         aResult = aCutResult;
         if(aResult.ShapeType() == TopAbs_COMPOUND) {
           aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
         }
-        if(aShapeTypeToExp == TopAbs_FACE) {
+        if(aShapeTypeToExp == TopAbs_FACE || aShapeTypeToExp == TopAbs_COMPOUND) {
           const TopTools_ListOfShape& aBsShapes = aBaseCutBuilder->Modified(aBoundingFace);
           for(TopTools_ListIteratorOfListOfShape anIt(aBsShapes); anIt.More(); anIt.Next()) {
             GeomShapePtr aShape(new GeomAPI_Shape());
@@ -477,71 +475,29 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
     }
 
     if(aResult.ShapeType() == TopAbs_COMPOUND) {
-      GeomShapePtr aCompound(new GeomAPI_Shape);
-      aCompound->setImpl(new TopoDS_Shape(aResult));
+      std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+      aGeomShape->setImpl(new TopoDS_Shape(aResult));
       ListOfShape aCompSolids, aFreeSolids;
-      GeomAlgoAPI_ShapeTools::combineShapes(aCompound, GeomAPI_Shape::COMPSOLID, aCompSolids, aFreeSolids);
-      if(aCompSolids.size() == 1 && aFreeSolids.size() == 0) {
-        aResult = aCompSolids.front()->impl<TopoDS_Shape>();
-      } else if (aCompSolids.size() > 1 || (aCompSolids.size() >= 1 && aFreeSolids.size() >= 1)) {
-        TopoDS_Compound aResultComp;
-        TopoDS_Builder aBuilder;
-        aBuilder.MakeCompound(aResultComp);
-        for(ListOfShape::const_iterator anIter = aCompSolids.cbegin(); anIter != aCompSolids.cend(); anIter++) {
-          aBuilder.Add(aResultComp, (*anIter)->impl<TopoDS_Shape>());
-        }
-        for(ListOfShape::const_iterator anIter = aFreeSolids.cbegin(); anIter != aFreeSolids.cend(); anIter++) {
-          aBuilder.Add(aResultComp, (*anIter)->impl<TopoDS_Shape>());
-        }
-        aResult = aResultComp;
-      }
+      aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
+                                                         GeomAPI_Shape::COMPSOLID,
+                                                         aCompSolids,
+                                                         aFreeSolids);
+      aResult = aGeomShape->impl<TopoDS_Shape>();
     }
 
-    // If after cut we got more than one solids then take closest to the center of mass of the base face.
+    // If after cut we got more than one solids then take
+    // closest to the center of mass of the base face.
     aResult = findClosest(aResult, aBaseCentre);
 
     // Setting naming.
-    for(TopExp_Explorer anExp(aResult, aShapeTypeToExp); anExp.More (); anExp.Next ()) {
-      const TopoDS_Shape& aShape = anExp.Current();
-      GeomShapePtr aGeomSh(new GeomAPI_Shape());
-      if(aShapeTypeToExp == TopAbs_VERTEX) {
-        gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
-        IntTools_Context anIntTools;
-        if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(aRotatedBoundingFace), Precision::Confusion()) == Standard_True) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          isFromFaceSet ? this->addFromShape(aGeomSh) : this->addToShape(aGeomSh);
-        }
-        if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(aModifiedBaseShape), Precision::Confusion()) == Standard_True) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          isFromFaceSet ? this->addToShape(aGeomSh) : this->addFromShape(aGeomSh);
-        }
-      } else if(aShapeTypeToExp == TopAbs_EDGE) {
-        TopoDS_Edge anEdge = TopoDS::Edge(aShape);
-        BRepLib_CheckCurveOnSurface anEdgeCheck(anEdge, TopoDS::Face(aRotatedBoundingFace));
-        anEdgeCheck.Perform();
-        if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          isFromFaceSet ? this->addFromShape(aGeomSh) : this->addToShape(aGeomSh);
-        }
-        anEdgeCheck.Init(anEdge, TopoDS::Face(aModifiedBaseShape));
-        anEdgeCheck.Perform();
-        if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          isFromFaceSet ? this->addToShape(aGeomSh) : this->addFromShape(aGeomSh);
-        }
-      } else {
-        Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aShape));
-        Handle(Geom_Surface) aBoundingSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedBoundingFace));
-        Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(TopoDS::Face(aModifiedBaseShape));
-        if(aFaceSurface == aBoundingSurface) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          isFromFaceSet ? this->addFromShape(aGeomSh) : this->addToShape(aGeomSh);
-        }
-        if(aFaceSurface == aBaseSurface) {
-          aGeomSh->setImpl(new TopoDS_Shape(aShape));
-          isFromFaceSet ? this->addToShape(aGeomSh) : this->addFromShape(aGeomSh);
-        }
-      }
+    if(aShapeTypeToExp == TopAbs_COMPOUND) {
+      storeGenerationHistory(this, aResult, TopAbs_EDGE,
+        aRotatedBoundingFace, aModifiedBaseShape, isFromFaceSet);
+      storeGenerationHistory(this, aResult, TopAbs_FACE,
+        aRotatedBoundingFace, aModifiedBaseShape, isFromFaceSet);
+    } else {
+      storeGenerationHistory(this, aResult, aShapeTypeToExp,
+        aRotatedBoundingFace, aModifiedBaseShape, isFromFaceSet);
     }
   }
 
@@ -556,7 +512,7 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr&                 theBaseSh
   this->setDone(true);
 }
 
-//=================================================================================================
+//==================================================================================================
 TopoDS_Face makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint)
 {
   if(!thePlane.Contains(thePoint, Precision::Confusion())) {
@@ -571,7 +527,7 @@ TopoDS_Face makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint)
   return aResultFace;
 }
 
-//=================================================================================================
+//==================================================================================================
 TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape)
 {
   TopoDS_Shell aShell;
@@ -590,7 +546,7 @@ TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape)
   return aSolid;
 }
 
-//=================================================================================================
+//================================================================================================
 gp_Pnt centreOfMass(const TopoDS_Shape& theShape)
 {
   TopAbs_ShapeEnum aShType = theShape.ShapeType();
@@ -607,7 +563,7 @@ gp_Pnt centreOfMass(const TopoDS_Shape& theShape)
   return aGProps.CentreOfMass();
 }
 
-//=================================================================================================
+//================================================================================================
 TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint)
 {
   TopoDS_Shape aResult = theShape;
@@ -630,3 +586,132 @@ TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint)
 
   return aResult;
 }
+
+//================================================================================================
+void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
+                            const TopoDS_Shape& theBase,
+                            const TopAbs_ShapeEnum theType,
+                            BRepPrimAPI_MakeRevol* theRevolBuilder)
+{
+  for(TopExp_Explorer anExp(theBase, theType); anExp.More(); anExp.Next()) {
+    const TopoDS_Shape& aShape = anExp.Current();
+    GeomShapePtr aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape);
+    aFromShape->setImpl(new TopoDS_Shape(theRevolBuilder->FirstShape(aShape)));
+    aToShape->setImpl(new TopoDS_Shape(theRevolBuilder->LastShape(aShape)));
+    theRevolutionAlgo->addFromShape(aFromShape);
+    theRevolutionAlgo->addToShape(aToShape);
+  }
+}
+
+//================================================================================================
+void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
+                            const TopoDS_Shape& theResult,
+                            const TopAbs_ShapeEnum theType,
+                            const TopoDS_Shape& theToFace,
+                            const TopoDS_Shape& theFromFace)
+{
+  for(TopExp_Explorer anExp(theResult, theType); anExp.More (); anExp.Next ()) {
+    const TopoDS_Shape& aShape = anExp.Current();
+    GeomShapePtr aGeomSh(new GeomAPI_Shape());
+    if(theType == TopAbs_VERTEX) {
+      gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
+      IntTools_Context anIntTools;
+      if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theToFace),
+          Precision::Confusion()) == Standard_True) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theRevolutionAlgo->addToShape(aGeomSh);
+      }
+      if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theFromFace),
+          Precision::Confusion()) == Standard_True) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theRevolutionAlgo->addFromShape(aGeomSh);
+      }
+    } else if(theType == TopAbs_EDGE) {
+      TopoDS_Edge anEdge = TopoDS::Edge(aShape);
+      BRepLib_CheckCurveOnSurface anEdgeCheck(anEdge, TopoDS::Face(theToFace));
+      anEdgeCheck.Perform();
+      if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theRevolutionAlgo->addToShape(aGeomSh);
+      }
+      anEdgeCheck.Init(anEdge, TopoDS::Face(theFromFace));
+      anEdgeCheck.Perform();
+      if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theRevolutionAlgo->addFromShape(aGeomSh);
+      }
+    } else {
+      Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aShape));
+      Handle(Geom_Surface) aFromSurface = BRep_Tool::Surface(TopoDS::Face(theFromFace));
+      Handle(Geom_Surface) aToSurface = BRep_Tool::Surface(TopoDS::Face(theToFace));
+      if(aFaceSurface == aFromSurface) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theRevolutionAlgo->addFromShape(aGeomSh);
+      }
+      if(aFaceSurface == aToSurface) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theRevolutionAlgo->addToShape(aGeomSh);
+      }
+    }
+  }
+}
+
+void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
+                            const TopoDS_Shape& theResult,
+                            const TopAbs_ShapeEnum theType,
+                            const TopoDS_Shape& theRotatedBoundingFace,
+                            const TopoDS_Shape& theModifiedBaseShape,
+                            const bool theIsFromFaceSet)
+{
+  for(TopExp_Explorer anExp(theResult, theType); anExp.More (); anExp.Next ()) {
+    const TopoDS_Shape& aShape = anExp.Current();
+    GeomShapePtr aGeomSh(new GeomAPI_Shape());
+    if(theType == TopAbs_VERTEX) {
+      gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
+      IntTools_Context anIntTools;
+      if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theRotatedBoundingFace),
+          Precision::Confusion()) == Standard_True) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+                           theRevolutionAlgo->addToShape(aGeomSh);
+      }
+      if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theModifiedBaseShape),
+         Precision::Confusion()) == Standard_True) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+                           theRevolutionAlgo->addFromShape(aGeomSh);
+      }
+    } else if(theType == TopAbs_EDGE) {
+      TopoDS_Edge anEdge = TopoDS::Edge(aShape);
+      BRepLib_CheckCurveOnSurface anEdgeCheck(anEdge, TopoDS::Face(theRotatedBoundingFace));
+      anEdgeCheck.Perform();
+      if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+                           theRevolutionAlgo->addToShape(aGeomSh);
+      }
+      anEdgeCheck.Init(anEdge, TopoDS::Face(theModifiedBaseShape));
+      anEdgeCheck.Perform();
+      if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+                           theRevolutionAlgo->addFromShape(aGeomSh);
+      }
+    } else {
+      Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aShape));
+      Handle(Geom_Surface) aBoundingSurface =
+        BRep_Tool::Surface(TopoDS::Face(theRotatedBoundingFace));
+      Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(TopoDS::Face(theModifiedBaseShape));
+      if(aFaceSurface == aBoundingSurface) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+                           theRevolutionAlgo->addToShape(aGeomSh);
+      }
+      if(aFaceSurface == aBaseSurface) {
+        aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+                           theRevolutionAlgo->addFromShape(aGeomSh);
+      }
+    }
+  }
+}