X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Revolution.cpp;h=b6bc188eb31df6716fecf47f466ecd6a0b8ac89f;hb=2e672b9dcc8e975fa44f6bd687a47a298b152826;hp=9e234c0acb8c6bb109e4bcf293bd703a41fbb2c8;hpb=57e5ff999c4f23cc66bc2c91fc298c8acf63b2b2;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp index 9e234c0ac..b6bc188eb 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp @@ -9,23 +9,31 @@ #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 /// \brief Constructs infinite face from thePlane, and with axis located on the same side @@ -38,13 +46,35 @@ 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, @@ -53,7 +83,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 theAxis, const GeomShapePtr theToShape, @@ -64,7 +94,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& theAxis, const GeomShapePtr& theToShape, @@ -78,27 +108,70 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh return; } - // Geting base plane. + // Getting base shape. const TopoDS_Shape& aBaseShape = theBaseShape->impl(); - TopoDS_Face aBaseFace; - if(theBaseShape->shapeType() == GeomAPI_Shape::FACE) { - aBaseFace = TopoDS::Face(theBaseShape->impl()); - } else if(theBaseShape->shapeType() == GeomAPI_Shape::SHELL) { - GeomAPI_ShapeExplorer anExp(theBaseShape, GeomAPI_Shape::FACE); - if(anExp.more()) { - GeomShapePtr aFaceOnShell = anExp.current(); - aBaseFace = TopoDS::Face(aFaceOnShell->impl()); - } - } - if(aBaseFace.IsNull()) { - return; + 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; } - GeomLib_IsPlanarSurface isBasePlanar(BRep_Tool::Surface(aBaseFace)); - gp_Pln aBasePln = isBasePlanar.Plan(); - Geom_Plane aBasePlane(aBasePln); + + // Getting axis. gp_Ax1 anAxis = theAxis->impl(); - if(aBasePlane.Axis().Angle(anAxis) < Precision::Confusion()) { - return; + + // 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; + } + + aBasePlane = aMkPlane.Value(); + break; + } + + if(aBasePlane.IsNull()) { + aPnt3 = centreOfMass(aBaseShape); + + GC_MakePlane aMkPlane(aPnt1, aPnt2, aPnt3); + if(aMkPlane.IsDone() != Standard_True) { + return; + } + + aBasePlane = aMkPlane.Value(); + } + } + + if(aShapeTypeToExp == TopAbs_FACE) { + if(aBasePlane->Axis().Angle(anAxis) < Precision::Confusion()) { + return; + } } gp_Pnt aBaseCentre = GeomAlgoAPI_ShapeTools::centreOfMass(theBaseShape)->impl(); @@ -135,13 +208,11 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh aResult = aRevolBuilder->Shape(); // Setting naming. - for(TopExp_Explorer anExp(aRotatedBase, TopAbs_FACE); anExp.More(); anExp.Next()) { - const TopoDS_Shape& aFace = anExp.Current(); - GeomShapePtr aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape); - aFromShape->setImpl(new TopoDS_Shape(aRevolBuilder->FirstShape(aFace))); - aToShape->setImpl(new TopoDS_Shape(aRevolBuilder->LastShape(aFace))); - 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. @@ -180,8 +251,8 @@ 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() * aBasePln.Axis().Direction()) > 0) ? -theFromAngle : theFromAngle; - double aToRotAngle = ((aToPln.Axis().Direction() * aBasePln.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); @@ -199,6 +270,9 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh } 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); @@ -208,54 +282,33 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh } this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aToCutBuilder))); aResult = aToCutBuilder->Shape(); - - TopExp_Explorer anExp(aResult, TopAbs_SOLID); - if(!anExp.More()) { + TopoDS_Iterator aCheckIt(aResult); + if(!aCheckIt.More()) { return; } if(aResult.ShapeType() == TopAbs_COMPOUND) { aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); } if(aResult.ShapeType() == TopAbs_COMPOUND) { - GeomShapePtr aCompound(new GeomAPI_Shape); - aCompound->setImpl(new TopoDS_Shape(aResult)); + std::shared_ptr 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(); - } 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()); - } - for(ListOfShape::const_iterator anIter = aFreeSolids.cbegin(); anIter != aFreeSolids.cend(); anIter++) { - aBuilder.Add(aResultComp, (*anIter)->impl()); - } - aResult = aResultComp; - } + 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, 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) { - GeomShapePtr aFSHape(new GeomAPI_Shape); - aFSHape->setImpl(new TopoDS_Shape(aFaceOnResult)); - this->addFromShape(aFSHape); - } - if(aFaceSurface == aToSurface) { - GeomShapePtr aTSHape(new GeomAPI_Shape); - aTSHape->setImpl(new TopoDS_Shape(aFaceOnResult)); - this->addToShape(aTSHape); - } + 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. @@ -295,10 +348,10 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh // Rotating bounding plane to the specified angle. double aBoundingRotAngle = isFromFaceSet ? theFromAngle : theToAngle; - if(aBoundingPln.Axis().IsParallel(aBasePln.Axis(), Precision::Confusion())) { + if(aBoundingPln.Axis().IsParallel(aBasePlane->Axis(), Precision::Confusion())) { if(isFromFaceSet) aBoundingRotAngle = -aBoundingRotAngle; } else { - double aSign = (aBoundingPln.Axis().Direction() ^ aBasePln.Axis().Direction()) * + double aSign = (aBoundingPln.Axis().Direction() ^ aBasePlane->Axis().Direction()) * anAxis.Direction(); if((aSign <= 0 && !isFromFaceSet) || (aSign > 0 && isFromFaceSet)) { aBoundingRotAngle = -aBoundingRotAngle; @@ -318,23 +371,46 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh } this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aBoundingCutBuilder))); aResult = aBoundingCutBuilder->Shape(); + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } // Setting naming. - 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); + 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 = aBaseShape; + 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) { if(aModifiedBaseShape.ShapeType() == TopAbs_FACE) { aModifiedBaseShape.Orientation(TopAbs_REVERSED); } else { gp_Trsf aMirrorTrsf; - aMirrorTrsf.SetMirror(aBasePlane.Position().Ax2()); + aMirrorTrsf.SetMirror(aBasePlane->Position().Ax2()); BRepBuilderAPI_Transform aMirrorTransform(aModifiedBaseShape, aMirrorTrsf, true); aModifiedBaseShape = aMirrorTransform.Shape(); } @@ -355,61 +431,44 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh aBaseCutBuilder->Build(); if(aBaseCutBuilder->IsDone()) { TopoDS_Shape aCutResult = aBaseCutBuilder->Shape(); - TopExp_Explorer anExp(aCutResult, TopAbs_SOLID); - if(anExp.More()) { + 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); + } + } } } - 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); - } - - TopExp_Explorer anExp(aResult, TopAbs_SOLID); - if(!anExp.More()) { - return; - } - if(aResult.ShapeType() == TopAbs_COMPOUND) { - aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); - } if(aResult.ShapeType() == TopAbs_COMPOUND) { - GeomShapePtr aCompound(new GeomAPI_Shape); - aCompound->setImpl(new TopoDS_Shape(aResult)); + std::shared_ptr 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(); - } 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()); - } - for(ListOfShape::const_iterator anIter = aFreeSolids.cbegin(); anIter != aFreeSolids.cend(); anIter++) { - aBuilder.Add(aResultComp, (*anIter)->impl()); - } - aResult = aResultComp; - } + 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, 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)); - if(aFaceSurface == aBoundingSurface) { - GeomShapePtr aShape(new GeomAPI_Shape()); - aShape->setImpl(new TopoDS_Shape(aFaceOnResult)); - isFromFaceSet ? this->addFromShape(aShape) : this->addToShape(aShape); - } + 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); } } @@ -417,13 +476,14 @@ void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh if(aResult.IsNull()) { return; } + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); GeomShapePtr aShape(new GeomAPI_Shape()); aShape->setImpl(new TopoDS_Shape(aResult)); this->setShape(aShape); this->setDone(true); } -//================================================================================================= +//================================================================================================== TopoDS_Face makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint) { if(!thePlane.Contains(thePoint, Precision::Confusion())) { @@ -438,7 +498,7 @@ TopoDS_Face makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint) return aResultFace; } -//================================================================================================= +//================================================================================================== TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape) { TopoDS_Shell aShell; @@ -457,7 +517,24 @@ TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape) return aSolid; } -//================================================================================================= +//================================================================================================== +gp_Pnt centreOfMass(const TopoDS_Shape& theShape) +{ + 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(); +} + +//================================================================================================== TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint) { TopoDS_Shape aResult = theShape; @@ -465,13 +542,10 @@ TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint) if(theShape.ShapeType() == TopAbs_COMPOUND) { double aMinDistance = Precision::Infinite(); double aCurDistance; - GProp_GProps aGProps; gp_Pnt aCentr; - for (TopoDS_Iterator anItr(theShape); anItr.More(); anItr.Next()) { TopoDS_Shape aValue = anItr.Value(); - BRepGProp::VolumeProperties(aValue, aGProps); - aCentr = aGProps.CentreOfMass(); + aCentr = centreOfMass(aValue); aCurDistance = aCentr.Distance(thePoint); if(aCurDistance < aMinDistance) { @@ -483,3 +557,121 @@ 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); + } + } + } +}