#include <GeomAlgoAPI_Revolution.h>
+#include <GeomAPI_Face.h>
+#include <GeomAPI_ShapeExplorer.h>
#include <GeomAlgoAPI_DFLoader.h>
#include <GeomAlgoAPI_MakeShapeList.h>
-#include <GeomAlgoAPI_Rotation.h>
-#include <GeomAlgoAPI_ShapeProps.h>
+#include <GeomAlgoAPI_ShapeTools.h>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
#include <BRepPrimAPI_MakeRevol.hxx>
#include <BRepGProp.hxx>
#include <Geom_Plane.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
#include <GeomLib_IsPlanarSurface.hxx>
#include <gp_Pln.hxx>
#include <GProp_GProps.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
//=================================================================================================
-GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(std::shared_ptr<GeomAPI_Shape> theBasis,
+GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(std::shared_ptr<GeomAPI_Shape> theBaseShape,
+ std::shared_ptr<GeomAPI_Ax1> theAxis,
+ double theToAngle,
+ double theFromAngle)
+: myDone(false)
+{
+ build(theBaseShape, theAxis, std::shared_ptr<GeomAPI_Shape>(), theToAngle, std::shared_ptr<GeomAPI_Shape>(), theFromAngle);
+}
+
+//=================================================================================================
+GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(std::shared_ptr<GeomAPI_Shape> theBaseShape,
std::shared_ptr<GeomAPI_Ax1> theAxis,
- std::shared_ptr<GeomAPI_Shape> theFromShape,
- double theFromAngle,
std::shared_ptr<GeomAPI_Shape> theToShape,
- double theToAngle)
-: myAxis(theAxis),
- myFromShape(theFromShape),
- myFromAngle(theFromAngle),
- myToShape(theToShape),
- myToAngle(theToAngle),
- myDone(false),
- myShape(new GeomAPI_Shape()),
- myFirst(new GeomAPI_Shape()),myLast(new GeomAPI_Shape())
+ double theToAngle,
+ std::shared_ptr<GeomAPI_Shape> theFromShape,
+ double theFromAngle)
+: myDone(false)
{
- build(theBasis);
+ build(theBaseShape, theAxis, theToShape, theToAngle, theFromShape, theFromAngle);
}
//=================================================================================================
TopoDS_Face GeomAlgoAPI_Revolution::makeFaceFromPlane(gp_Pln& thePlane, const gp_Pnt& thePoint)
{
- gp_XYZ aVec = thePoint.XYZ() - thePlane.Location().XYZ();
- double aSign = aVec * thePlane.Axis().Direction().XYZ();
- if(aSign < 0) thePlane.SetAxis(thePlane.Axis().Reversed());
+ 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());
+ }
BRepBuilderAPI_MakeFace aMakeFace(thePlane);
TopoDS_Face aResultFace = TopoDS::Face(aMakeFace.Shape());
}
//=================================================================================================
-TopoDS_Solid GeomAlgoAPI_Revolution::makeSolidFromFace(const TopoDS_Face& theFace)
+TopoDS_Solid GeomAlgoAPI_Revolution::makeSolidFromShape(const TopoDS_Shape& theShape)
{
TopoDS_Shell aShell;
TopoDS_Solid aSolid;
BRep_Builder aBoundingBuilder;
- aBoundingBuilder.MakeShell(aShell);
- aBoundingBuilder.Add(aShell, theFace);
+ if(theShape.ShapeType() == TopAbs_SHELL) {
+ aShell = TopoDS::Shell(theShape);
+ } else {
+ aBoundingBuilder.MakeShell(aShell);
+ aBoundingBuilder.Add(aShell, theShape);
+ }
aBoundingBuilder.MakeSolid(aSolid);
aBoundingBuilder.Add(aSolid, aShell);
}
//=================================================================================================
-void GeomAlgoAPI_Revolution::build(const std::shared_ptr<GeomAPI_Shape>& theBasis)
+void GeomAlgoAPI_Revolution::build(const std::shared_ptr<GeomAPI_Shape>& theBaseShape,
+ const std::shared_ptr<GeomAPI_Ax1>& theAxis,
+ const std::shared_ptr<GeomAPI_Shape>& theToShape,
+ double theToAngle,
+ const std::shared_ptr<GeomAPI_Shape>& theFromShape,
+ double theFromAngle)
{
- if(!theBasis || !myAxis ||
- (((!myFromShape && !myToShape) || (myFromShape && myToShape && myFromShape->isEqual(myToShape)))
- && (myFromAngle == 0.0 && myToAngle == 0.0))) {
+ if(!theBaseShape || !theAxis ||
+ (((!theFromShape && !theToShape) || (theFromShape && theToShape && theFromShape->isEqual(theToShape)))
+ && (theFromAngle == -theToAngle))) {
return;
}
- TopoDS_Face aBasisFace = TopoDS::Face(theBasis->impl<TopoDS_Shape>());
- GeomLib_IsPlanarSurface isBasisPlanar(BRep_Tool::Surface(aBasisFace));
- if(!isBasisPlanar.IsPlanar()) {// non-planar shapes is not supported for revolution
+ // Geting base plane.
+ const TopoDS_Shape& aBaseShape = theBaseShape->impl<TopoDS_Shape>();
+ TopoDS_Face aBaseFace;
+ if(theBaseShape->shapeType() == GeomAPI_Shape::FACE) {
+ aBaseFace = TopoDS::Face(theBaseShape->impl<TopoDS_Shape>());
+ } else if(theBaseShape->shapeType() == GeomAPI_Shape::SHELL) {
+ GeomAPI_ShapeExplorer anExp(theBaseShape, GeomAPI_Shape::FACE);
+ if(anExp.more()) {
+ std::shared_ptr<GeomAPI_Shape> aFaceOnShell = anExp.current();
+ aBaseFace = TopoDS::Face(aFaceOnShell->impl<TopoDS_Shape>());
+ }
+ }
+ if(aBaseFace.IsNull()) {
+ return;
+ }
+ GeomLib_IsPlanarSurface isBasePlanar(BRep_Tool::Surface(aBaseFace));
+ gp_Pln aBasePln = isBasePlanar.Plan();
+ Geom_Plane aBasePlane(aBasePln);
+ gp_Ax1 anAxis = theAxis->impl<gp_Ax1>();
+ if(aBasePlane.Axis().Angle(anAxis) < Precision::Confusion()) {
return;
}
- gp_Pln aBasisPln = isBasisPlanar.Plan();
- gp_Ax1 anAxis = myAxis->impl<gp_Ax1>();
- ListOfMakeShape aListOfMakeShape;
+ gp_Pnt aBaseCentre = GeomAlgoAPI_ShapeTools::centreOfMass(theBaseShape)->impl<gp_Pnt>();
TopoDS_Shape aResult;
- if(!myFromShape && !myToShape) { // Case 1: When only angles was set.
+ ListOfMakeShape aListOfMakeShape;
+ 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, -myFromAngle / 180.0 * M_PI);
- BRepBuilderAPI_Transform* aBaseTransform = new BRepBuilderAPI_Transform(aBasisFace,
+ aBaseTrsf.SetRotation(anAxis, -theFromAngle / 180.0 * M_PI);
+ BRepBuilderAPI_Transform* aBaseTransform = new BRepBuilderAPI_Transform(aBaseShape,
aBaseTrsf,
true);
+ if(!aBaseTransform) {
+ return;
+ }
aListOfMakeShape.push_back(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBaseTransform)));
- TopoDS_Shape aRotatedBaseShape = aBaseTransform->Shape();
+ 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 = myFromAngle + myToAngle;
- BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aRotatedBaseShape,
- anAxis,
- anAngle / 180 * M_PI,
- Standard_True);
- aRevolBuilder->Build();
- if(!aRevolBuilder->IsDone()) {
+ BRepPrimAPI_MakeRevol* aRevolBuilder = new BRepPrimAPI_MakeRevol(aRotatedBase,
+ anAxis,
+ (theFromAngle + theToAngle) / 180 * M_PI,
+ Standard_True);
+ if(!aRevolBuilder) {
return;
}
aListOfMakeShape.push_back(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aRevolBuilder)));
+ if(!aRevolBuilder->IsDone()) {
+ return;
+ }
aResult = aRevolBuilder->Shape();
// Setting naming.
- myFirst->setImpl(new TopoDS_Shape(aRevolBuilder->FirstShape()));
- myLast->setImpl(new TopoDS_Shape(aRevolBuilder->LastShape()));
- } else if(myFromShape && myToShape) { // Case 2: When both bounding planes were set.
+ for(TopExp_Explorer anExp(aRotatedBase, TopAbs_FACE); anExp.More(); anExp.Next()) {
+ const TopoDS_Shape& aFace = anExp.Current();
+ std::shared_ptr<GeomAPI_Shape> aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape);
+ aFromShape->setImpl(new TopoDS_Shape(aRevolBuilder->FirstShape(aFace)));
+ aToShape->setImpl(new TopoDS_Shape(aRevolBuilder->LastShape(aFace)));
+ myFromFaces.push_back(aFromShape);
+ myToFaces.push_back(aToShape);
+ }
+ } 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;
+ }
+ aListOfMakeShape.push_back(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aRevolBuilder)));
+ if(!aRevolBuilder->IsDone()) {
+ return;
+ }
+ aResult = aRevolBuilder->Shape();
+
// Getting bounding faces.
- TopoDS_Face aFromFace = TopoDS::Face(myFromShape->impl<TopoDS_Shape>());
- TopoDS_Face aToFace = TopoDS::Face(myToShape->impl<TopoDS_Shape>());
+ TopoDS_Face aFromFace = TopoDS::Face(theFromShape->impl<TopoDS_Shape>());
+ TopoDS_Face aToFace = TopoDS::Face(theToShape->impl<TopoDS_Shape>());
// Getting planes from bounding face.
GeomLib_IsPlanarSurface isFromPlanar(BRep_Tool::Surface(aFromFace));
// 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<gp_Pnt>();
- 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) ? -myFromAngle : myFromAngle;
- double aToRotAngle = ((aToPln.Axis().Direction() * aBasisPln.Axis().Direction()) > 0) ? -myToAngle : myToAngle;
+ double aFromRotAngle = ((aFromPln.Axis().Direction() * aBasePln.Axis().Direction()) > 0) ? -theFromAngle : theFromAngle;
+ double aToRotAngle = ((aToPln.Axis().Direction() * aBasePln.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);
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<GeomAlgoAPI_MakeShape>(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<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aFromCutBuilder)));
aResult = aFromCutBuilder->Shape();
- // Setting naming.
- if(aFromCutBuilder->Modified(aRotatedFromFace).Extent() > 0) {
- myFirst->setImpl(new TopoDS_Shape(aFromCutBuilder->Modified(aRotatedFromFace).First()));
- }
-
// Cutting revolution with to plane.
BRepAlgoAPI_Cut* aToCutBuilder = new BRepAlgoAPI_Cut(aResult, aToSolid);
aToCutBuilder->Build();
aListOfMakeShape.push_back(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aToCutBuilder)));
aResult = aToCutBuilder->Shape();
- // Setting naming.
- if(aToCutBuilder->Modified(myFirst->impl<TopoDS_Shape>()).Extent() > 0) {
- myFirst->setImpl(new TopoDS_Shape(aToCutBuilder->Modified(myFirst->impl<TopoDS_Shape>()).First()));
- } else {
- for(TopExp_Explorer anExp(aResult, TopAbs_FACE); anExp.More (); anExp.Next ()) {
- const TopoDS_Shape& aFace = anExp.Current();
- if (aFace.IsPartner(myFirst->impl<TopoDS_Shape>())) {
- myFirst->implPtr<TopoDS_Shape>()->Orientation(aFace.Orientation());
+ 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) {
+ std::shared_ptr<GeomAPI_Shape> aCompound(new GeomAPI_Shape);
+ aCompound->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;
}
}
- if(aToCutBuilder->Modified(aRotatedToFace).Extent() > 0) {
- myLast->setImpl(new TopoDS_Shape(aToCutBuilder->Modified(aRotatedToFace).First()));
- }
// 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) {
+ std::shared_ptr<GeomAPI_Shape> aFSHape(new GeomAPI_Shape);
+ aFSHape->setImpl(new TopoDS_Shape(aFaceOnResult));
+ myFromFaces.push_back(aFSHape);
+ }
+ if(aFaceSurface == aToSurface) {
+ std::shared_ptr<GeomAPI_Shape> aTSHape(new GeomAPI_Shape);
+ aTSHape->setImpl(new TopoDS_Shape(aFaceOnResult));
+ myToFaces.push_back(aTSHape);
+ }
+ }
} 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;
+ }
+ aListOfMakeShape.push_back(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;
- if(myFromShape) {
- aBoundingFace = TopoDS::Face(myFromShape->impl<TopoDS_Shape>());
+ if(theFromShape) {
+ aBoundingFace = TopoDS::Face(theFromShape->impl<TopoDS_Shape>());
isFromFaceSet = true;
- } else if(myToShape) {
- aBoundingFace = TopoDS::Face(myToShape->impl<TopoDS_Shape>());
+ } else if(theToShape) {
+ aBoundingFace = TopoDS::Face(theToShape->impl<TopoDS_Shape>());
}
// Getting plane from bounding face.
// 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<gp_Pnt>();
- 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 ? myFromAngle : myToAngle;
- if(aBoundingPln.Axis().IsParallel(aBasisPln.Axis(), Precision::Confusion())) {
+ double aBoundingRotAngle = isFromFaceSet ? theFromAngle : theToAngle;
+ if(aBoundingPln.Axis().IsParallel(aBasePln.Axis(), Precision::Confusion())) {
if(isFromFaceSet) aBoundingRotAngle = -aBoundingRotAngle;
} else {
- double aSign = (aBoundingPln.Axis().Direction() ^ aBasisPln.Axis().Direction()) *
+ double aSign = (aBoundingPln.Axis().Direction() ^ aBasePln.Axis().Direction()) *
anAxis.Direction();
if((aSign <= 0 && !isFromFaceSet) || (aSign > 0 && isFromFaceSet)) {
aBoundingRotAngle = -aBoundingRotAngle;
gp_Trsf aBoundingTrsf;
aBoundingTrsf.SetRotation(anAxis, aBoundingRotAngle / 180.0 * M_PI);
BRepBuilderAPI_Transform aBoundingTransform(aBoundingSolid, aBoundingTrsf, true);
+ 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<GeomAlgoAPI_MakeShape>(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<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBoundingCutBuilder)));
aResult = aBoundingCutBuilder->Shape();
- TopExp_Explorer anExp1(aResult, TopAbs_SOLID);
// Setting naming.
- if(aBoundingCutBuilder->Modified(aBoundingFace).Extent() > 0) {
- std::shared_ptr<GeomAPI_Shape> aPtr = isFromFaceSet ? myFirst : myLast;
- aPtr->setImpl(new TopoDS_Shape(aBoundingCutBuilder->Modified(aBoundingFace).First()));
+ const TopTools_ListOfShape& aBndShapes = aBoundingCutBuilder->Modified(aBoundingFace);
+ for(TopTools_ListIteratorOfListOfShape anIt(aBndShapes); anIt.More(); anIt.Next()) {
+ std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
+ aShape->setImpl(new TopoDS_Shape(anIt.Value()));
+ isFromFaceSet ? myFromFaces.push_back(aShape) : myToFaces.push_back(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;
if(isFromFaceSet) {
- aBasisFace.Orientation(TopAbs_REVERSED);
+ 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 basis face.
- TopoDS_Shape aBasisSolid = makeSolidFromFace(aBasisFace);
-
- // Rotating basis face to the specified angle.
- gp_Trsf aBasisTrsf;
- double aBasisRotAngle = isFromFaceSet ? myToAngle : -myFromAngle;
- aBasisTrsf.SetRotation(anAxis, aBasisRotAngle / 180.0 * M_PI);
- BRepBuilderAPI_Transform aBasisTransform(aBasisSolid, aBasisTrsf, true);
- 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();
+ // 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();
TopExp_Explorer anExp(aCutResult, TopAbs_SOLID);
if(anExp.More()) {
- aListOfMakeShape.push_back(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBasisCutBuilder)));
+ aListOfMakeShape.push_back(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBaseCutBuilder)));
aResult = aCutResult;
+ }
+ }
- // Setting naming.
- std::shared_ptr<GeomAPI_Shape> aBoundPtr = isFromFaceSet ? myFirst : myLast;
- if(aBasisCutBuilder->Modified(aBoundPtr->impl<TopoDS_Shape>()).Extent() > 0) {
- aBoundPtr->setImpl(new TopoDS_Shape(aBasisCutBuilder->Modified(aBoundPtr->impl<TopoDS_Shape>()).First()));
- } else {
- for(TopExp_Explorer anExp(aResult, TopAbs_FACE); anExp.More (); anExp.Next ()) {
- const TopoDS_Shape& aFace = anExp.Current();
- if (aFace.IsPartner(aBoundPtr->impl<TopoDS_Shape>())) {
- aBoundPtr->implPtr<TopoDS_Shape>()->Orientation(aFace.Orientation());
- }
- }
- }
+ const TopTools_ListOfShape& aBsShapes = aBaseCutBuilder->Modified(aBoundingFace);
+ for(TopTools_ListIteratorOfListOfShape anIt(aBsShapes); anIt.More(); anIt.Next()) {
+ std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
+ aShape->setImpl(new TopoDS_Shape(anIt.Value()));
+ isFromFaceSet ? myToFaces.push_back(aShape) : myFromFaces.push_back(aShape);
+ }
- if(aBasisCutBuilder->Modified(aBasisFace).Extent() > 0) {
- std::shared_ptr<GeomAPI_Shape> aPtr = isFromFaceSet ? myLast : myFirst;
- aPtr->setImpl(new TopoDS_Shape(aBasisCutBuilder->Modified(aBasisFace).First()));
+ 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) {
+ std::shared_ptr<GeomAPI_Shape> aCompound(new GeomAPI_Shape);
+ aCompound->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;
}
}
// 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));
+ if(aFaceSurface == aBoundingSurface) {
+ std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
+ aShape->setImpl(new TopoDS_Shape(aFaceOnResult));
+ isFromFaceSet ? myFromFaces.push_back(aShape) : myToFaces.push_back(aShape);
+ }
+ }
}
- TopExp_Explorer anExp(aResult, TopAbs_SOLID);
- if(!anExp.More()) {
+ // Setting result.
+ if(aResult.IsNull()) {
return;
}
+ myShape.reset(new GeomAPI_Shape);
+ myShape->setImpl(new TopoDS_Shape(aResult));
- // fill data map to keep correct orientation of sub-shapes
+ // Filling data map to keep correct orientation of sub-shapes.
+ myMap.reset(new GeomAPI_DataMapOfShapeShape);
for (TopExp_Explorer Exp(aResult,TopAbs_FACE); Exp.More(); Exp.Next()) {
- std::shared_ptr<GeomAPI_Shape> aCurrentShape(new GeomAPI_Shape());
+ std::shared_ptr<GeomAPI_Shape> aCurrentShape(new GeomAPI_Shape);
aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current()));
- myMap.bind(aCurrentShape, aCurrentShape);
+ myMap->bind(aCurrentShape, aCurrentShape);
}
- myShape->setImpl(new TopoDS_Shape(aResult));
- myMkShape = new GeomAlgoAPI_MakeShapeList(aListOfMakeShape);
+
+ // Setting list of make shape.
+ myMkShape.reset(new GeomAlgoAPI_MakeShapeList(aListOfMakeShape));
+
myDone = true;
- return;
}
//=================================================================================================
}
//=================================================================================================
-const std::shared_ptr<GeomAPI_Shape>& GeomAlgoAPI_Revolution::firstShape()
+const ListOfShape& GeomAlgoAPI_Revolution::fromFaces() const
{
- return myFirst;
+ return myFromFaces;
}
//=================================================================================================
-const std::shared_ptr<GeomAPI_Shape>& GeomAlgoAPI_Revolution::lastShape()
+const ListOfShape& GeomAlgoAPI_Revolution::toFaces() const
{
- return myLast;
+ return myToFaces;
}
//=================================================================================================
-void GeomAlgoAPI_Revolution::mapOfShapes (GeomAPI_DataMapOfShapeShape& theMap) const
+std::shared_ptr<GeomAPI_DataMapOfShapeShape> GeomAlgoAPI_Revolution::mapOfShapes() const
{
- theMap = myMap;
+ return myMap;
}
//=================================================================================================
-GeomAlgoAPI_MakeShape* GeomAlgoAPI_Revolution::makeShape() const
+std::shared_ptr<GeomAlgoAPI_MakeShape> GeomAlgoAPI_Revolution::makeShape() const
{
return myMkShape;
}
-
-//=================================================================================================
-GeomAlgoAPI_Revolution::~GeomAlgoAPI_Revolution()
-{
- if (myImpl) {
- myMap.clear();
- }
-}
