mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-16 10:08:36 +03:00
Modifications: - BRepOffset/BRepOffset_Tool.cxx, Features and Fillets algorithms have been ported on new BO algorithm. - Old BO algorithm, that was implemented in BOP, BooleanOperations and BOPTools packages, has - been deleted. - Porting SALOME algorithms to new BOP algorithm. - Fixing regressions. Rebased on current master. - Corrections in post treatment of section edges; - Corrections in the accordance with the bug 0023293; - Small corrections in the bopcheck and bopargcheck commands. - NCollection maps have been replaced by NCollection indexed maps to guarantee the constant order of sub-shapes in the result of boolean operation. - Test case feat featprism M9 has been fixed. - Test cases chl 902 E3 H3 have been fixed (corrections in the treatment of section edges). - Test cases caf driver B6 B7, caf named_shape F6 F7 have been modified according to the new order of sub-shapes in the result of boolean operation. - Test cases blend buildevol G1, blend simple K4, bcommon_complex C7, feat featprism L6 have been modified as they are improvements. - Test case boolean bsection A3 has been modified according to the new syntax of the bsection command. - Test cases boolean bfuse_complex J1 P9 have been fixed (the function IsInternalFace has been modified to use the function GetFaceOff); - Test case chl 902 H3 has been fixed (changes in the treatment of section edges); - Test case boolean bsection D8 has been modified (removed TODO statement); - Test case boolean bsection A3 has been modified (as the shapes have been changed). - Added correction of the tolerance values of the shapes according to the bug 0023610. - test cases: boolean bcommon_complex C3, boolean bcut_complex F2 O7, boolean bfuse_complex C4 C5 E4, boolean bsection B6 M8 M9 N4 N5 N7, boolean bfuse_simple ZP6, draft angle G8, feat featprism S2 have been marked as invalid according to the bug 0022033; - New value of result has been set in the test cases : boolean bopsection D4 boolean bsection R8 as it is correct. - test case bugs modalg bug23472 has been rewritten according to the new format of bsection command. - The classes IntTools_Context and IntTools_ShrunkRange have been replaced by BOPInt_Context and BOPInt_ShrunkRange accordingly. - The new class BRepAlgoAPI_Check has been added according to the bug 0023648. - Some regressions have been fixed. - The following test cases have been marked as invalid or rewritten bugs modalg buc60462_2, 60531_2, 60776_1, bug472_1, bug472_2, bug472_3, bug497_3, bug62 bugs moddata bug26_1, bug26_2, - The test case bugs modalg buc60533 has been rewritten to use the general fuse algorithm for building the result. - The new value of the result has been set in the test case bugs modalg 60776_2. - The following test cases have been rewritten according to the new format of the bsection command bugs modlag fra62369, pro18892 bugs moddata bug75_1, bug75_2 - Corrected BRepAlgoAPI_Check. - Removed package BOPTColStd. - Rewritten test cases caf named_shape F8 F9. - Removed unnecessary comments. - Corrected the following test scripts : boolean bcut_complex(012) O3 O4 O5 O6 O8 boolean bfuse_complex(013) O5 O6 P8 boolean bopcommon_complex(021) D8 D9 boolean bopfuse_complex(022) H1 J6 boolean boptuc_complex(024) D5 bugs modalg(006) bug399 bug497_1 feat featprism(003) C4 - Corrections in the treatment of section edges (putting paves on the curves); - Corrections in BRepOffset_Tool; - The following test cases have been rewritten according to the new format of the bsection command bugs modalg bug6502, bug6554, bug6766_1, bug6766_3 - The new value of the result has been set in the following test cases bugs modalg bug1255, bug1255_1 - The following test cases have been marked as invalid or rewritten bugs modalg bug472_2, bug472_3, bug825_2 bugs moddata bug10603, bug152_1, bug152_2, bug3721_1, bug3721_2, bug3721_3 - The following test cases have been rewritten as improvements bugs modalg bug693, bug693_1, bug817_1 bugs moddata bug3721_5, bug3721_6, bug6862_3, bug6862_4, bug6862_6 - Test cases bugs modlag buc60787_1, buc60787_2, buc60788_2, buc60788_3 have been corrected. - Fixed some SALOME regressions (modifications in the treatment of the section edges); - Fixed test case bugs modalg bug23100; - Test cases bugs modalg bug21754, bug22990 have been corrected according to the new format of the bsection command. - Test cases bugs modalg bug13116_*, bug23711 have been fixed; - Test cases bugs modalg bug697_2, bug697_4, bug697_7, bug697_8 have been marked as invalid according to the issue 0022033; - Test cases bugs modalg bug22109_2, bug22109_3 have been corrected; - Test case bugs modalg bug18186 has been corrected as it is improvement; - Test case bugs modalg bug22802 has been deleted as there is no package BOPTColStd.
509 lines
14 KiB
C++
Executable File
509 lines
14 KiB
C++
Executable File
// Created on: 1993-10-15
|
|
// Created by: Remi LEQUETTE
|
|
// Copyright (c) 1993-1999 Matra Datavision
|
|
// Copyright (c) 1999-2012 OPEN CASCADE SAS
|
|
//
|
|
// The content of this file is subject to the Open CASCADE Technology Public
|
|
// License Version 6.5 (the "License"). You may not use the content of this file
|
|
// except in compliance with the License. Please obtain a copy of the License
|
|
// at http://www.opencascade.org and read it completely before using this file.
|
|
//
|
|
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
|
|
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
|
|
//
|
|
// The Original Code and all software distributed under the License is
|
|
// distributed on an "AS IS" basis, without warranty of any kind, and the
|
|
// Initial Developer hereby disclaims all such warranties, including without
|
|
// limitation, any warranties of merchantability, fitness for a particular
|
|
// purpose or non-infringement. Please see the License for the specific terms
|
|
// and conditions governing the rights and limitations under the License.
|
|
|
|
#include <BRepAlgoAPI_BooleanOperation.ixx>
|
|
|
|
#include <BRepLib_FuseEdges.hxx>
|
|
#include <TopExp.hxx>
|
|
#include <TopTools_MapOfShape.hxx>
|
|
#include <TopTools_ListIteratorOfListOfShape.hxx>
|
|
|
|
#include <BOPAlgo_PaveFiller.hxx>
|
|
#include <BOPAlgo_BOP.hxx>
|
|
#include <BOPDS_DS.hxx>
|
|
|
|
//=======================================================================
|
|
//function : BRepAlgoAPI_BooleanOperation
|
|
//purpose :
|
|
//=======================================================================
|
|
BRepAlgoAPI_BooleanOperation::BRepAlgoAPI_BooleanOperation(const TopoDS_Shape& aS1,
|
|
const TopoDS_Shape& aS2,
|
|
const BOPAlgo_Operation anOp)
|
|
:
|
|
myS1(aS1),
|
|
myS2(aS2),
|
|
myBuilderCanWork(Standard_False),
|
|
myOperation(anOp),
|
|
myErrorStatus(1),
|
|
myDSFiller(NULL),
|
|
myBuilder(NULL),
|
|
myEntryType(1),
|
|
myFuseEdges(Standard_False)
|
|
{
|
|
}
|
|
//=======================================================================
|
|
//function : BRepAlgoAPI_BooleanOperation
|
|
//purpose :
|
|
//=======================================================================
|
|
BRepAlgoAPI_BooleanOperation::BRepAlgoAPI_BooleanOperation(const TopoDS_Shape& aS1,
|
|
const TopoDS_Shape& aS2,
|
|
const BOPAlgo_PaveFiller& aDSFiller,
|
|
const BOPAlgo_Operation anOp)
|
|
:
|
|
myS1(aS1),
|
|
myS2(aS2),
|
|
myBuilderCanWork(Standard_False),
|
|
myOperation(anOp),
|
|
myErrorStatus(1),
|
|
myDSFiller(NULL),
|
|
myBuilder(NULL),
|
|
myEntryType(0),
|
|
myFuseEdges(Standard_False)
|
|
{
|
|
if ((Standard_Address) &aDSFiller!=NULL) {
|
|
myDSFiller=(BOPAlgo_PaveFiller*)&aDSFiller;
|
|
}
|
|
}
|
|
//=======================================================================
|
|
//function : Destroy
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_BooleanOperation::Destroy()
|
|
{
|
|
if (myBuilder!=NULL) {
|
|
delete myBuilder;
|
|
myBuilder=NULL;
|
|
}
|
|
if (myDSFiller!=NULL && myEntryType) {
|
|
delete myDSFiller;
|
|
myDSFiller=NULL;
|
|
}
|
|
|
|
//
|
|
myModifFaces.Clear();
|
|
myEdgeMap.Clear();
|
|
}
|
|
//=======================================================================
|
|
//function : SetOperation
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_BooleanOperation::SetOperation (const BOPAlgo_Operation anOp)
|
|
{
|
|
myOperation=anOp;
|
|
}
|
|
//=======================================================================
|
|
//function : Operation
|
|
//purpose :
|
|
//=======================================================================
|
|
BOPAlgo_Operation BRepAlgoAPI_BooleanOperation::Operation ()const
|
|
{
|
|
return myOperation;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : FuseEdges
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::FuseEdges ()const
|
|
{
|
|
return myFuseEdges;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Shape1
|
|
//purpose :
|
|
//=======================================================================
|
|
const TopoDS_Shape& BRepAlgoAPI_BooleanOperation::Shape1() const
|
|
{
|
|
return myS1;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Shape2
|
|
//purpose :
|
|
//=======================================================================
|
|
const TopoDS_Shape& BRepAlgoAPI_BooleanOperation::Shape2() const
|
|
{
|
|
return myS2;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : BuilderCanWork
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::BuilderCanWork() const
|
|
{
|
|
return myBuilderCanWork;
|
|
}
|
|
//=======================================================================
|
|
//function : ErrorStatus
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Integer BRepAlgoAPI_BooleanOperation::ErrorStatus()const
|
|
{
|
|
return myErrorStatus;
|
|
}
|
|
//=======================================================================
|
|
//function : Modified
|
|
//purpose :
|
|
//=======================================================================
|
|
const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_Shape& aS)
|
|
{
|
|
if (myBuilder==NULL) {
|
|
myGenerated.Clear();
|
|
return myGenerated;
|
|
}
|
|
else {
|
|
myGenerated = myBuilder->Modified(aS);
|
|
|
|
if(myFuseEdges) {
|
|
TopTools_ListOfShape theLS;
|
|
theLS.Assign(myGenerated);
|
|
//
|
|
RefinedList(theLS);
|
|
}
|
|
return myGenerated;
|
|
}
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : IsDeleted
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::IsDeleted(const TopoDS_Shape& aS)
|
|
{
|
|
Standard_Boolean bDeleted = Standard_True;
|
|
if (myBuilder != NULL) {
|
|
bDeleted=myBuilder->IsDeleted(aS);
|
|
}
|
|
return bDeleted;
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : PrepareFiller
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::PrepareFiller()
|
|
{
|
|
Standard_Boolean bIsNewFiller=Standard_False;
|
|
myErrorStatus=1;
|
|
//
|
|
if (myS1.IsNull() || myS2.IsNull()) {
|
|
myErrorStatus=2;
|
|
return bIsNewFiller;
|
|
}
|
|
//
|
|
if (myOperation==BOPAlgo_UNKNOWN) {
|
|
myErrorStatus=6;
|
|
return bIsNewFiller;
|
|
}
|
|
//
|
|
if (myDSFiller==NULL) {
|
|
bIsNewFiller=!bIsNewFiller;
|
|
|
|
myDSFiller=new BOPAlgo_PaveFiller;
|
|
//
|
|
if (myDSFiller==NULL) {
|
|
myErrorStatus=4;
|
|
return bIsNewFiller;
|
|
}
|
|
//
|
|
BOPCol_ListOfShape aLS;
|
|
aLS.Append(myS1);
|
|
aLS.Append(myS2);
|
|
//
|
|
myDSFiller->SetArguments(aLS);
|
|
}
|
|
|
|
return bIsNewFiller;
|
|
}
|
|
//=======================================================================
|
|
//function : Build
|
|
//purpose :
|
|
//=======================================================================
|
|
void BRepAlgoAPI_BooleanOperation::Build()
|
|
{
|
|
Standard_Boolean bIsNewFiller;
|
|
Standard_Integer iErr;
|
|
//
|
|
myBuilderCanWork=Standard_False;
|
|
NotDone();
|
|
//
|
|
bIsNewFiller=PrepareFiller();
|
|
//
|
|
if (myErrorStatus!=1) {
|
|
// there was errors during the preparation
|
|
return;
|
|
}
|
|
//
|
|
if (bIsNewFiller) {
|
|
//Prepare the DS
|
|
myDSFiller->Perform();
|
|
}
|
|
//
|
|
if (myBuilder!=NULL) {
|
|
delete myBuilder;
|
|
myBuilder=NULL;
|
|
}
|
|
//
|
|
const TopoDS_Shape& aS1 = myS1;
|
|
const TopoDS_Shape& aS2 = myS2;
|
|
//
|
|
myShape.Nullify();
|
|
|
|
myBuilder=new BOPAlgo_BOP;
|
|
myBuilder->AddArgument(aS1);
|
|
myBuilder->AddTool(aS2);
|
|
myBuilder->SetOperation(myOperation);
|
|
//
|
|
myBuilder->PerformWithFiller(*myDSFiller);
|
|
iErr = myBuilder->ErrorStatus();
|
|
if (!iErr) {
|
|
myErrorStatus=0;
|
|
myBuilderCanWork=Standard_True;
|
|
myShape=myBuilder->Shape();
|
|
Done();
|
|
}
|
|
else {
|
|
myErrorStatus=100+iErr;
|
|
NotDone();
|
|
}
|
|
}
|
|
|
|
//
|
|
//=======================================================================
|
|
//function : SectionEdges
|
|
//purpose :
|
|
//=======================================================================
|
|
const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::SectionEdges()
|
|
{
|
|
if (myBuilder==NULL) {
|
|
myGenerated.Clear();
|
|
return myGenerated;
|
|
}
|
|
//
|
|
Standard_Integer aNb, i, j, aNbCurves, nE;
|
|
BOPDS_ListIteratorOfListOfPaveBlock anIt;
|
|
//
|
|
const BOPDS_PDS& pDS = myDSFiller->PDS();
|
|
BOPDS_VectorOfInterfFF& aFFs=pDS->InterfFF();
|
|
myGenerated.Clear();
|
|
//
|
|
aNb=aFFs.Extent();
|
|
for (i = 0; i < aNb; i++) {
|
|
BOPDS_InterfFF& aFFi=aFFs(i);
|
|
const BOPDS_VectorOfCurve& aSeqOfCurve=aFFi.Curves();
|
|
//
|
|
aNbCurves=aSeqOfCurve.Extent();
|
|
for (j=0; j<aNbCurves; j++) {
|
|
const BOPDS_Curve& aCurve=aSeqOfCurve(j);
|
|
const BOPDS_ListOfPaveBlock& aSectEdges = aCurve.PaveBlocks();
|
|
//
|
|
anIt.Initialize(aSectEdges);
|
|
for(; anIt.More(); anIt.Next()) {
|
|
const Handle(BOPDS_PaveBlock)& aPB = anIt.Value();
|
|
nE = aPB->Edge();
|
|
const TopoDS_Shape& aE = pDS->Shape(nE);
|
|
myGenerated.Append(aE);
|
|
}
|
|
}
|
|
}
|
|
//
|
|
if(myFuseEdges) {
|
|
TopTools_ListOfShape theLS;
|
|
theLS.Assign(myGenerated);
|
|
//
|
|
RefinedList(theLS);
|
|
}
|
|
//
|
|
return myGenerated;
|
|
}
|
|
|
|
// ================================================================================================
|
|
// function: Modified2
|
|
// purpose:
|
|
// ================================================================================================
|
|
const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified2(const TopoDS_Shape& aS)
|
|
{
|
|
if (myBuilder==NULL) {
|
|
myGenerated.Clear();
|
|
return myGenerated;
|
|
}
|
|
//
|
|
BOPCol_ListOfShape aLS;
|
|
BOPCol_ListIteratorOfListOfShape aIt;
|
|
myGenerated.Clear();
|
|
//
|
|
const BOPCol_DataMapOfShapeListOfShape& aImages = myBuilder->Images();
|
|
if (aImages.IsBound(aS)) {
|
|
aLS = aImages.Find(aS);
|
|
} else {
|
|
myGenerated.Append(aS);
|
|
}
|
|
//
|
|
aIt.Initialize(aLS);
|
|
for (;aIt.More(); aIt.Next()) {
|
|
myGenerated.Append(aIt.Value());
|
|
}
|
|
//
|
|
if (myFuseEdges) {
|
|
TopTools_ListOfShape theLS;
|
|
theLS.Assign(myGenerated);
|
|
//
|
|
RefinedList(theLS);
|
|
}
|
|
return myGenerated;
|
|
}
|
|
|
|
// ================================================================================================
|
|
// function: Generated
|
|
// purpose:
|
|
// ================================================================================================
|
|
const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Generated(const TopoDS_Shape& S)
|
|
{
|
|
if (myBuilder==NULL) {
|
|
myGenerated.Clear();
|
|
return myGenerated;
|
|
}
|
|
//
|
|
if(myFuseEdges) {
|
|
const TopTools_ListOfShape& aL = myBuilder->Generated(S);
|
|
return RefinedList(aL);
|
|
}
|
|
|
|
return myBuilder->Generated(S);
|
|
}
|
|
|
|
// ================================================================================================
|
|
// function: HasModified
|
|
// purpose:
|
|
// ================================================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::HasModified() const
|
|
{
|
|
if (myBuilder==NULL) {
|
|
return Standard_False;
|
|
}
|
|
return myBuilder->HasModified();
|
|
}
|
|
|
|
// ================================================================================================
|
|
// function: HasGenerated
|
|
// purpose:
|
|
// ================================================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::HasGenerated() const
|
|
{
|
|
if (myBuilder==NULL) {
|
|
return Standard_False;
|
|
}
|
|
return myBuilder->HasGenerated();
|
|
}
|
|
|
|
// ================================================================================================
|
|
// function: HasDeleted
|
|
// purpose:
|
|
// ================================================================================================
|
|
Standard_Boolean BRepAlgoAPI_BooleanOperation::HasDeleted() const
|
|
{
|
|
if (myBuilder==NULL) {
|
|
return Standard_False;
|
|
}
|
|
return myBuilder->HasDeleted();
|
|
}
|
|
//=======================================================================
|
|
//function : RefineEdges
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
void BRepAlgoAPI_BooleanOperation::RefineEdges ()
|
|
{
|
|
if(myFuseEdges) return; //Edges have been refined yet
|
|
|
|
BRepLib_FuseEdges FE(myShape);
|
|
FE.SetConcatBSpl(Standard_True);
|
|
|
|
// avoid fusing old edges
|
|
TopTools_IndexedMapOfShape mapOldEdges;
|
|
TopExp::MapShapes (myS1, TopAbs_EDGE, mapOldEdges);
|
|
TopExp::MapShapes (myS2, TopAbs_EDGE, mapOldEdges);
|
|
FE.AvoidEdges (mapOldEdges);
|
|
|
|
// Get List of edges that have been fused
|
|
myFuseEdges = Standard_False;
|
|
myModifFaces.Clear();
|
|
myEdgeMap.Clear();
|
|
TopTools_DataMapOfIntegerListOfShape aFusedEdges;
|
|
|
|
FE.Edges(aFusedEdges);
|
|
Standard_Integer nle = aFusedEdges.Extent();
|
|
if (nle != 0) {
|
|
FE.Perform();
|
|
myShape = FE.Shape();
|
|
|
|
TopTools_DataMapOfIntegerShape aResultEdges;
|
|
|
|
FE.ResultEdges(aResultEdges);
|
|
FE.Faces(myModifFaces);
|
|
myFuseEdges = Standard_True;
|
|
|
|
Standard_Integer i;
|
|
for(i = 1; i <= nle; ++i) {
|
|
const TopoDS_Shape& aNewE = aResultEdges(i);
|
|
const TopTools_ListOfShape& aListOfOldEdges = aFusedEdges(i);
|
|
TopTools_ListIteratorOfListOfShape anIter(aListOfOldEdges);
|
|
for(; anIter.More(); anIter.Next()) {
|
|
myEdgeMap.Bind(anIter.Value(), aNewE);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : RefinedList
|
|
//purpose :
|
|
//=======================================================================
|
|
const TopTools_ListOfShape&
|
|
BRepAlgoAPI_BooleanOperation::RefinedList(const TopTools_ListOfShape& theL)
|
|
{
|
|
myGenerated.Clear();
|
|
TopTools_MapOfShape aMap;
|
|
|
|
TopTools_ListIteratorOfListOfShape anIter(theL);
|
|
|
|
for(; anIter.More(); anIter.Next()) {
|
|
const TopoDS_Shape& anS = anIter.Value();
|
|
|
|
if(anS.ShapeType() == TopAbs_EDGE) {
|
|
if(myEdgeMap.IsBound(anS)) {
|
|
const TopoDS_Shape& aNewEdge = myEdgeMap.Find(anS);
|
|
if(aMap.Add(aNewEdge)) {
|
|
myGenerated.Append(aNewEdge);
|
|
}
|
|
}
|
|
else {
|
|
myGenerated.Append(anS);
|
|
}
|
|
}
|
|
else if (anS.ShapeType() == TopAbs_FACE) {
|
|
if(myModifFaces.IsBound(anS)) {
|
|
myGenerated.Append(myModifFaces.Find(anS));
|
|
}
|
|
else {
|
|
myGenerated.Append(anS);
|
|
}
|
|
}
|
|
else {
|
|
myGenerated.Append(anS);
|
|
}
|
|
}
|
|
|
|
return myGenerated;
|
|
|
|
}
|