mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-06-30 12:14:08 +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.
265 lines
8.1 KiB
C++
265 lines
8.1 KiB
C++
// 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_SubIterator.ixx>
|
|
//
|
|
#include <Bnd_Box.hxx>
|
|
//
|
|
#include <NCollection_BaseAllocator.hxx>
|
|
#include <NCollection_UBTreeFiller.hxx>
|
|
//
|
|
#include <TopoDS.hxx>
|
|
#include <TopoDS_Vertex.hxx>
|
|
#include <TopoDS_Shape.hxx>
|
|
//
|
|
#include <BOPCol_IndexedDataMapOfShapeBox.hxx>
|
|
#include <BOPCol_DataMapOfIntegerInteger.hxx>
|
|
#include <BOPCol_DataMapOfIntegerMapOfInteger.hxx>
|
|
#include <BOPCol_MapOfInteger.hxx>
|
|
//
|
|
#include <BOPDS_BoxBndTree.hxx>
|
|
#include <BOPDS_IndexRange.hxx>
|
|
#include <BOPDS_PassKeyBoolean.hxx>
|
|
#include <BOPDS_MapOfPassKeyBoolean.hxx>
|
|
#include <BOPDS_Tools.hxx>
|
|
#include <BOPDS_MapOfPassKeyBoolean.hxx>
|
|
|
|
//=======================================================================
|
|
//function :
|
|
//purpose :
|
|
//=======================================================================
|
|
BOPDS_SubIterator::BOPDS_SubIterator()
|
|
:
|
|
myAllocator(NCollection_BaseAllocator::CommonBaseAllocator()),
|
|
myList(myAllocator)
|
|
{
|
|
myDS=NULL;
|
|
}
|
|
//=======================================================================
|
|
//function :
|
|
//purpose :
|
|
//=======================================================================
|
|
BOPDS_SubIterator::BOPDS_SubIterator(const Handle(NCollection_BaseAllocator)& theAllocator)
|
|
:
|
|
myAllocator(theAllocator),
|
|
myList(myAllocator)
|
|
{
|
|
myDS=NULL;
|
|
}
|
|
//=======================================================================
|
|
//function : ~
|
|
//purpose :
|
|
//=======================================================================
|
|
BOPDS_SubIterator::~BOPDS_SubIterator()
|
|
{
|
|
}
|
|
//=======================================================================
|
|
// function: SetDS
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::SetDS(const BOPDS_PDS& aDS)
|
|
{
|
|
myDS=aDS;
|
|
}
|
|
//=======================================================================
|
|
// function: DS
|
|
// purpose:
|
|
//=======================================================================
|
|
const BOPDS_DS& BOPDS_SubIterator::DS()const
|
|
{
|
|
return *myDS;
|
|
}
|
|
//=======================================================================
|
|
//function : SetSubSet1
|
|
//purpose :
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::SetSubSet1(const BOPCol_ListOfInteger& theLI)
|
|
{
|
|
mySubSet1=(BOPCol_PListOfInteger)&theLI;
|
|
}
|
|
//=======================================================================
|
|
//function : SubSet1
|
|
//purpose :
|
|
//=======================================================================
|
|
const BOPCol_ListOfInteger& BOPDS_SubIterator::SubSet1()const
|
|
{
|
|
return *mySubSet1;
|
|
}
|
|
//=======================================================================
|
|
//function : SetSubSet2
|
|
//purpose :
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::SetSubSet2(const BOPCol_ListOfInteger& theLI)
|
|
{
|
|
mySubSet2=(BOPCol_PListOfInteger)&theLI;
|
|
}
|
|
//=======================================================================
|
|
//function : SubSet2
|
|
//purpose :
|
|
//=======================================================================
|
|
const BOPCol_ListOfInteger& BOPDS_SubIterator::SubSet2()const
|
|
{
|
|
return *mySubSet2;
|
|
}
|
|
//=======================================================================
|
|
// function: Initialize
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::Initialize()
|
|
{
|
|
myIterator.Initialize(myList);
|
|
}
|
|
//=======================================================================
|
|
// function: More
|
|
// purpose:
|
|
//=======================================================================
|
|
Standard_Boolean BOPDS_SubIterator::More()const
|
|
{
|
|
return myIterator.More();
|
|
}
|
|
//=======================================================================
|
|
// function: Next
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::Next()
|
|
{
|
|
myIterator.Next();
|
|
}
|
|
//=======================================================================
|
|
// function: Value
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::Value(Standard_Integer& theI1,
|
|
Standard_Integer& theI2) const
|
|
{
|
|
Standard_Integer iT1, iT2, n1, n2;
|
|
//
|
|
const BOPDS_PassKeyBoolean& aPKB=myIterator.Value();
|
|
aPKB.Ids(n1, n2);
|
|
//
|
|
iT1=(Standard_Integer)(myDS->ShapeInfo(n1).ShapeType());
|
|
iT2=(Standard_Integer)(myDS->ShapeInfo(n2).ShapeType());
|
|
//
|
|
theI1=n1;
|
|
theI2=n2;
|
|
if (iT1<iT2) {
|
|
theI1=n2;
|
|
theI2=n1;
|
|
}
|
|
}
|
|
//=======================================================================
|
|
// function: Prepare
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::Prepare()
|
|
{
|
|
myList.Clear();
|
|
//
|
|
if (!myDS){
|
|
return;
|
|
}
|
|
if (!mySubSet1->Extent() || !mySubSet2->Extent()) {
|
|
return;
|
|
}
|
|
Intersect();
|
|
}
|
|
//=======================================================================
|
|
// function: Intersect
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPDS_SubIterator::Intersect()
|
|
{
|
|
Standard_Integer i, aNbB, aNbSD, j, iDS, jB;
|
|
Handle(NCollection_IncAllocator) aAllocator;
|
|
BOPCol_ListIteratorOfListOfInteger aIt, aIt1, aIt2;
|
|
BOPDS_PassKeyBoolean aPKXB;
|
|
//
|
|
//-----------------------------------------------------scope_1 f
|
|
aAllocator=new NCollection_IncAllocator();
|
|
//
|
|
BOPCol_DataMapOfShapeInteger aMSI(100, aAllocator);
|
|
BOPCol_DataMapOfIntegerInteger aMII(100, aAllocator);
|
|
BOPDS_MapOfPassKeyBoolean aMPKXB(100, aAllocator);
|
|
BOPCol_IndexedDataMapOfShapeBox aMSB(100, aAllocator);
|
|
//
|
|
BOPDS_BoxBndTreeSelector aSelector;
|
|
BOPDS_BoxBndTree aBBTree;
|
|
NCollection_UBTreeFiller <Standard_Integer, Bnd_Box> aTreeFiller(aBBTree);
|
|
//
|
|
aIt1.Initialize(*mySubSet1);
|
|
for (; aIt1.More(); aIt1.Next()) {
|
|
i=aIt1.Value();
|
|
const BOPDS_ShapeInfo& aSI=myDS->ShapeInfo(i);
|
|
const TopoDS_Shape& aS=aSI.Shape();
|
|
const Bnd_Box& aBoxEx=aSI.Box();
|
|
aMSI.Bind(aS, i);
|
|
aMSB.Add(aS, aBoxEx);
|
|
}
|
|
//
|
|
aNbB=aMSB.Extent();
|
|
for (i=1; i<=aNbB; ++i) {
|
|
const TopoDS_Shape& aS=aMSB.FindKey(i);
|
|
const Bnd_Box& aBoxEx=aMSB(i);
|
|
//
|
|
aTreeFiller.Add(i, aBoxEx);
|
|
//
|
|
iDS=aMSI.Find(aS);
|
|
aMII.Bind(i, iDS);
|
|
}
|
|
//
|
|
aTreeFiller.Fill();
|
|
//
|
|
aIt2.Initialize(*mySubSet2);
|
|
for (; aIt2.More(); aIt2.Next()) {
|
|
i=aIt2.Value();
|
|
//
|
|
const BOPDS_ShapeInfo& aSI=myDS->ShapeInfo(i);
|
|
const TopoDS_Shape& aSi=aSI.Shape();
|
|
const Bnd_Box& aBoxEx=aSI.Box();
|
|
//
|
|
aSelector.Clear();
|
|
aSelector.SetBox(aBoxEx);
|
|
aNbSD=aBBTree.Select(aSelector);
|
|
if (!aNbSD){
|
|
continue;
|
|
}
|
|
//const Bnd_Box& aBoxi=myDS->ShapeInfo(i).Box();
|
|
//
|
|
const BOPCol_ListOfInteger& aLI=aSelector.Indices();
|
|
aIt.Initialize(aLI);
|
|
for (; aIt.More(); aIt.Next()) {
|
|
jB=aIt.Value(); // box index in MII
|
|
j=aMII.Find(jB); // DS index
|
|
//
|
|
aPKXB.SetIds(i, j);
|
|
if (aMPKXB.Add(aPKXB)) {
|
|
myList.Append(aPKXB);
|
|
}// if (aMPKXB.Add(aPKXB)) {
|
|
}// for (; aIt.More(); aIt.Next()) {
|
|
}
|
|
//
|
|
aMSI.Clear();
|
|
aMII.Clear();
|
|
aMPKXB.Clear();
|
|
aMSB.Clear();
|
|
//
|
|
aAllocator.Nullify();
|
|
//-----------------------------------------------------scope_1 t
|
|
}
|