lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-05-12 02:40:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

0021762: Integration of new Boolean Operation algorithm to OCCT.

Browse Source 
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
2013-02-08 17:42:05 +04:00
parent a8676008f7
commit 4e57c75ee1
642 changed files with 41074 additions and 67959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
View File

@@ -18,42 +18,24 @@
// 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 <BOP_Builder.hxx>
#include <BOP_Section.hxx>
#include <BOP_ShellShell.hxx>
#include <BOP_SolidSolid.hxx>
#include <BOP_ShellSolid.hxx>
#include <BOP_WireWire.hxx>
#include <BOP_WireShell.hxx>
#include <BOP_WireSolid.hxx>
#include <BOPTools_DSFiller.hxx>
#include <BOPTools_Tools3D.hxx>
#include <BOP_EmptyBuilder.hxx>
#include <BOP_WireSolidHistoryCollector.hxx>
#include <BOP_ShellSolidHistoryCollector.hxx>
#include <BOP_SolidSolidHistoryCollector.hxx>
#include <BOP_SectionHistoryCollector.hxx>
#include <BRepLib_FuseEdges.hxx>
#include <TopExp.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
static Handle(BOP_HistoryCollector) MakeCollector(const TopoDS_Shape& theShape1,
const TopoDS_Shape& theShape2,
const BOP_Operation theOperation);
#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 BOP_Operation anOp)
const TopoDS_Shape& aS2,
const BOPAlgo_Operation anOp)
:
myS1(aS1),
myS2(aS2),
@@ -71,9 +53,9 @@ static Handle(BOP_HistoryCollector) MakeCollector(const TopoDS_Shape& theS
//purpose :
//=======================================================================
BRepAlgoAPI_BooleanOperation::BRepAlgoAPI_BooleanOperation(const TopoDS_Shape& aS1,
const TopoDS_Shape& aS2,
const BOPTools_DSFiller& aDSFiller,
const BOP_Operation anOp)
const TopoDS_Shape& aS2,
const BOPAlgo_PaveFiller& aDSFiller,
const BOPAlgo_Operation anOp)
:
myS1(aS1),
myS2(aS2),
@@ -86,7 +68,7 @@ static Handle(BOP_HistoryCollector) MakeCollector(const TopoDS_Shape& theS
myFuseEdges(Standard_False)
{
if ((Standard_Address) &aDSFiller!=NULL) {
myDSFiller=(BOPTools_PDSFiller)&aDSFiller;
myDSFiller=(BOPAlgo_PaveFiller*)&aDSFiller;
}
}
//=======================================================================
@@ -103,12 +85,16 @@ static Handle(BOP_HistoryCollector) MakeCollector(const TopoDS_Shape& theS
delete myDSFiller;
myDSFiller=NULL;
}
//
myModifFaces.Clear();
myEdgeMap.Clear();
}
//=======================================================================
//function : SetOperation
//purpose :
//=======================================================================
void BRepAlgoAPI_BooleanOperation::SetOperation (const BOP_Operation anOp)
void BRepAlgoAPI_BooleanOperation::SetOperation (const BOPAlgo_Operation anOp)
{
myOperation=anOp;
}
@@ -116,7 +102,7 @@ static Handle(BOP_HistoryCollector) MakeCollector(const TopoDS_Shape& theS
//function : Operation
//purpose :
//=======================================================================
BOP_Operation BRepAlgoAPI_BooleanOperation::Operation ()const
BOPAlgo_Operation BRepAlgoAPI_BooleanOperation::Operation ()const
{
return myOperation;
}
@@ -175,13 +161,15 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
return myGenerated;
}
else {
const TopTools_ListOfShape& aLM=myBuilder->Modified(aS);
myGenerated = myBuilder->Modified(aS);
if(myFuseEdges) {
return RefinedList(aLM);
TopTools_ListOfShape theLS;
theLS.Assign(myGenerated);
//
RefinedList(theLS);
}
return aLM;
return myGenerated;
}
}
@@ -191,28 +179,13 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
//=======================================================================
Standard_Boolean BRepAlgoAPI_BooleanOperation::IsDeleted(const TopoDS_Shape& aS)
{
// Standard_Boolean bDeleted = Standard_True;
// if (myBuilder==NULL) {
// return bDeleted;
// }
// else {
// bDeleted=myBuilder->IsDeleted(aS);
// return bDeleted;
// }
if(myHistory.IsNull()) {
Standard_Boolean bDeleted = Standard_True;
if (myBuilder==NULL) {
return bDeleted;
}
else {
bDeleted = myBuilder->IsDeleted(aS);
return bDeleted;
}
Standard_Boolean bDeleted = Standard_True;
if (myBuilder != NULL) {
bDeleted=myBuilder->IsDeleted(aS);
}
return myHistory->IsDeleted(aS);
return bDeleted;
}
//=======================================================================
//function : PrepareFiller
//purpose :
@@ -227,7 +200,7 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
return bIsNewFiller;
}
//
if (myOperation==BOP_UNKNOWN) {
if (myOperation==BOPAlgo_UNKNOWN) {
myErrorStatus=6;
return bIsNewFiller;
}
@@ -235,22 +208,18 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
if (myDSFiller==NULL) {
bIsNewFiller=!bIsNewFiller;
myDSFiller=new BOPTools_DSFiller;
myDSFiller=new BOPAlgo_PaveFiller;
//
if (myDSFiller==NULL) {
myErrorStatus=4;
return bIsNewFiller;
}
//
myDSFiller->SetShapes(myS1, myS2);
if (!myDSFiller->IsDone()) {
myErrorStatus=3;
if (myDSFiller!=NULL) {
delete myDSFiller;
myDSFiller = NULL;
return bIsNewFiller;
}
}
BOPCol_ListOfShape aLS;
aLS.Append(myS1);
aLS.Append(myS2);
//
myDSFiller->SetArguments(aLS);
}
return bIsNewFiller;
@@ -261,7 +230,8 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
//=======================================================================
void BRepAlgoAPI_BooleanOperation::Build()
{
Standard_Boolean bIsDone, bIsNewFiller;
Standard_Boolean bIsNewFiller;
Standard_Integer iErr;
//
myBuilderCanWork=Standard_False;
NotDone();
@@ -283,127 +253,26 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified(const TopoDS_
myBuilder=NULL;
}
//
const TopoDS_Shape& aS1 = myDSFiller->Shape1();
const TopoDS_Shape& aS2 = myDSFiller->Shape2();
const TopoDS_Shape& aS1 = myS1;
const TopoDS_Shape& aS2 = myS2;
//
myShape.Nullify();
//
// SECTION
//
if (myOperation==BOP_SECTION) {
myBuilder=new BOP_Section;
}
//
// COMMON, FUSE, CUT12, CUT21
//
else if (myOperation==BOP_COMMON || myOperation==BOP_FUSE ||
myOperation==BOP_CUT || myOperation==BOP_CUT21) {
//
// Check whether one or both of the arguments is(are) empty shape(s)
// If yes, create BOP_EmptyBuilder object and build the result fast.
{
Standard_Boolean bIsEmptyShape1, bIsEmptyShape2;
bIsEmptyShape1=BOPTools_Tools3D::IsEmptyShape(aS1);
bIsEmptyShape2=BOPTools_Tools3D::IsEmptyShape(aS2);
//
if (bIsEmptyShape1 || bIsEmptyShape2) {
myBuilder=new BOP_EmptyBuilder;
//
if (myBuilder==NULL) {
myErrorStatus=7;
return ;
}
//
myBuilder->SetShapes(aS1, aS2);
myBuilder->SetOperation (myOperation);
myBuilder->DoWithFiller (*myDSFiller);
bIsDone=myBuilder->IsDone();
if (bIsDone) {
myErrorStatus=0;
myBuilderCanWork=Standard_True;
myShape=myBuilder->Result();
Done();
}
else {
myErrorStatus=100+myBuilder->ErrorStatus();
NotDone();
}
return;
}
}
//
TopAbs_ShapeEnum aT1, aT2;
aT1=aS1.ShapeType();
aT2=aS2.ShapeType();
//
// Shell / Shell
if (aT1==TopAbs_SHELL && aT2==TopAbs_SHELL) {
myBuilder=new BOP_ShellShell;
}
//
// Solid / Solid
else if (aT1==TopAbs_SOLID && aT2==TopAbs_SOLID) {
myBuilder=new BOP_SolidSolid;
}
//
// Shell / Solid
else if ((aT1==TopAbs_SOLID && aT2==TopAbs_SHELL)
||
(aT2==TopAbs_SOLID && aT1==TopAbs_SHELL)) {
myBuilder=new BOP_ShellSolid;
}
//
// Wire / Wire
else if (aT1==TopAbs_WIRE && aT2==TopAbs_WIRE){
myBuilder=new BOP_WireWire;
}
//
// Wire / Shell
else if ((aT1==TopAbs_WIRE && aT2==TopAbs_SHELL)
||
(aT2==TopAbs_WIRE && aT1==TopAbs_SHELL)) {
myBuilder=new BOP_WireShell;
}
//
// Wire / Shell
else if ((aT1==TopAbs_WIRE && aT2==TopAbs_SOLID)
||
(aT2==TopAbs_WIRE && aT1==TopAbs_SOLID)) {
myBuilder=new BOP_WireSolid;
}
else {
myErrorStatus=5;
return ;
}
}
myBuilder=new BOPAlgo_BOP;
myBuilder->AddArgument(aS1);
myBuilder->AddTool(aS2);
myBuilder->SetOperation(myOperation);
//
if (myBuilder==NULL) {
myErrorStatus=7;
return ;
}
//
myBuilder->SetShapes(aS1, aS2);
myBuilder->SetOperation (myOperation);
myHistory = MakeCollector(aS1, aS2, myOperation);
myBuilder->SetHistoryCollector(myHistory);
myBuilder->DoWithFiller (*myDSFiller);
bIsDone=myBuilder->IsDone();
if (bIsDone) {
myBuilder->PerformWithFiller(*myDSFiller);
iErr = myBuilder->ErrorStatus();
if (!iErr) {
myErrorStatus=0;
myBuilderCanWork=Standard_True;
myShape=myBuilder->Result();
myShape=myBuilder->Shape();
Done();
}
}
else {
myErrorStatus=100+myBuilder->ErrorStatus();
myErrorStatus=100+iErr;
NotDone();
}
}
@@ -419,17 +288,43 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::SectionEdges()
myGenerated.Clear();
return myGenerated;
}
else {
const TopTools_ListOfShape& aLM=myBuilder->SectionEdges();
if(myFuseEdges) {
return RefinedList(aLM);
//
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);
}
}
return aLM;
}
//
if(myFuseEdges) {
TopTools_ListOfShape theLS;
theLS.Assign(myGenerated);
//
RefinedList(theLS);
}
//
return myGenerated;
}
//
// ================================================================================================
// function: Modified2
@@ -437,17 +332,34 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::SectionEdges()
// ================================================================================================
const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified2(const TopoDS_Shape& aS)
{
if(myHistory.IsNull()) {
if (myBuilder==NULL) {
myGenerated.Clear();
return myGenerated;
}
if(myFuseEdges) {
const TopTools_ListOfShape& aL = myHistory->Modified(aS);
return RefinedList(aL);
//
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);
}
return myHistory->Modified(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;
}
// ================================================================================================
@@ -456,17 +368,17 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Modified2(const TopoDS
// ================================================================================================
const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Generated(const TopoDS_Shape& S)
{
if(myHistory.IsNull()) {
if (myBuilder==NULL) {
myGenerated.Clear();
return myGenerated;
}
//
if(myFuseEdges) {
const TopTools_ListOfShape& aL = myHistory->Generated(S);
const TopTools_ListOfShape& aL = myBuilder->Generated(S);
return RefinedList(aL);
}
return myHistory->Generated(S);
return myBuilder->Generated(S);
}
// ================================================================================================
@@ -475,10 +387,10 @@ const TopTools_ListOfShape& BRepAlgoAPI_BooleanOperation::Generated(const TopoDS
// ================================================================================================
Standard_Boolean BRepAlgoAPI_BooleanOperation::HasModified() const
{
if(myHistory.IsNull()) {
if (myBuilder==NULL) {
return Standard_False;
}
return myHistory->HasModified();
return myBuilder->HasModified();
}
// ================================================================================================
@@ -487,10 +399,10 @@ Standard_Boolean BRepAlgoAPI_BooleanOperation::HasModified() const
// ================================================================================================
Standard_Boolean BRepAlgoAPI_BooleanOperation::HasGenerated() const
{
if(myHistory.IsNull()) {
if (myBuilder==NULL) {
return Standard_False;
}
return myHistory->HasGenerated();
return myBuilder->HasGenerated();
}
// ================================================================================================
@@ -499,10 +411,10 @@ Standard_Boolean BRepAlgoAPI_BooleanOperation::HasGenerated() const
// ================================================================================================
Standard_Boolean BRepAlgoAPI_BooleanOperation::HasDeleted() const
{
if(myHistory.IsNull()) {
if (myBuilder==NULL) {
return Standard_False;
}
return myHistory->HasDeleted();
return myBuilder->HasDeleted();
}
//=======================================================================
//function : RefineEdges
@@ -511,7 +423,6 @@ Standard_Boolean BRepAlgoAPI_BooleanOperation::HasDeleted() const
void BRepAlgoAPI_BooleanOperation::RefineEdges ()
{
if(myFuseEdges) return; //Edges have been refined yet
BRepLib_FuseEdges FE(myShape);
@@ -540,7 +451,6 @@ Standard_Boolean BRepAlgoAPI_BooleanOperation::HasDeleted() const
FE.ResultEdges(aResultEdges);
FE.Faces(myModifFaces);
myFuseEdges = Standard_True;
Standard_Integer i;
for(i = 1; i <= nle; ++i) {
@@ -548,11 +458,10 @@ Standard_Boolean BRepAlgoAPI_BooleanOperation::HasDeleted() const
const TopTools_ListOfShape& aListOfOldEdges = aFusedEdges(i);
TopTools_ListIteratorOfListOfShape anIter(aListOfOldEdges);
for(; anIter.More(); anIter.Next()) {
myEdgeMap.Bind(anIter.Value(), aNewE);
myEdgeMap.Bind(anIter.Value(), aNewE);
}
}
}
}
//=======================================================================
@@ -572,21 +481,21 @@ const TopTools_ListOfShape&
if(anS.ShapeType() == TopAbs_EDGE) {
if(myEdgeMap.IsBound(anS)) {
const TopoDS_Shape& aNewEdge = myEdgeMap.Find(anS);
if(aMap.Add(aNewEdge)) {
myGenerated.Append(aNewEdge);
}
const TopoDS_Shape& aNewEdge = myEdgeMap.Find(anS);
if(aMap.Add(aNewEdge)) {
myGenerated.Append(aNewEdge);
}
}
else {
myGenerated.Append(anS);
myGenerated.Append(anS);
}
}
else if (anS.ShapeType() == TopAbs_FACE) {
if(myModifFaces.IsBound(anS)) {
myGenerated.Append(myModifFaces.Find(anS));
myGenerated.Append(myModifFaces.Find(anS));
}
else {
myGenerated.Append(anS);
myGenerated.Append(anS);
}
}
else {
@@ -597,61 +506,3 @@ const TopTools_ListOfShape&
return myGenerated;
}
// -----------------------------------------------------------------------------------------
// static function: MakeCollector
// purpose:
// -----------------------------------------------------------------------------------------
Handle(BOP_HistoryCollector) MakeCollector(const TopoDS_Shape& theShape1,
const TopoDS_Shape& theShape2,
const BOP_Operation theOperation) {
Handle(BOP_HistoryCollector) aresult;
if(theOperation == BOP_SECTION) {
aresult = new BOP_SectionHistoryCollector(theShape1, theShape2);
return aresult;
}
TopAbs_ShapeEnum aT1, aT2;
aT1 = theShape1.ShapeType();
aT2 = theShape2.ShapeType();
//
// Shell / Shell
if (aT1==TopAbs_SHELL && aT2==TopAbs_SHELL) {
// aresult = new BOP_ShellShellHistoryCollector(theShape1, theShape2, theOperation, theDSFiller);
}
//
// Solid / Solid
else if (aT1==TopAbs_SOLID && aT2==TopAbs_SOLID) {
aresult = new BOP_SolidSolidHistoryCollector(theShape1, theShape2, theOperation);
}
//
// Shell / Solid
else if ((aT1==TopAbs_SOLID && aT2==TopAbs_SHELL)
||
(aT2==TopAbs_SOLID && aT1==TopAbs_SHELL)) {
aresult = new BOP_ShellSolidHistoryCollector(theShape1, theShape2, theOperation);
}
//
// Wire / Wire
else if (aT1==TopAbs_WIRE && aT2==TopAbs_WIRE){
// aresult = new BOP_WireWireHistoryCollector(theShape1, theShape2, theOperation, theDSFiller);
}
//
// Wire / Shell
else if ((aT1==TopAbs_WIRE && aT2==TopAbs_SHELL)
||
(aT2==TopAbs_WIRE && aT1==TopAbs_SHELL)) {
// aresult = new BOP_WireShellHistoryCollector(theShape1, theShape2, theOperation, theDSFiller);
}
//
// Wire / Shell
else if ((aT1==TopAbs_WIRE && aT2==TopAbs_SOLID)
||
(aT2==TopAbs_WIRE && aT1==TopAbs_SOLID)) {
aresult = new BOP_WireSolidHistoryCollector(theShape1, theShape2, theOperation);
}
return aresult;
}