#include "GeomAlgoAPI_Boolean.h"
-#include <BRepAlgoAPI_BooleanOperation.hxx>
-#include <BRepAlgoAPI_Common.hxx>
-#include <BRepAlgoAPI_Cut.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_ListOfShape.hxx>
-
-//=================================================================================================
-std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_Boolean::makeCut(const ListOfShape& theObjects,
- const ListOfShape& theTools)
-{
- GeomAlgoAPI_Boolean aBoolAlgo(theObjects, theTools, BOOL_CUT);
- if(aBoolAlgo.isDone() && !aBoolAlgo.shape()->isNull() && aBoolAlgo.isValid()) {
- return aBoolAlgo.shape();
- }
- return std::shared_ptr<GeomAPI_Shape>();
-}
+#include <GeomAlgoAPI_DFLoader.h>
+#include <GeomAlgoAPI_ShapeTools.h>
-//=================================================================================================
-std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_Boolean::makeFuse(const ListOfShape& theObjects,
- const ListOfShape& theTools)
-{
- GeomAlgoAPI_Boolean aBoolAlgo(theObjects, theTools, BOOL_FUSE);
- if(aBoolAlgo.isDone() && !aBoolAlgo.shape()->isNull() && aBoolAlgo.isValid()) {
- return aBoolAlgo.shape();
- }
- return std::shared_ptr<GeomAPI_Shape>();
-}
-
-//=================================================================================================
-std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_Boolean::makeCommon(const ListOfShape& theObjects,
- const ListOfShape& theTools)
-{
- GeomAlgoAPI_Boolean aBoolAlgo(theObjects, theTools, BOOL_COMMON);
- if(aBoolAlgo.isDone() && !aBoolAlgo.shape()->isNull() && aBoolAlgo.isValid()) {
- return aBoolAlgo.shape();
- }
- return std::shared_ptr<GeomAPI_Shape>();
-}
+#include <BOPAlgo_BOP.hxx>
+#include <TopTools_ListOfShape.hxx>
//=================================================================================================
GeomAlgoAPI_Boolean::GeomAlgoAPI_Boolean(const ListOfShape& theObjects,
const ListOfShape& theTools,
const OperationType theOperationType)
-: myDone(false),
- myShape(new GeomAPI_Shape()),
- myMap(new GeomAPI_DataMapOfShapeShape()),
- myMkShape(new GeomAlgoAPI_MakeShape())
{
build(theObjects, theTools, theOperationType);
}
}
// Creating boolean operation.
- BRepAlgoAPI_BooleanOperation* anOperation;
+ BOPAlgo_BOP* aBuilder = new BOPAlgo_BOP();
switch (theOperationType) {
case BOOL_CUT: {
- anOperation = new BRepAlgoAPI_Cut();
+ aBuilder->SetOperation(BOPAlgo_CUT);
break;
}
case BOOL_FUSE: {
- anOperation = new BRepAlgoAPI_Fuse();
+ aBuilder->SetOperation(BOPAlgo_FUSE);
break;
}
case BOOL_COMMON: {
- anOperation = new BRepAlgoAPI_Common();
+ aBuilder->SetOperation(BOPAlgo_COMMON);
break;
}
default: {
return;
}
}
- myMkShape->setImpl(anOperation);
- anOperation->SetArguments(anObjects);
- anOperation->SetTools(aTools);
+ this->setImpl(aBuilder);
+ this->setBuilderType(OCCT_BOPAlgo_Builder);
+ aBuilder->SetArguments(anObjects);
+ aBuilder->SetTools(aTools);
// Building and getting result.
- anOperation->Build();
- myDone = anOperation->IsDone() == Standard_True;
- if(!myDone) {
+ aBuilder->Perform();
+ if(aBuilder->ErrorStatus() != 0) {
return;
}
- TopoDS_Shape aResult = anOperation->Shape();
+ TopoDS_Shape aResult = aBuilder->Shape();
- // fill data map to keep correct orientation of sub-shapes
- for (TopExp_Explorer Exp(aResult,TopAbs_FACE); Exp.More(); Exp.Next()) {
- std::shared_ptr<GeomAPI_Shape> aCurrentShape(new GeomAPI_Shape());
- aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current()));
- myMap->bind(aCurrentShape, aCurrentShape);
+ if(aResult.ShapeType() == TopAbs_COMPOUND) {
+ aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
+ }
+ if(aResult.ShapeType() == TopAbs_COMPOUND) {
+ std::shared_ptr<GeomAPI_Shape> 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<TopoDS_Shape>();
}
- myShape->setImpl(new TopoDS_Shape(aResult));
-
-}
-
-//=================================================================================================
-const bool GeomAlgoAPI_Boolean::isDone() const
-{
- return myDone;
-}
-
-//=================================================================================================
-const bool GeomAlgoAPI_Boolean::isValid() const
-{
- BRepCheck_Analyzer aChecker(myShape->impl<TopoDS_Shape>());
- return (aChecker.IsValid() == Standard_True);
-}
-
-//=================================================================================================
-const std::shared_ptr<GeomAPI_Shape>& GeomAlgoAPI_Boolean::shape() const
-{
- return myShape;
-}
-
-//=================================================================================================
-std::shared_ptr<GeomAPI_DataMapOfShapeShape> GeomAlgoAPI_Boolean::mapOfShapes() const
-{
- return myMap;
-}
-//=================================================================================================
-std::shared_ptr<GeomAlgoAPI_MakeShape> GeomAlgoAPI_Boolean::makeShape() const
-{
- return myMkShape;
+ std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
+ aShape->setImpl(new TopoDS_Shape(aResult));
+ this->setShape(aShape);
+ this->setDone(true);
}