X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Revolution.cpp;h=b6bc188eb31df6716fecf47f466ecd6a0b8ac89f;hb=a8cfbfb436c27ff96edd5c808e9a452c35cef207;hp=f47d8a06ff23c56be6f87a4ce88c238bbbf1791c;hpb=8ca8dcce41467a32024022e8930716d0d635d82f;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp index f47d8a06f..b6bc188eb 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp @@ -4,160 +4,228 @@ // Created: 12 May 2015 // Author: Dmitry Bobylev -#include +#include "GeomAlgoAPI_Revolution.h" +#include +#include #include +#include #include -#include -#include +#include #include #include #include +#include #include #include #include +#include +#include +#include #include #include +#include #include -#include #include #include #include +#include #include #include - -//================================================================================================= -GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(std::shared_ptr theBasis, - std::shared_ptr theAxis, - double theToAngle, - double theFromAngle) -: myDone(false) +#include +#include + +/// \brief Constructs infinite face from thePlane, and with axis located on the same side +/// of the plane as thePoint. Modifies thePlane axis direction. +/// \param[in,out] thePlane plane to construct face. +/// \param[in] thePoint point to locate plane axis. +/// \return constructed face. +static TopoDS_Face makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint); + +/// \return solid created from face or shell. +static TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape); + +/// \brief return centre of mass for theShape. +/// \param[in] theShape shape. +static gp_Pnt centreOfMass(const TopoDS_Shape& theShape); + +/// \brief Selects solid from theShape with closest center of mass to thePoint +/// \param[in] theShape compound with solids. +/// \param[in] thePoint point. +/// \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 theAxis, + const double theToAngle, + const double theFromAngle) { - build(theBasis, theAxis, std::shared_ptr(), theToAngle, std::shared_ptr(), theFromAngle); + build(theBaseShape, theAxis, GeomShapePtr(), theToAngle, GeomShapePtr(), theFromAngle); } -//================================================================================================= -GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(std::shared_ptr theBasis, - std::shared_ptr theAxis, - std::shared_ptr theToShape, - double theToAngle, - std::shared_ptr theFromShape, - double theFromAngle) -: myDone(false) +//================================================================================================== +GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr theBaseShape, + const std::shared_ptr theAxis, + const GeomShapePtr theToShape, + const double theToAngle, + const GeomShapePtr theFromShape, + const double theFromAngle) { - build(theBasis, theAxis, theToShape, theToAngle, theFromShape, theFromAngle); + build(theBaseShape, theAxis, theToShape, theToAngle, theFromShape, theFromAngle); } -//================================================================================================= -TopoDS_Face GeomAlgoAPI_Revolution::makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint) +//================================================================================================== +void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseShape, + const std::shared_ptr& theAxis, + const GeomShapePtr& theToShape, + const double theToAngle, + const GeomShapePtr& theFromShape, + const double theFromAngle) { - gp_XYZ aVec = thePoint.XYZ() - thePlane.Location().XYZ(); - double aSign = aVec * thePlane.Axis().Direction().XYZ(); - if(aSign < 0) thePlane.SetAxis(thePlane.Axis().Reversed()); - - BRepBuilderAPI_MakeFace aMakeFace(thePlane); - TopoDS_Face aResultFace = TopoDS::Face(aMakeFace.Shape()); - - return aResultFace; -} - -//================================================================================================= -TopoDS_Solid GeomAlgoAPI_Revolution::makeSolidFromFace(const TopoDS_Face& theFace) -{ - TopoDS_Shell aShell; - TopoDS_Solid aSolid; + if(!theBaseShape || !theAxis || + (((!theFromShape && !theToShape) || (theFromShape && theToShape && theFromShape->isEqual(theToShape))) + && (theFromAngle == -theToAngle))) { + return; + } - BRep_Builder aBoundingBuilder; - aBoundingBuilder.MakeShell(aShell); - aBoundingBuilder.Add(aShell, theFace); - aBoundingBuilder.MakeSolid(aSolid); - aBoundingBuilder.Add(aSolid, aShell); + // Getting base shape. + const TopoDS_Shape& aBaseShape = theBaseShape->impl(); + TopAbs_ShapeEnum aShapeTypeToExp; + switch(aBaseShape.ShapeType()) { + case TopAbs_VERTEX: + aShapeTypeToExp = TopAbs_VERTEX; + break; + case TopAbs_EDGE: + case TopAbs_WIRE: + aShapeTypeToExp = TopAbs_EDGE; + break; + case TopAbs_FACE: + case TopAbs_SHELL: + aShapeTypeToExp = TopAbs_FACE; + break; + case TopAbs_COMPOUND: + aShapeTypeToExp = TopAbs_COMPOUND; + break; + default: + return; + } - return aSolid; -} + // Getting axis. + gp_Ax1 anAxis = theAxis->impl(); -//================================================================================================= -TopoDS_Shape GeomAlgoAPI_Revolution::findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint) -{ - TopoDS_Shape aResult = theShape; + // Getting base plane. + Handle(Geom_Plane) aBasePlane; + BRepBuilderAPI_FindPlane aFindPlane(aBaseShape); + if(aShapeTypeToExp == TopAbs_FACE && aFindPlane.Found() == Standard_True) { + aBasePlane = aFindPlane.Plane(); + } else { + gp_Pnt aPnt1 = anAxis.Location(); + gp_Pnt aPnt2 = aPnt1; + aPnt2.Translate(anAxis.Direction()); + gp_Pnt aPnt3; + + for(TopExp_Explorer anExp(aBaseShape, TopAbs_VERTEX); anExp.More(); anExp.Next()) { + aPnt3 = BRep_Tool::Pnt(TopoDS::Vertex(anExp.Current())); + + GC_MakePlane aMkPlane(aPnt1, aPnt2, aPnt3); + if(aMkPlane.IsDone() != Standard_True) { + continue; + } - if(theShape.ShapeType() == TopAbs_COMPOUND) { - double aMinDistance = Precision::Infinite(); - double aCurDistance; - GProp_GProps aGProps; - gp_Pnt aCentr; + aBasePlane = aMkPlane.Value(); + break; + } - for (TopoDS_Iterator anItr(theShape); anItr.More(); anItr.Next()) { - TopoDS_Shape aValue = anItr.Value(); - BRepGProp::VolumeProperties(aValue, aGProps); - aCentr = aGProps.CentreOfMass(); - aCurDistance = aCentr.Distance(thePoint); + if(aBasePlane.IsNull()) { + aPnt3 = centreOfMass(aBaseShape); - if(aCurDistance < aMinDistance) { - aMinDistance = aCurDistance; - aResult = aValue; + GC_MakePlane aMkPlane(aPnt1, aPnt2, aPnt3); + if(aMkPlane.IsDone() != Standard_True) { + return; } - } - } - - return aResult; -} -//================================================================================================= -void GeomAlgoAPI_Revolution::build(const std::shared_ptr& theBasis, - const std::shared_ptr& theAxis, - const std::shared_ptr& theToShape, - double theToAngle, - const std::shared_ptr& theFromShape, - double theFromAngle) -{ - if(!theBasis || !theAxis || - (((!theFromShape && !theToShape) || (theFromShape && theToShape && theFromShape->isEqual(theToShape))) - && (theFromAngle == 0.0 && theToAngle == 0.0))) { - return; + aBasePlane = aMkPlane.Value(); + } } - TopoDS_Face aBasisFace = TopoDS::Face(theBasis->impl()); - GeomLib_IsPlanarSurface isBasisPlanar(BRep_Tool::Surface(aBasisFace)); - if(!isBasisPlanar.IsPlanar()) {// non-planar shapes is not supported for revolution - return; + if(aShapeTypeToExp == TopAbs_FACE) { + if(aBasePlane->Axis().Angle(anAxis) < Precision::Confusion()) { + return; + } } - gp_Pln aBasisPln = isBasisPlanar.Plan(); - gp_Ax1 anAxis = theAxis->impl(); - ListOfMakeShape aListOfMakeShape; - myFirst = std::shared_ptr(new GeomAPI_Shape()); - myLast = std::shared_ptr(new GeomAPI_Shape()); + gp_Pnt aBaseCentre = GeomAlgoAPI_ShapeTools::centreOfMass(theBaseShape)->impl(); TopoDS_Shape aResult; if(!theFromShape && !theToShape) { // Case 1: When only angles was set. // Rotating base face with the negative value of "from angle". gp_Trsf aBaseTrsf; aBaseTrsf.SetRotation(anAxis, -theFromAngle / 180.0 * M_PI); - BRepBuilderAPI_Transform* aBaseTransform = new BRepBuilderAPI_Transform(aBasisFace, + BRepBuilderAPI_Transform* aBaseTransform = new BRepBuilderAPI_Transform(aBaseShape, aBaseTrsf, true); - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBaseTransform))); - TopoDS_Shape aRotatedBaseShape = aBaseTransform->Shape(); + if(!aBaseTransform) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBaseTransform))); + if(!aBaseTransform->IsDone()) { + return; + } + TopoDS_Shape aRotatedBase = aBaseTransform->Shape(); // Making revolution to the angle equal to the sum of "from angle" and "to angle". - double anAngle = theFromAngle + theToAngle; - BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aRotatedBaseShape, - anAxis, - anAngle / 180 * M_PI, - Standard_True); - aRevolBuilder->Build(); + BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aRotatedBase, + anAxis, + (theFromAngle + theToAngle) / 180 * M_PI, + Standard_True); + if(!aRevolBuilder) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aRevolBuilder))); if(!aRevolBuilder->IsDone()) { return; } - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aRevolBuilder))); aResult = aRevolBuilder->Shape(); // Setting naming. - myFirst->setImpl(new TopoDS_Shape(aRevolBuilder->FirstShape())); - myLast->setImpl(new TopoDS_Shape(aRevolBuilder->LastShape())); + 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); + if(!aRevolBuilder) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aRevolBuilder))); + if(!aRevolBuilder->IsDone()) { + return; + } + aResult = aRevolBuilder->Shape(); + // Getting bounding faces. TopoDS_Face aFromFace = TopoDS::Face(theFromShape->impl()); TopoDS_Face aToFace = TopoDS::Face(theToShape->impl()); @@ -173,19 +241,18 @@ void GeomAlgoAPI_Revolution::build(const std::shared_ptr& theBasi // Orienting bounding planes properly so that the center of mass of the base face stays // on the result shape after cut. - gp_Pnt aBasisCentr = GeomAlgoAPI_ShapeProps::centreOfMass(theBasis)->impl(); - aFromFace = makeFaceFromPlane(aFromPln, aBasisCentr); - aToFace = makeFaceFromPlane(aToPln, aBasisCentr); + aFromFace = makeFaceFromPlane(aFromPln, aBaseCentre); + aToFace = makeFaceFromPlane(aToPln, aBaseCentre); // Making solids from bounding planes and putting them in compound. - TopoDS_Shape aFromSolid = makeSolidFromFace(aFromFace); - TopoDS_Shape aToSolid = makeSolidFromFace(aToFace); + TopoDS_Shape aFromSolid = makeSolidFromShape(aFromFace); + TopoDS_Shape aToSolid = makeSolidFromShape(aToFace); // Rotating bounding planes to the specified angle. gp_Trsf aFromTrsf; gp_Trsf aToTrsf; - double aFromRotAngle = ((aFromPln.Axis().Direction() * aBasisPln.Axis().Direction()) > 0) ? -theFromAngle : theFromAngle; - double aToRotAngle = ((aToPln.Axis().Direction() * aBasisPln.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); @@ -195,20 +262,17 @@ void GeomAlgoAPI_Revolution::build(const std::shared_ptr& theBasi aFromSolid = aFromTransform.Shape(); aToSolid = aToTransform.Shape(); - // Making revolution to the 360 angle. - BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aBasisFace, anAxis, 2 * M_PI, Standard_True); - aRevolBuilder->Build(); - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aRevolBuilder))); - TopoDS_Shape aRevolShape = aRevolBuilder->Shape(); - // Cutting revolution with from plane. - BRepAlgoAPI_Cut* aFromCutBuilder = new BRepAlgoAPI_Cut(aRevolShape, aFromSolid); + BRepAlgoAPI_Cut* aFromCutBuilder = new BRepAlgoAPI_Cut(aResult, aFromSolid); aFromCutBuilder->Build(); if(!aFromCutBuilder->IsDone()) { return; } - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aFromCutBuilder))); + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aFromCutBuilder))); aResult = aFromCutBuilder->Shape(); + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } // Cutting revolution with to plane. BRepAlgoAPI_Cut* aToCutBuilder = new BRepAlgoAPI_Cut(aResult, aToSolid); @@ -216,26 +280,48 @@ void GeomAlgoAPI_Revolution::build(const std::shared_ptr& theBasi if(!aToCutBuilder->IsDone()) { return; } - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aToCutBuilder))); + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aToCutBuilder))); aResult = aToCutBuilder->Shape(); + TopoDS_Iterator aCheckIt(aResult); + if(!aCheckIt.More()) { + return; + } + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } + if(aResult.ShapeType() == TopAbs_COMPOUND) { + std::shared_ptr aGeomShape(new GeomAPI_Shape); + aGeomShape->setImpl(new TopoDS_Shape(aResult)); + ListOfShape aCompSolids, aFreeSolids; + aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape, + GeomAPI_Shape::COMPSOLID, + aCompSolids, + aFreeSolids); + aResult = aGeomShape->impl(); + } // If after cut we got more than one solids then take closest to the center of mass of the base face. - aResult = findClosest(aResult, aBasisCentr); + aResult = findClosest(aResult, aBaseCentre); // Setting naming. - for(TopExp_Explorer anExp(aResult, TopAbs_FACE); anExp.More (); anExp.Next ()) { - const TopoDS_Shape& aFaceOnResult = anExp.Current(); - Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aFaceOnResult)); - Handle(Geom_Surface) aFromSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedFromFace)); - Handle(Geom_Surface) aToSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedToFace)); - if(aFaceSurface == aFromSurface) { - myFirst->setImpl(new TopoDS_Shape(aFaceOnResult)); - } - if(aFaceSurface == aToSurface) { - myLast->setImpl(new TopoDS_Shape(aFaceOnResult)); - } + 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); + if(!aRevolBuilder) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aRevolBuilder))); + if(!aRevolBuilder->IsDone()) { + return; + } + aResult = aRevolBuilder->Shape(); + // Getting bounding face. TopoDS_Face aBoundingFace; bool isFromFaceSet = false; @@ -255,18 +341,17 @@ void GeomAlgoAPI_Revolution::build(const std::shared_ptr& theBasi // Orienting bounding plane properly so that the center of mass of the base face stays // on the result shape after cut. - gp_Pnt aBasisCentr = GeomAlgoAPI_ShapeProps::centreOfMass(theBasis)->impl(); - aBoundingFace = makeFaceFromPlane(aBoundingPln, aBasisCentr); + aBoundingFace = makeFaceFromPlane(aBoundingPln, aBaseCentre); // Making solid from bounding plane. - TopoDS_Shape aBoundingSolid = makeSolidFromFace(aBoundingFace); + TopoDS_Shape aBoundingSolid = makeSolidFromShape(aBoundingFace); // Rotating bounding plane to the specified angle. double aBoundingRotAngle = isFromFaceSet ? theFromAngle : theToAngle; - if(aBoundingPln.Axis().IsParallel(aBasisPln.Axis(), Precision::Confusion())) { + if(aBoundingPln.Axis().IsParallel(aBasePlane->Axis(), Precision::Confusion())) { if(isFromFaceSet) aBoundingRotAngle = -aBoundingRotAngle; } else { - double aSign = (aBoundingPln.Axis().Direction() ^ aBasisPln.Axis().Direction()) * + double aSign = (aBoundingPln.Axis().Direction() ^ aBasePlane->Axis().Direction()) * anAxis.Direction(); if((aSign <= 0 && !isFromFaceSet) || (aSign > 0 && isFromFaceSet)) { aBoundingRotAngle = -aBoundingRotAngle; @@ -278,148 +363,315 @@ void GeomAlgoAPI_Revolution::build(const std::shared_ptr& theBasi TopoDS_Shape aRotatedBoundingFace = aBoundingTransform.Modified(aBoundingFace).First(); aBoundingSolid = aBoundingTransform.Shape(); - // Making revolution to the 360 angle. - BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aBasisFace, anAxis, 2 * M_PI, Standard_True); - aRevolBuilder->Build(); - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aRevolBuilder))); - TopoDS_Shape aRevolShape = aRevolBuilder->Shape(); - // Cutting revolution with bounding plane. - BRepAlgoAPI_Cut* aBoundingCutBuilder = new BRepAlgoAPI_Cut(aRevolShape, aBoundingSolid); + BRepAlgoAPI_Cut* aBoundingCutBuilder = new BRepAlgoAPI_Cut(aResult, aBoundingSolid); aBoundingCutBuilder->Build(); if(!aBoundingCutBuilder->IsDone()) { return; } - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBoundingCutBuilder))); + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBoundingCutBuilder))); aResult = aBoundingCutBuilder->Shape(); - TopExp_Explorer anExp1(aResult, TopAbs_SOLID); + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } // Setting naming. - if(aBoundingCutBuilder->Modified(aBoundingFace).Extent() > 0) { - std::shared_ptr aPtr = isFromFaceSet ? myFirst : myLast; - aPtr->setImpl(new TopoDS_Shape(aBoundingCutBuilder->Modified(aBoundingFace).First())); + 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()); + aShape->setImpl(new TopoDS_Shape(anIt.Value())); + isFromFaceSet ? this->addFromShape(aShape) : this->addToShape(aShape); + } } // Try to cut with base face. If it can not be done then keep result of cut with bounding plane. + TopoDS_Shape aModifiedBaseShape; + if(aShapeTypeToExp != TopAbs_FACE) { + ListOfShape aList; + GeomShapePtr aSh(new GeomAPI_Shape()); + aSh->setImpl(new TopoDS_Shape(aBaseShape)); + std::shared_ptr theCenter(new GeomAPI_Pnt(aBasePlane->Location().X(), + aBasePlane->Location().Y(), + aBasePlane->Location().Z())); + std::shared_ptr theNormal(new GeomAPI_Dir(aBasePlane->Axis().Direction().X(), + aBasePlane->Axis().Direction().Y(), + aBasePlane->Axis().Direction().Z())); + GeomShapePtr aPln = GeomAlgoAPI_FaceBuilder::planarFace(theCenter, theNormal); + aList.push_back(aSh); + std::list > aBoundingPoints = GeomAlgoAPI_ShapeTools::getBoundingBox(aList); + aSh = GeomAlgoAPI_ShapeTools::fitPlaneToBox(aPln, aBoundingPoints); + aModifiedBaseShape = aSh->impl(); + } else { + aModifiedBaseShape = aBaseShape; + } if(isFromFaceSet) { - aBasisFace.Orientation(TopAbs_REVERSED); - } - - // Making solid from basis face. - TopoDS_Shape aBasisSolid = makeSolidFromFace(aBasisFace); - - // Rotating basis face to the specified angle. - gp_Trsf aBasisTrsf; - double aBasisRotAngle = isFromFaceSet ? theToAngle : -theFromAngle; - aBasisTrsf.SetRotation(anAxis, aBasisRotAngle / 180.0 * M_PI); - BRepBuilderAPI_Transform aBasisTransform(aBasisSolid, aBasisTrsf, true); - TopoDS_Shape aRotatedBasisFace = aBasisTransform.Modified(aBasisFace).First(); - aBasisSolid = aBasisTransform.Shape(); - - // Cutting revolution with basis face. - BRepAlgoAPI_Cut* aBasisCutBuilder = new BRepAlgoAPI_Cut(aResult, aBasisSolid); - aBasisCutBuilder->Build(); - if(aBasisCutBuilder->IsDone()) { - TopoDS_Shape aCutResult = aBasisCutBuilder->Shape(); - TopExp_Explorer anExp(aCutResult, TopAbs_SOLID); - if(anExp.More()) { - aListOfMakeShape.push_back(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBasisCutBuilder))); + if(aModifiedBaseShape.ShapeType() == TopAbs_FACE) { + aModifiedBaseShape.Orientation(TopAbs_REVERSED); + } else { + gp_Trsf aMirrorTrsf; + aMirrorTrsf.SetMirror(aBasePlane->Position().Ax2()); + BRepBuilderAPI_Transform aMirrorTransform(aModifiedBaseShape, aMirrorTrsf, true); + aModifiedBaseShape = aMirrorTransform.Shape(); + } + } + + // Making solid from base face. + TopoDS_Shape aBaseSolid = makeSolidFromShape(aModifiedBaseShape); + + // Rotating base face to the specified angle. + gp_Trsf aBaseTrsf; + double aBaseRotAngle = isFromFaceSet ? theToAngle : -theFromAngle; + aBaseTrsf.SetRotation(anAxis, aBaseRotAngle / 180.0 * M_PI); + BRepBuilderAPI_Transform aBaseTransform(aBaseSolid, aBaseTrsf, true); + aBaseSolid = aBaseTransform.Shape(); + + // Cutting revolution with base. + BRepAlgoAPI_Cut* aBaseCutBuilder = new BRepAlgoAPI_Cut(aResult, aBaseSolid); + aBaseCutBuilder->Build(); + if(aBaseCutBuilder->IsDone()) { + TopoDS_Shape aCutResult = aBaseCutBuilder->Shape(); + TopoDS_Iterator aCheckIt(aCutResult); + if(aCheckIt.More()) { + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBaseCutBuilder))); aResult = aCutResult; + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } + 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()); + aShape->setImpl(new TopoDS_Shape(anIt.Value())); + isFromFaceSet ? this->addToShape(aShape) : this->addFromShape(aShape); + } + } } } + if(aResult.ShapeType() == TopAbs_COMPOUND) { + std::shared_ptr aGeomShape(new GeomAPI_Shape); + aGeomShape->setImpl(new TopoDS_Shape(aResult)); + ListOfShape aCompSolids, aFreeSolids; + aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape, + GeomAPI_Shape::COMPSOLID, + aCompSolids, + aFreeSolids); + aResult = aGeomShape->impl(); + } + // If after cut we got more than one solids then take closest to the center of mass of the base face. - aResult = findClosest(aResult, aBasisCentr); + aResult = findClosest(aResult, aBaseCentre); // Setting naming. - for(TopExp_Explorer anExp(aResult, TopAbs_FACE); anExp.More (); anExp.Next ()) { - const TopoDS_Shape& aFaceOnResult = anExp.Current(); - Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aFaceOnResult)); - Handle(Geom_Surface) aBoundingSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedBoundingFace)); - Handle(Geom_Surface) aBasisSurface = BRep_Tool::Surface(TopoDS::Face(aRotatedBasisFace)); - if(aFaceSurface == aBoundingSurface) { - std::shared_ptr aPtr = isFromFaceSet ? myFirst : myLast; - aPtr->setImpl(new TopoDS_Shape(aFaceOnResult)); - } - if(aFaceSurface == aBasisSurface) { - std::shared_ptr aPtr = isFromFaceSet ? myLast : myFirst; - aPtr->setImpl(new TopoDS_Shape(aFaceOnResult)); - } + 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); } } - TopExp_Explorer anExp(aResult, TopAbs_SOLID); - if(!anExp.More()) { + // Setting result. + if(aResult.IsNull()) { return; } - - // fill data map to keep correct orientation of sub-shapes - myMap = std::shared_ptr(new GeomAPI_DataMapOfShapeShape()); - for (TopExp_Explorer Exp(aResult,TopAbs_FACE); Exp.More(); Exp.Next()) { - std::shared_ptr aCurrentShape(new GeomAPI_Shape()); - aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current())); - myMap->bind(aCurrentShape, aCurrentShape); - } - myShape = std::shared_ptr(new GeomAPI_Shape()); - myShape->setImpl(new TopoDS_Shape(aResult)); - myMkShape = std::shared_ptr(new GeomAlgoAPI_MakeShapeList()); - myDone = true; - return; + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + GeomShapePtr aShape(new GeomAPI_Shape()); + aShape->setImpl(new TopoDS_Shape(aResult)); + this->setShape(aShape); + this->setDone(true); } -//================================================================================================= -const bool GeomAlgoAPI_Revolution::isDone() const +//================================================================================================== +TopoDS_Face makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint) { - return myDone; -} + if(!thePlane.Contains(thePoint, Precision::Confusion())) { + gp_XYZ aVec = thePoint.XYZ() - thePlane.Location().XYZ(); + double aSign = aVec * thePlane.Axis().Direction().XYZ(); + if(aSign < 0) thePlane.SetAxis(thePlane.Axis().Reversed()); + } -//================================================================================================= -const bool GeomAlgoAPI_Revolution::isValid() const -{ - BRepCheck_Analyzer aChecker(myShape->impl()); - return (aChecker.IsValid() == Standard_True); + BRepBuilderAPI_MakeFace aMakeFace(thePlane); + TopoDS_Face aResultFace = TopoDS::Face(aMakeFace.Shape()); + + return aResultFace; } -//================================================================================================= -const bool GeomAlgoAPI_Revolution::hasVolume() const +//================================================================================================== +TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape) { - bool hasVolume(false); - if(isValid()) { - const TopoDS_Shape& aRShape = myShape->impl(); - GProp_GProps aGProp; - BRepGProp::VolumeProperties(aRShape, aGProp); - if(aGProp.Mass() > Precision::Confusion()) - hasVolume = true; + TopoDS_Shell aShell; + TopoDS_Solid aSolid; + + BRep_Builder aBoundingBuilder; + if(theShape.ShapeType() == TopAbs_SHELL) { + aShell = TopoDS::Shell(theShape); + } else { + aBoundingBuilder.MakeShell(aShell); + aBoundingBuilder.Add(aShell, theShape); } - return hasVolume; + aBoundingBuilder.MakeSolid(aSolid); + aBoundingBuilder.Add(aSolid, aShell); + + return aSolid; } -//================================================================================================= -const std::shared_ptr& GeomAlgoAPI_Revolution::shape () const +//================================================================================================== +gp_Pnt centreOfMass(const TopoDS_Shape& theShape) { - return myShape; + TopAbs_ShapeEnum aShType = theShape.ShapeType(); + GProp_GProps aGProps; + + if(aShType == TopAbs_EDGE || aShType == TopAbs_WIRE) { + BRepGProp::LinearProperties(theShape, aGProps); + } else if(aShType == TopAbs_FACE || aShType == TopAbs_SHELL) { + BRepGProp::SurfaceProperties(theShape, aGProps); + } else if(aShType == TopAbs_SOLID || aShType == TopAbs_COMPSOLID) { + BRepGProp::VolumeProperties(theShape, aGProps); + } + + return aGProps.CentreOfMass(); } -//================================================================================================= -const std::shared_ptr& GeomAlgoAPI_Revolution::firstShape() +//================================================================================================== +TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint) { - return myFirst; + TopoDS_Shape aResult = theShape; + + if(theShape.ShapeType() == TopAbs_COMPOUND) { + double aMinDistance = Precision::Infinite(); + double aCurDistance; + gp_Pnt aCentr; + for (TopoDS_Iterator anItr(theShape); anItr.More(); anItr.Next()) { + TopoDS_Shape aValue = anItr.Value(); + aCentr = centreOfMass(aValue); + aCurDistance = aCentr.Distance(thePoint); + + if(aCurDistance < aMinDistance) { + aMinDistance = aCurDistance; + aResult = aValue; + } + } + } + + return aResult; } -//================================================================================================= -const std::shared_ptr& GeomAlgoAPI_Revolution::lastShape() +//================================================================================================== +void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo, + const TopoDS_Shape& theBase, + const TopAbs_ShapeEnum theType, + BRepPrimAPI_MakeRevol* theRevolBuilder) { - return myLast; + 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); + } } -//================================================================================================= -std::shared_ptr GeomAlgoAPI_Revolution::mapOfShapes() const +//================================================================================================== +void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo, + const TopoDS_Shape& theResult, + const TopAbs_ShapeEnum theType, + const TopoDS_Shape& theToFace, + const TopoDS_Shape& theFromFace) { - return myMap; + 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); + } + } + } } -//================================================================================================= -std::shared_ptr GeomAlgoAPI_Revolution::makeShape() const +void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo, + const TopoDS_Shape& theResult, + const TopAbs_ShapeEnum theType, + const TopoDS_Shape& theRotatedBoundingFace, + const TopoDS_Shape& theModifiedBaseShape, + const bool theIsFromFaceSet) { - return myMkShape; + 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); + } + } + } }