-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: GeomAlgoAPI_Revolution.cpp
-// Created: 12 May 2015
-// Author: Dmitry Bobylev
+// Copyright (C) 2014-2023 CEA, EDF
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include "GeomAlgoAPI_Revolution.h"
#include <GeomAPI_Face.h>
+#include <GeomAPI_Pln.h>
#include <GeomAPI_ShapeExplorer.h>
#include <GeomAlgoAPI_DFLoader.h>
+#include <GeomAlgoAPI_FaceBuilder.h>
#include <GeomAlgoAPI_MakeShapeList.h>
#include <GeomAlgoAPI_ShapeTools.h>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
#include <BRepAlgoAPI_Cut.hxx>
+#include <BRepBuilderAPI_FindPlane.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepBuilderAPI_Transform.hxx>
#include <BRepCheck_Analyzer.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom2d_Curve.hxx>
+#include <BRepLib_CheckCurveOnSurface.hxx>
#include <BRepPrimAPI_MakeRevol.hxx>
#include <BRepGProp.hxx>
+#include <GC_MakePlane.hxx>
#include <Geom_Plane.hxx>
#include <GeomLib_IsPlanarSurface.hxx>
#include <gp_Pln.hxx>
#include <GProp_GProps.hxx>
+#include <IntTools_Context.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
/// \brief Constructs infinite face from thePlane, and with axis located on the same side
/// \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);
-//=================================================================================================
-GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(std::shared_ptr<GeomAPI_Shape> theBaseShape,
- std::shared_ptr<GeomAPI_Ax1> theAxis,
- double theToAngle,
- double theFromAngle)
-{
- 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> theToShape,
- double theToAngle,
- std::shared_ptr<GeomAPI_Shape> theFromShape,
- double theFromAngle)
+/// \brief Create plane by 3 points. Return empty handle if failed.
+static Handle(Geom_Plane) makePlane(const gp_Pnt& theP1, const gp_Pnt& theP2, const gp_Pnt& theP3);
+
+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 GeomShapePtr theToShape,
+ const double theToAngle,
+ const GeomShapePtr theFromShape,
+ const double theFromAngle)
{
build(theBaseShape, theAxis, theToShape, theToAngle, theFromShape, theFromAngle);
}
-//=================================================================================================
-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)
+//==================================================================================================
+void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseShape,
+ const std::shared_ptr<GeomAPI_Ax1>& theAxis,
+ const GeomShapePtr& theToShape,
+ const double theToAngle,
+ const GeomShapePtr& theFromShape,
+ const double theFromAngle)
{
if(!theBaseShape || !theAxis ||
- (((!theFromShape && !theToShape) || (theFromShape && theToShape && theFromShape->isEqual(theToShape)))
+ (((!theFromShape && !theToShape) ||
+ (theFromShape && theToShape && theFromShape->isEqual(theToShape)))
&& (theFromAngle == -theToAngle))) {
return;
}
- // Geting base plane.
+ // Getting base shape.
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;
+ 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<gp_Ax1>();
- 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();
+
+ TopExp_Explorer anExp(aBaseShape, TopAbs_VERTEX);
+ gp_Pnt aPnt2 = BRep_Tool::Pnt(TopoDS::Vertex(anExp.Current()));
+ gp_Pnt aPnt3 = aPnt1;
+
+ for (anExp.Next(); anExp.More() && aBasePlane.IsNull(); anExp.Next()) {
+ aPnt3 = BRep_Tool::Pnt(TopoDS::Vertex(anExp.Current()));
+ aBasePlane = makePlane(aPnt1, aPnt2, aPnt3);
+ }
+
+ if(aBasePlane.IsNull()) {
+ gp_Pnt aPossiblePoints[] = { aPnt1.Translated(anAxis.Direction()), centreOfMass(aBaseShape) };
+ for (auto it = std::begin(aPossiblePoints);
+ it != std::end(aPossiblePoints) && aBasePlane.IsNull(); ++it)
+ aBasePlane = makePlane(aPnt1, aPnt2, *it);
+ }
+ }
+
+ if(aShapeTypeToExp == TopAbs_FACE) {
+ if(aBasePlane->Axis().Angle(anAxis) < Precision::Confusion()) {
+ return;
+ }
}
gp_Pnt aBaseCentre = GeomAlgoAPI_ShapeTools::centreOfMass(theBaseShape)->impl<gp_Pnt>();
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;
}
// 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, 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)));
- 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;
}
// 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.
// 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);
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);
+ }
// Cutting revolution with to plane.
BRepAlgoAPI_Cut* aToCutBuilder = new BRepAlgoAPI_Cut(aResult, aToSolid);
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();
-
- 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) {
- 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;
- }
+ std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+ aGeomShape->setImpl(new TopoDS_Shape(aResult));
+ ListOfShape aResults;
+ aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
+ GeomAPI_Shape::COMPSOLID,
+ aResults);
+ 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, 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));
- this->addFromShape(aFSHape);
- }
- if(aFaceSurface == aToSurface) {
- std::shared_ptr<GeomAPI_Shape> 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.
- 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.
// 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;
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.
- 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 ? 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()));
+ fixOrientation(aShape);
+ 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<GeomAPI_Pnt> theCenter(new GeomAPI_Pnt(aBasePlane->Location().X(),
+ aBasePlane->Location().Y(),
+ aBasePlane->Location().Z()));
+ std::shared_ptr<GeomAPI_Dir> 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<std::shared_ptr<GeomAPI_Pnt> >
+ aBoundingPoints = GeomAlgoAPI_ShapeTools::getBoundingBox(aList);
+ aSh = GeomAlgoAPI_ShapeTools::fitPlaneToBox(aPln, aBoundingPoints);
+ aModifiedBaseShape = aSh->impl<TopoDS_Shape>();
+ } 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();
}
aBaseCutBuilder->Build();
if(aBaseCutBuilder->IsDone()) {
TopoDS_Shape aCutResult = aBaseCutBuilder->Shape();
- TopExp_Explorer anExp(aCutResult, TopAbs_SOLID);
- if(anExp.More()) {
- this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(new GeomAlgoAPI_MakeShape(aBaseCutBuilder)));
+ TopoDS_Iterator aCheckIt(aCutResult);
+ if(aCheckIt.More()) {
+ 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 || 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()));
+ fixOrientation(aShape);
+ isFromFaceSet ? this->addToShape(aShape) : this->addFromShape(aShape);
+ }
+ }
}
}
- 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 ? 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) {
- 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;
- }
+ std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
+ aGeomShape->setImpl(new TopoDS_Shape(aResult));
+ ListOfShape aResults;
+ aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
+ GeomAPI_Shape::COMPSOLID,
+ aResults);
+ 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, 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 ? 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);
}
}
if(aResult.IsNull()) {
return;
}
- std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
+ 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())) {
return aResultFace;
}
-//=================================================================================================
+//==================================================================================================
TopoDS_Solid makeSolidFromShape(const TopoDS_Shape& theShape)
{
TopoDS_Shell aShell;
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;
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) {
return aResult;
}
+
+//================================================================================================
+Handle(Geom_Plane) makePlane(const gp_Pnt& theP1, const gp_Pnt& theP2, const gp_Pnt& theP3)
+{
+ Handle(Geom_Plane) aPlane;
+ GC_MakePlane aMkPlane(theP1, theP2, theP3);
+ if (aMkPlane.IsDone())
+ aPlane = aMkPlane.Value();
+ return aPlane;
+}
+
+//================================================================================================
+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->fixOrientation(aFromShape);
+ theRevolutionAlgo->fixOrientation(aToShape);
+ 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->fixOrientation(aGeomSh);
+ theRevolutionAlgo->addToShape(aGeomSh);
+ }
+ if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theFromFace),
+ Precision::Confusion()) == Standard_True) {
+ aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ 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->fixOrientation(aGeomSh);
+ theRevolutionAlgo->addToShape(aGeomSh);
+ }
+ anEdgeCheck.Init(anEdge, TopoDS::Face(theFromFace));
+ anEdgeCheck.Perform();
+ if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
+ aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ 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->fixOrientation(aGeomSh);
+ theRevolutionAlgo->addFromShape(aGeomSh);
+ }
+ if(aFaceSurface == aToSurface) {
+ aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ 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));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+ theRevolutionAlgo->addToShape(aGeomSh);
+ }
+ if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theModifiedBaseShape),
+ Precision::Confusion()) == Standard_True) {
+ aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ 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));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ 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));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ 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));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+ theRevolutionAlgo->addToShape(aGeomSh);
+ }
+ if(aFaceSurface == aBaseSurface) {
+ aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+ theRevolutionAlgo->addFromShape(aGeomSh);
+ }
+ }
+ }
+}
