OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0025609: Clean up the duplicate classes in TKBO project

Browse Source 
1. The package BOPCol has been fully removed:
- *BOPCol_BaseAllocator* is replaced with *Handle(NCollection_BaseAllocator)*;
- *BOPCol_BoxBndTree* is replaced with *BOPTools_BoxBndTree*;
- *BOPCol_Box2DBndTree* is removed as unused;
- *BOPCol_DataMapOfIntegerInteger* is replaced with *TColStd_DataMapOfIntegerInteger*;
- *BOPCol_DataMapOfIntegerListOfInteger* is replaced with *TColStd_DataMapOfIntegerListOfInteger*;
- *BOPCol_DataMapOfIntegerListOfShape* is replaced with *TopTools_DataMapOfIntegerListOfShape*;
- *BOPCol_DataMapOfIntegerMapOfInteger.hxx* is removed as unused;
- *BOPCol_DataMapOfIntegerReal* is replaced with *TColStd_DataMapOfIntegerReal*;
- *BOPCol_DataMapOfIntegerShape* is replaced with *TopTools_DataMapOfIntegerShape*;
- *BOPCol_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;
- *BOPCol_DataMapOfShapeInteger* is replaced with *TopTools_DataMapOfShapeInteger*;
- *BOPCol_DataMapOfShapeListOfShape* is replaced with *TopTools_DataMapOfShapeListOfShape*;
- *BOPCol_DataMapOfShapeReal* is replaced with *TopTools_DataMapOfShapeReal*;
- *BOPCol_DataMapOfShapeShape* is replaced with *TopTools_DataMapOfShapeShape*;
- *BOPCol_DataMapOfTransientAddress* is removed as unused;
- *BOPCol_IndexedDataMapOfIntegerListOfInteger* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeBox* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeInteger* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeListOfShape* is replaced with *TopTools_IndexedDataMapOfShapeListOfShape*;
- *BOPCol_IndexedDataMapOfShapeReal* is removed as unused;
- *BOPCol_IndexedDataMapOfShapeShape* is replaced with *TopTools_IndexedDataMapOfShapeShape*;
- *BOPCol_IndexedMapOfInteger* is replaced with *TColStd_IndexedMapOfInteger*;
- *BOPCol_IndexedMapOfOrientedShape* is replaced with *TopTools_IndexedMapOfOrientedShape*;
- *BOPCol_IndexedMapOfShape* is replaced with *TopTools_IndexedMapOfShape*;
- *BOPCol_ListOfInteger* is replaced with *TColStd_ListOfInteger*;
- *BOPCol_ListOfListOfShape* is replaced with *TopTools_ListOfListOfShape*;
- *BOPCol_ListOfShape* is replaced with *TopTools_ListOfShape*;
- *BOPCol_MapOfInteger* is replaced with *TColStd_MapOfInteger*;
- *BOPCol_MapOfOrientedShape* is replaced with *TopTools_MapOfOrientedShape*;
- *BOPCol_MapOfShape* is replaced with *TopTools_MapOfShape*;
- *BOPCol_PListOfInteger* is removed as unused;
- *BOPCol_PInteger* is removed as unused
- *BOPCol_SequenceOfPnt2d* is replaced with *TColgp_SequenceOfPnt2d*;
- *BOPCol_SequenceOfReal* is replaced with *TColStd_SequenceOfReal*;
- *BOPCol_SequenceOfShape* is replaced with *TopTools_SequenceOfShape*;
- *BOPCol_Parallel* is replaced with *BOPTools_Parallel*;
- *BOPCol_NCVector* is replaced with *NCollection_Vector*;

2. The class *BOPDS_PassKey* and containers for it have been removed as unused;

3. The unused containers from *IntTools* package have been removed:
- *IntTools_DataMapOfShapeAddress* is removed as unused;
- *IntTools_IndexedDataMapOfTransientAddress* is removed as unused;

4. The container *BiTgte_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;

5. The class *BOPTools* has been removed as duplicate of the class *TopExp*;
This commit is contained in:
emv
2017-11-23 10:57:25 +03:00
committed by bugmaster
parent 2da5126371
commit 1155d05a06
210 changed files with 2355 additions and 4551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/BRepOffset/BRepOffset_Tool.cxx
View File

@@ -831,7 +831,7 @@ static Standard_Boolean IsAutonomVertex(const TopoDS_Shape& aVertex,
//check if vertex with index "index" is not created in VV or EE or EF interference
//VV
BOPDS_VectorOfInterfVV& aVVs=pDS->InterfVV();
aNbVVs = aVVs.Extent();
aNbVVs = aVVs.Length();
for(aInt = 0; aInt < aNbVVs; aInt++) {
const BOPDS_InterfVV& aVV = aVVs(aInt);
if (aVV.HasIndexNew()) {
@@ -842,7 +842,7 @@ static Standard_Boolean IsAutonomVertex(const TopoDS_Shape& aVertex,
}
//EE
BOPDS_VectorOfInterfEE& aEEs=pDS->InterfEE();
aNbEEs = aEEs.Extent();
aNbEEs = aEEs.Length();
for(aInt = 0; aInt < aNbEEs; aInt++) {
const BOPDS_InterfEE& aEE = aEEs(aInt);
IntTools_CommonPrt aCP = aEE.CommonPart();
@@ -854,7 +854,7 @@ static Standard_Boolean IsAutonomVertex(const TopoDS_Shape& aVertex,
}
//EF
BOPDS_VectorOfInterfEF& aEFs=pDS->InterfEF();
aNbEFs = aEFs.Extent();
aNbEFs = aEFs.Length();
for(aInt = 0; aInt < aNbEFs; aInt++) {
const BOPDS_InterfEF& aEF = aEFs(aInt);
IntTools_CommonPrt aCP = aEF.CommonPart();
@@ -1338,7 +1338,7 @@ static Standard_Boolean CheckIntersFF(const BOPDS_PDS& pDS,
return Standard_True;
BOPDS_VectorOfInterfFF& aFFs = pDS->InterfFF();
Standard_Integer aNb = aFFs.Extent();
Standard_Integer aNb = aFFs.Length();
Standard_Integer i, j, nbe = 0;
TopTools_SequenceOfShape Edges;
@@ -1347,7 +1347,7 @@ static Standard_Boolean CheckIntersFF(const BOPDS_PDS& pDS,
{
BOPDS_InterfFF& aFFi=aFFs(i);
const BOPDS_VectorOfCurve& aBCurves=aFFi.Curves();
Standard_Integer aNbCurves = aBCurves.Extent();
Standard_Integer aNbCurves = aBCurves.Length();
for (j = 0; j < aNbCurves; ++j)
{
@@ -1618,7 +1618,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
BRepLib::BuildCurves3d(cpF2);
BOPAlgo_PaveFiller aPF1, aPF2;
BOPCol_ListOfShape aLS;
TopTools_ListOfShape aLS;
aLS.Append(cpF1);
aLS.Append(cpF2);
aPF1.SetArguments(aLS);
@@ -1646,7 +1646,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
const BOPDS_PDS& pDS = pPF->PDS();
BOPDS_VectorOfInterfFF& aFFs=pDS->InterfFF();
Standard_Integer aNb = aFFs.Extent();
Standard_Integer aNb = aFFs.Length();
Standard_Integer i = 0, j = 0, k;
// Store Result
L1.Clear(); L2.Clear();
@@ -1658,7 +1658,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
BOPDS_InterfFF& aFFi=aFFs(i);
const BOPDS_VectorOfCurve& aBCurves=aFFi.Curves();
Standard_Integer aNbCurves = aBCurves.Extent();
Standard_Integer aNbCurves = aBCurves.Length();
for (j = 0; j < aNbCurves; j++) {
const BOPDS_Curve& aBC=aBCurves(j);