mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +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
254
src/BOPDS/BOPDS_CommonBlock.cxx
Normal file
254
src/BOPDS/BOPDS_CommonBlock.cxx
Normal file
@@ -0,0 +1,254 @@
|
||||
// Created by: Peter KURNEV
|
||||
// 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 <BOPDS_CommonBlock.ixx>
|
||||
|
||||
//=======================================================================
|
||||
// function:
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
BOPDS_CommonBlock::BOPDS_CommonBlock()
|
||||
{
|
||||
}
|
||||
//=======================================================================
|
||||
// function:
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
BOPDS_CommonBlock::BOPDS_CommonBlock(const Handle(NCollection_BaseAllocator)& theAllocator)
|
||||
:
|
||||
myPaveBlocks(theAllocator),
|
||||
myFaces(theAllocator)
|
||||
{
|
||||
}
|
||||
//=======================================================================
|
||||
// function: AddPaveBlock
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
void BOPDS_CommonBlock::AddPaveBlock(const Handle(BOPDS_PaveBlock)& aPB)
|
||||
{
|
||||
myPaveBlocks.Append(aPB);
|
||||
}
|
||||
//=======================================================================
|
||||
// function: AddPaveBlocks
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
void BOPDS_CommonBlock::AddPaveBlocks(const BOPDS_ListOfPaveBlock& aLPB)
|
||||
{
|
||||
myPaveBlocks=aLPB;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: PaveBlocks
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
const BOPDS_ListOfPaveBlock& BOPDS_CommonBlock::PaveBlocks()const
|
||||
{
|
||||
return myPaveBlocks;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: AddFace
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
void BOPDS_CommonBlock::AddFace(const Standard_Integer aF)
|
||||
{
|
||||
myFaces.Append(aF);
|
||||
}
|
||||
//=======================================================================
|
||||
// function: AddFaces
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
void BOPDS_CommonBlock::AddFaces(const BOPCol_ListOfInteger& aLF)
|
||||
{
|
||||
myFaces=aLF;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: Faces
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
const BOPCol_ListOfInteger& BOPDS_CommonBlock::Faces()const
|
||||
{
|
||||
return myFaces;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: PaveBlock1
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
const Handle(BOPDS_PaveBlock)& BOPDS_CommonBlock::PaveBlock1()const
|
||||
{
|
||||
return myPaveBlocks.First();
|
||||
}
|
||||
//=======================================================================
|
||||
// function: PaveBlockOnEdge
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
Handle(BOPDS_PaveBlock)& BOPDS_CommonBlock::PaveBlockOnEdge(const Standard_Integer aIx)
|
||||
{
|
||||
static Handle(BOPDS_PaveBlock) aPBs;
|
||||
//
|
||||
Standard_Integer aIOr;
|
||||
BOPDS_ListIteratorOfListOfPaveBlock anIt;
|
||||
//
|
||||
anIt.Initialize(myPaveBlocks);
|
||||
for (; anIt.More(); anIt.Next()) {
|
||||
Handle(BOPDS_PaveBlock)& aPB=anIt.ChangeValue();
|
||||
aIOr=aPB->OriginalEdge();
|
||||
if (aIOr==aIx){
|
||||
return aPB;
|
||||
}
|
||||
}
|
||||
return aPBs;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: IsPaveBlockOnFace
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
Standard_Boolean BOPDS_CommonBlock::IsPaveBlockOnFace(const Standard_Integer aIx)const
|
||||
{
|
||||
Standard_Boolean bFound;
|
||||
Standard_Integer nF;
|
||||
BOPCol_ListIteratorOfListOfInteger anIt;
|
||||
//
|
||||
bFound=Standard_False;
|
||||
anIt.Initialize(myFaces);
|
||||
for (; anIt.More(); anIt.Next()) {
|
||||
nF=anIt.Value();
|
||||
if (nF==aIx){
|
||||
return !bFound;
|
||||
}
|
||||
}
|
||||
return bFound;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: IsPaveBlockOnEdge
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
Standard_Boolean BOPDS_CommonBlock::IsPaveBlockOnEdge(const Standard_Integer aIx)const
|
||||
{
|
||||
Standard_Boolean bFound;
|
||||
Standard_Integer aIOr;
|
||||
BOPDS_ListIteratorOfListOfPaveBlock anIt;
|
||||
//
|
||||
bFound=Standard_False;
|
||||
anIt.Initialize(myPaveBlocks);
|
||||
for (; anIt.More(); anIt.Next()) {
|
||||
const Handle(BOPDS_PaveBlock)& aPB=anIt.Value();
|
||||
aIOr=aPB->OriginalEdge();
|
||||
if (aIOr==aIx){
|
||||
return !bFound;
|
||||
}
|
||||
}
|
||||
return bFound;
|
||||
}
|
||||
//=======================================================================
|
||||
//function : SetEdge
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
void BOPDS_CommonBlock::SetEdge(const Standard_Integer theEdge)
|
||||
{
|
||||
BOPDS_ListIteratorOfListOfPaveBlock anIt;
|
||||
//
|
||||
anIt.Initialize(myPaveBlocks);
|
||||
for (; anIt.More(); anIt.Next()) {
|
||||
Handle(BOPDS_PaveBlock)& aPB=anIt.ChangeValue();
|
||||
aPB->SetEdge(theEdge);
|
||||
}
|
||||
}
|
||||
//=======================================================================
|
||||
//function : Edge
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
Standard_Integer BOPDS_CommonBlock::Edge()const
|
||||
{
|
||||
const Handle(BOPDS_PaveBlock)& aPB1=myPaveBlocks.First();
|
||||
if(!aPB1.IsNull()) {
|
||||
return aPB1->Edge();
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: Contains
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
Standard_Boolean BOPDS_CommonBlock::Contains(const Handle(BOPDS_PaveBlock)& aPBx)const
|
||||
{
|
||||
Standard_Boolean bFound;
|
||||
Standard_Integer aNb1;
|
||||
BOPDS_ListIteratorOfListOfPaveBlock anIt;
|
||||
//
|
||||
bFound=Standard_False;
|
||||
aNb1=myPaveBlocks.Extent();
|
||||
//
|
||||
if (!aNb1) {
|
||||
return bFound;
|
||||
}
|
||||
//
|
||||
anIt.Initialize(myPaveBlocks);
|
||||
for (; anIt.More(); anIt.Next()) {
|
||||
const Handle(BOPDS_PaveBlock)& aPB=anIt.Value();
|
||||
if (aPB==aPBx) {
|
||||
return !bFound;
|
||||
}
|
||||
}
|
||||
return bFound;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: Contains
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
Standard_Boolean BOPDS_CommonBlock::Contains(const Standard_Integer theF)const
|
||||
{
|
||||
Standard_Boolean bFound;
|
||||
BOPCol_ListIteratorOfListOfInteger aIt;
|
||||
//
|
||||
bFound=Standard_False;
|
||||
aIt.Initialize(myFaces);
|
||||
for (; aIt.More(); aIt.Next()) {
|
||||
if (aIt.Value()==theF) {
|
||||
return !bFound;
|
||||
}
|
||||
}
|
||||
return bFound;
|
||||
}
|
||||
//=======================================================================
|
||||
// function: Dump
|
||||
// purpose:
|
||||
//=======================================================================
|
||||
void BOPDS_CommonBlock::Dump()const
|
||||
{
|
||||
Standard_Integer nF;
|
||||
BOPCol_ListIteratorOfListOfInteger aIt;
|
||||
BOPDS_ListIteratorOfListOfPaveBlock aItPB;
|
||||
//
|
||||
printf(" -- CB:\n");
|
||||
aItPB.Initialize(myPaveBlocks);
|
||||
for (; aItPB.More(); aItPB.Next()) {
|
||||
const Handle(BOPDS_PaveBlock)& aPB=aItPB.Value();
|
||||
aPB->Dump();
|
||||
printf("\n");
|
||||
}
|
||||
//
|
||||
if (myFaces.Extent()) {
|
||||
printf(" Faces:");
|
||||
aIt.Initialize(myFaces);
|
||||
for (; aIt.More(); aIt.Next()) {
|
||||
nF=aIt.Value();
|
||||
printf(" %d", nF);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user