mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-29 14:00:49 +03:00
0021762: Integration of new Boolean Operation algorithm to OCCT.
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.
This commit is contained in:
emv
@@ -29,7 +29,8 @@ uses
|
||||
TopAbs,
|
||||
BRepTools,
|
||||
gp,
|
||||
BOPTools
|
||||
BOPAlgo,
|
||||
BOPDS
|
||||
|
||||
is
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ QANewModTopOpe_Glue::QANewModTopOpe_Glue(const TopoDS_Shape& theS1,
|
||||
const TopoDS_Shape& theS2,
|
||||
const Standard_Boolean theAllowCutting,
|
||||
const Standard_Boolean thePerformNow)
|
||||
: BRepAlgoAPI_BooleanOperation (theS1,theS2, BOP_FUSE),
|
||||
: BRepAlgoAPI_BooleanOperation (theS1,theS2, BOPAlgo_FUSE),
|
||||
myAllowCutting (theAllowCutting),
|
||||
myCompleted (Standard_False)
|
||||
{
|
||||
|
||||
@@ -429,14 +429,14 @@ QANewModTopOpe_Glue::PerformSDFaces()
|
||||
if (!isAnalitic(aFirstFace))
|
||||
continue;
|
||||
|
||||
if (QANewModTopOpe_Tools::HasSameDomain(myDSFiller, aFirstFace)) {
|
||||
if (QANewModTopOpe_Tools::HasSameDomain(myBuilder, aFirstFace)) {
|
||||
|
||||
if(!aHasSDF) aHasSDF = Standard_True;
|
||||
|
||||
TopTools_ListOfShape aLOfSDFace;
|
||||
TopTools_ListIteratorOfListOfShape anIter;
|
||||
|
||||
QANewModTopOpe_Tools::SameDomain(myDSFiller, aFirstFace, aLOfSDFace);
|
||||
QANewModTopOpe_Tools::SameDomain(myBuilder, aFirstFace, aLOfSDFace);
|
||||
anIter.Initialize(aLOfSDFace);
|
||||
|
||||
for(; anIter.More(); anIter.Next()) {
|
||||
@@ -583,7 +583,7 @@ QANewModTopOpe_Glue::PerformSDFaces()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// remove items from the data map
|
||||
for(TopTools_ListIteratorOfListOfShape anIt(aShapesToRemove); anIt.More(); anIt.Next())
|
||||
myMapModif.UnBind(anIt.Value());
|
||||
|
||||
@@ -208,7 +208,7 @@ SplitEdgeComplete (const TopoDS_Edge& theEdge,
|
||||
|
||||
static void
|
||||
SplitEdge (const TopoDS_Edge &theEdge,
|
||||
const BOPTools_PDSFiller &thePDSFiller,
|
||||
const BOPAlgo_PPaveFiller &thePDSFiller,
|
||||
const TopTools_MapOfShape &theEdgesValid,
|
||||
const Standard_Boolean useMap,
|
||||
TopTools_ListOfShape &theListSplits)
|
||||
@@ -446,13 +446,13 @@ QANewModTopOpe_Glue::PerformShell()
|
||||
hasSolid2 = Standard_True;
|
||||
|
||||
if (hasSolid1 && hasSolid2)
|
||||
myOperation = BOP_FUSE;
|
||||
myOperation = BOPAlgo_FUSE;
|
||||
else if (hasSolid1)
|
||||
myOperation = BOP_CUT21;
|
||||
myOperation = BOPAlgo_CUT21;
|
||||
else if (hasSolid2)
|
||||
myOperation = BOP_CUT;
|
||||
myOperation = BOPAlgo_CUT;
|
||||
else
|
||||
myOperation = BOP_SECTION;
|
||||
myOperation = BOPAlgo_SECTION;
|
||||
|
||||
BRepAlgoAPI_BooleanOperation::Build();
|
||||
if (!BuilderCanWork())
|
||||
@@ -885,7 +885,7 @@ QANewModTopOpe_Glue::PerformShell()
|
||||
static TopoDS_Face
|
||||
SplitFaceBoundary (const TopoDS_Face& theFace,
|
||||
BRepTools_Substitution& theSubst,
|
||||
const BOPTools_PDSFiller &thePDSFiller,
|
||||
const BOPAlgo_PPaveFiller &thePDSFiller,
|
||||
const TopTools_MapOfShape& theEdgesValid,
|
||||
const Standard_Boolean useMap,
|
||||
TopTools_DataMapOfShapeListOfShape& theMapModif)
|
||||
|
||||
@@ -32,12 +32,12 @@
|
||||
#include <TopTools_ListOfShape.hxx>
|
||||
#include <TopoDS_Iterator.hxx>
|
||||
#include <BRepTools.hxx>
|
||||
#include <BOPTools_SSIntersectionAttribute.hxx>
|
||||
#include <BOPTools_DSFiller.hxx>
|
||||
#include <TopTools_MapOfShape.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <QANewModTopOpe_Tools.hxx>
|
||||
|
||||
#include <BOPAlgo_PaveFiller.hxx>
|
||||
|
||||
|
||||
static Standard_Boolean NoFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2)
|
||||
{
|
||||
@@ -52,7 +52,7 @@ static Standard_Boolean NoFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2)
|
||||
|
||||
QANewModTopOpe_Intersection::QANewModTopOpe_Intersection( const TopoDS_Shape& theObject1,
|
||||
const TopoDS_Shape& theObject2 )
|
||||
: BRepAlgoAPI_BooleanOperation( theObject1, theObject2, BOP_SECTION)
|
||||
: BRepAlgoAPI_BooleanOperation( theObject1, theObject2, BOPAlgo_SECTION)
|
||||
{
|
||||
myMapGener.Clear();
|
||||
|
||||
@@ -137,9 +137,8 @@ QANewModTopOpe_Intersection::QANewModTopOpe_Intersection( const TopoDS_Shape& th
|
||||
//
|
||||
if (bIsNewFiller) {
|
||||
//Prepare the DS
|
||||
BOPTools_SSIntersectionAttribute aSectionAttribute(Standard_True,
|
||||
Standard_False, Standard_False);
|
||||
myDSFiller->Perform(aSectionAttribute);
|
||||
myDSFiller->Perform();
|
||||
|
||||
}
|
||||
|
||||
Build();
|
||||
|
||||
@@ -24,28 +24,29 @@ uses
|
||||
Edge from TopoDS,
|
||||
Shape from TopoDS,
|
||||
State from TopAbs,
|
||||
PDSFiller from BOPTools,
|
||||
PPaveFiller from BOPAlgo,
|
||||
PBOP from BOPAlgo,
|
||||
ListOfShape from TopTools,
|
||||
IndexedDataMapOfShapeListOfShape from TopTools
|
||||
|
||||
is
|
||||
|
||||
NbPoints(myclass; theDSFiller: PDSFiller from BOPTools)
|
||||
NbPoints(myclass; theDSFiller: PPaveFiller from BOPAlgo)
|
||||
returns Integer from Standard;
|
||||
|
||||
NewVertex(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
NewVertex(myclass; theDSFiller: PPaveFiller from BOPAlgo;
|
||||
theIndex : Integer from Standard)
|
||||
returns Shape from TopoDS;
|
||||
|
||||
HasSameDomain(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
HasSameDomain(myclass; theBuilder: PBOP from BOPAlgo;
|
||||
theFace : Shape from TopoDS)
|
||||
returns Boolean from Standard;
|
||||
|
||||
SameDomain(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
SameDomain(myclass; theBuilder: PBOP from BOPAlgo;
|
||||
theFace : Shape from TopoDS;
|
||||
theResultList: out ListOfShape from TopTools);
|
||||
|
||||
IsSplit(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
IsSplit(myclass; theDSFiller: PPaveFiller from BOPAlgo;
|
||||
theEdge : Shape from TopoDS;
|
||||
theState : State from TopAbs)
|
||||
returns Boolean from Standard;
|
||||
@@ -53,7 +54,7 @@ is
|
||||
--- arguments of which was solids or compounds of solids.
|
||||
---
|
||||
|
||||
Splits(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
Splits(myclass; theDSFiller: PPaveFiller from BOPAlgo;
|
||||
theEdge : Shape from TopoDS;
|
||||
theState : State from TopAbs;
|
||||
theResultList: out ListOfShape from TopTools);
|
||||
@@ -65,13 +66,13 @@ is
|
||||
theSplits: out ListOfShape from TopTools)
|
||||
returns Boolean from Standard;
|
||||
|
||||
EdgeCurveAncestors(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
EdgeCurveAncestors(myclass; theDSFiller: PPaveFiller from BOPAlgo;
|
||||
theEdge : Shape from TopoDS;
|
||||
theFace1 : out Shape from TopoDS;
|
||||
theFace2 : out Shape from TopoDS)
|
||||
returns Boolean from Standard;
|
||||
|
||||
EdgeSectionAncestors(myclass; theDSFiller: PDSFiller from BOPTools;
|
||||
EdgeSectionAncestors(myclass; theDSFiller: PPaveFiller from BOPAlgo;
|
||||
theEdge : Shape from TopoDS;
|
||||
LF1,LF2 : out ListOfShape from TopTools;
|
||||
LE1,LE2 : out ListOfShape from TopTools)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user